--- a/abims_CAMERA_combinexsAnnos.xml	Mon Feb 22 16:49:04 2016 -0500
+++ b/abims_CAMERA_combinexsAnnos.xml	Mon Apr 25 11:07:23 2016 -0400
@@ -1,21 +1,16 @@
-<tool id="abims_CAMERA_combinexsAnnos" name="CAMERA.combinexsAnnos" version="2.0.3">
+<tool id="abims_CAMERA_combinexsAnnos" name="CAMERA.combinexsAnnos" version="2.0.4">
 
     <description>Wrapper function for the combinexsAnnos CAMERA function. Returns a dataframe with recalculated annotations.</description>
     
-    <requirements>
-        <requirement type="package" version="3.1.2">R</requirement>
-        <requirement type="binary">Rscript</requirement>
-        <requirement type="package" version="1.44.0">xcms</requirement>
-        <requirement type="package" version="1.22.0">camera</requirement>
-        <requirement type="package" version="2.2.0">camera_w4m_script</requirement>
-    </requirements>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
 
-    <stdio>
-        <exit_code range="1:" level="fatal" />
-    </stdio>
+    <expand macro="requirements"/>
+    <expand macro="stdio"/>
 
     <command><![CDATA[
-        CAMERA.r 
+        @COMMAND_CAMERA_SCRIPT@
         xfunction combinexsAnnos 
         image_pos $image_pos 
         image_neg $image_neg
@@ -52,31 +47,19 @@
     <tests>
         <test>
             <!-- TODO: generer des vrais dataset pos et neg-->
-            <param name="image_pos" value="xset.group.retcor.group.fillPeaks.annotate.positive.Rdata"/>
-            <param name="image_neg" value="xset.group.retcor.group.fillPeaks.annotate.negative.Rdata"/>
+            <param name="image_pos" value="faahOK.xset.group.retcor.group.fillPeaks.annotate.positive.Rdata"/>
+            <param name="image_neg" value="faahOK.xset.group.retcor.group.fillPeaks.annotate.negative.Rdata"/>
             <param name="pos" value="TRUE"/>
             <param name="tol" value="2"/>
             <param name="ruleset" value="1,1"/>
-            <output name="variableMetadata" file="xset.group.retcor.group.fillPeaks.annotate.positive.combinexsAnnos.variableMetadata.tsv" />
+            <output name="variableMetadata" file="faahOK.xset.group.retcor.group.fillPeaks.annotate.positive.combinexsAnnos.variableMetadata.tsv" />
         </test>
     </tests>
     
     
     <help><![CDATA[
-
-.. class:: infomark
-
-**Authors** Carsten Kuhl ckuhl@ipb-halle.de, Ralf Tautenhahn rtautenh@scripps.edu, Steffen Neumann sneumann@@ipb-halle.de
-
-.. class:: infomark
-
-**Galaxy integration** ABiMS TEAM - UPMC/CNRS - Station biologique de Roscoff and Yann Guitton yann.guitton@univ-nantes.fr - part of Workflow4Metabolomics.org [W4M]
-
- | Contact support@workflow4metabolomics.org for any questions or concerns about the Galaxy implementation of this tool.
-
----------------------------------------------------
-
-
+        
+@HELP_AUTHORS@
 
 =======================
 Xcms.combinexsAnnos
@@ -209,6 +192,11 @@
 Changelog/News
 --------------
 
+**Version 2.0.4 - 21/04/2016**
+
+- UPGRADE: upgrate the CAMERA version from 1.22.0 to 1.26.0
+
+
 **Version 2.0.3 - 10/02/2016**
 
 - BUGFIX: better management of errors. Datasets remained green although the process failed
@@ -230,10 +218,7 @@
 
     ]]></help>
 
-    <citations>
-        <citation type="doi"> 10.1021/ac202450g</citation>
-        <citation type="doi">10.1093/bioinformatics/btu813</citation>
-    </citations>
+    <expand macro="citation" />
 
 
 </tool>