http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/3ecb1291/taverna-integration-tests/src/test/resources/t2flow/iteration.t2flow ---------------------------------------------------------------------- diff --git a/taverna-integration-tests/src/test/resources/t2flow/iteration.t2flow b/taverna-integration-tests/src/test/resources/t2flow/iteration.t2flow deleted file mode 100644 index bec4c2d..0000000 --- a/taverna-integration-tests/src/test/resources/t2flow/iteration.t2flow +++ /dev/null @@ -1,474 +0,0 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.2.0"><dataflow id="80c80b32-1faa-4c8e-9294-eb85d6aaa764" role="top"><name>Workflow13</name><inputPorts><port><name>in</name><depth>0</depth><granularDepth>0</granularDepth><annotations /></port></inputPorts><outputPorts><port><name>cross</name><annotations /></port><port><name>dot</name><annotations /></port><port><name>crossdot</name><annotations /></port><port><name>dotdot</name><annotations /></port><port><name>dotcross</name><annotations /></port></outputPorts><processors><processor><name>cross</name><inputPorts><port><name>in1</name><depth>0</depth></port><port><name>in2</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>beanshell-activity</artifact><version>1.2</version></raven><class>net.sf.taverna. t2.activities.beanshell.BeanshellActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> - <script>out=in1 + in2;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in1</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in2</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>0</granularDepth> - <name>out</name> - <depth>0</depth> - <mimeTypes /> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>ListGenerator1</name><inputPorts><port><name>in</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>beanshell-activity</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.activities.beanshell.Beans hellActivity</class><inputMap><map from="in" to="in" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> - <script>out = new ArrayList(); - -for (int i = 0; i < 10; i++) { - out.add(in + ":" + i); -}</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>1</granularDepth> - <name>out</name> - <depth>1</depth> - <mimeTypes /> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>ListGenerator2</name><inputPorts><port><name>in</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>1</depth><granularDepth>1</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>beanshell-activity</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.activities.beanshell.BeanshellActivity</class><inputMap> <map from="in" to="in" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> - <script>out = new ArrayList(); - -for (int i = 0; i < 10; i++) { - out.add(in + ":" + i); -}</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>1</granularDepth> - <name>out</name> - <depth>1</depth> - <mimeTypes /> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>dot</name><inputPorts><port><name>in2</name><depth>0</depth></port><port><name>in1</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>beanshell-activity</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.activities.beanshell. BeanshellActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> - <script>out=in1 + in2;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in1</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in2</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>0</granularDepth> - <name>out</name> - <depth>0</depth> - <mimeTypes /> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><dot><port name="in2" depth="0" /><port name="in1" depth="0" /></dot></strategy></iteration></iterationStrategyStack></processor><processor><name>crossdot</name><inputPorts><port><name>in1</name><depth>0</depth></port><port><name>in2</name><depth>0</depth></port><port><name>in3</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>beanshell-activity</artifact> <version>1.2</version></raven><class>net.sf.taverna.t2.activities.beanshell.BeanshellActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /><map from="in3" to="in3" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> - <script>out = in1 + in2 + in3;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in1</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in2</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in3</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>0</granularDepth> - <name>out</name> - <depth>0</depth> - <mimeTypes /> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in1" depth="0" /><port name="in2" depth="0" /><dot><port name="in3" depth="0" /></dot></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>dotcross</name><inputPorts><port><name>in1</name><depth>0</depth></port><port><name>in2</name><depth>0</depth></port><port><name>in3</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</g roup><artifact>beanshell-activity</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.activities.beanshell.BeanshellActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /><map from="in3" to="in3" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> - <script>out = in1 + in2 + in3;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in1</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in2</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in3</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>0</granularDepth> - <name>out</name> - <depth>0</depth> - <mimeTypes /> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="in3" depth="0" /><dot><port name="in2" depth="0" /><port name="in1" depth="0" /></dot></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>dotdot</name><inputPorts><port><name>in1</name><depth>0</depth></port><port><name>in2</name><depth>0</depth></port><port><name>in3</name><depth>0</depth></port></inputPorts><outputPorts><port><name>out</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</gro up><artifact>beanshell-activity</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.activities.beanshell.BeanshellActivity</class><inputMap><map from="in2" to="in2" /><map from="in1" to="in1" /><map from="in3" to="in3" /></inputMap><outputMap><map from="out" to="out" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""> - <script>out = in1 + in2 + in3;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in1</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in2</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>in3</name> - <depth>0</depth> - <mimeTypes> - <string>text/plain</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>0</granularDepth> - <name>out</name> - <depth>0</depth> - <mimeTypes /> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><dot><port name="in1" depth="0" /><port name="in2" depth="0" /><dot><port name="in3" depth="0" /></dot></dot></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>cross</processor><port>in1</port></sink><source type="processor"><processor>ListGenerator1</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>cross</processor><port>in2</port></sink><source type="processor"><processor>ListGenerator2</processor><port>out</port> </source></datalink><datalink><sink type="processor"><processor>ListGenerator1</processor><port>in</port></sink><source type="dataflow"><port>in</port></source></datalink><datalink><sink type="processor"><processor>ListGenerator2</processor><port>in</port></sink><source type="dataflow"><port>in</port></source></datalink><datalink><sink type="processor"><processor>dot</processor><port>in2</port></sink><source type="processor"><processor>ListGenerator2</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>dot</processor><port>in1</port></sink><source type="processor"><processor>ListGenerator1</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>crossdot</processor><port>in1</port></sink><source type="processor"><processor>ListGenerator1</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>crossdot</processor><port>in2</port></sink><source type="processor"><processor>ListGen erator2</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>crossdot</processor><port>in3</port></sink><source type="dataflow"><port>in</port></source></datalink><datalink><sink type="processor"><processor>dotcross</processor><port>in1</port></sink><source type="processor"><processor>ListGenerator1</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>dotcross</processor><port>in2</port></sink><source type="processor"><processor>ListGenerator2</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>dotcross</processor><port>in3</port></sink><source type="dataflow"><port>in</port></source></datalink><datalink><sink type="processor"><processor>dotdot</processor><port>in1</port></sink><source type="processor"><processor>ListGenerator1</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>dotdot</processor><port>in2</port></sink><source type ="processor"><processor>ListGenerator2</processor><port>out</port></source></datalink><datalink><sink type="processor"><processor>dotdot</processor><port>in3</port></sink><source type="processor"><processor>ListGenerator2</processor><port>out</port></source></datalink><datalink><sink type="dataflow"><port>cross</port></sink><source type="processor"><processor>cross</processor><port>out</port></source></datalink><datalink><sink type="dataflow"><port>dot</port></sink><source type="processor"><processor>dot</processor><port>out</port></source></datalink><datalink><sink type="dataflow"><port>crossdot</port></sink><source type="processor"><processor>crossdot</processor><port>out</port></source></datalink><datalink><sink type="dataflow"><port>dotdot</port></sink><source type="processor"><processor>dotdot</processor><port>out</port></source></datalink><datalink><sink type="dataflow"><port>dotcross</port></sink><source type="processor"><processor>dotcross</processor><port>out</port></source ></datalink></datalinks><annotations><annotation_chain_2_2 >encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>ad638364-a6e0-4852-abca-9f609c9553d2</identification> - </annotationBean> - <date>2010-08-19 13:43:43.797 BST</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>3fb7f0a7-26f8-43e1-a122-87a25889f57d</identification> - </annotationBean> - <date>2011-02-22 08:25:53.793 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>13c70169-dfaa-4ea6-b6ab-3551dae7fa84</identification> - </annotationBean> - <date>2010-08-19 12:28:57.881 BST</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>af1f698b-820d-4b35-a92e-9091c90b493e</identification> - </annotationBean> - <date>2011-02-22 09:30:17.881 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>be50375c-4f68-44aa-8604-9a80d8d97570</identification> - </annotationBean> - <date>2011-02-22 09:03:28.97 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>eb6a550d-f34e-4de9-b0fc-1b3df8ab36c4</identification> - </annotationBean> - <date>2010-08-31 14:32:44.634 BST</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>ac70d4c0-5db9-48b1-ba32-8e11fff8ae59</identification> - </annotationBean> - <date>2011-02-22 08:31:32.90 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>78cb1427-d57f-42c2-a385-1d20c1580f3b</identification> - </annotationBean> - <date>2010-08-31 14:36:00.297 BST</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>3b7c0b9c-572d-466b-af6d-0fb40699e8a5</identification> - </annotationBean> - <date>2010-08-31 12:50:40.306 BST</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>7a22acbb-2f0f-41dd-a526-d2a9b4e267c5</identification> - </annotationBean> - <date>2011-02-22 08:59:59.964 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>80c80b32-1faa-4c8e-9294-eb85d6aaa764</identification> - </annotationBean> - <date>2011-02-22 09:40:37.744 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>bc9c64da-9143-4811-a22e-657c92fcfe94</identification> - </annotationBean> - <date>2011-02-22 09:23:49.109 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>c072030e-b367-4885-a770-7d892672d979</identification> - </annotationBean> - <date>2011-02-22 09:31:03.727 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>7ef10e93-7376-41a9-9255-552149094142</identification> - </annotationBean> - <date>2010-08-31 13:06:57.536 BST</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2></annotations></dataflow></workflow> \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/3ecb1291/taverna-integration-tests/src/test/resources/t2flow/localworker.t2flow ---------------------------------------------------------------------- diff --git a/taverna-integration-tests/src/test/resources/t2flow/localworker.t2flow b/taverna-integration-tests/src/test/resources/t2flow/localworker.t2flow deleted file mode 100644 index b3b2053..0000000 --- a/taverna-integration-tests/src/test/resources/t2flow/localworker.t2flow +++ /dev/null @@ -1,67 +0,0 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.2.0"><dataflow id="5eebce20-72f5-4ac7-a4bf-8086d59d0c9e" role="top"><name>Workflow5</name><inputPorts><port><name>in</name><depth>0</depth><granularDepth>0</granularDepth><annotations /></port></inputPorts><outputPorts><port><name>out</name><annotations /></port></outputPorts><processors><processor><name>Concatenate_two_strings</name><inputPorts><port><name>string2</name><depth>0</depth></port><port><name>string1</name><depth>0</depth></port></inputPorts><outputPorts><port><name>output</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>localworker-activity</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.activities.localworker.LocalworkerActivity</class><inputMap><map from="string2" to="string2" /><map from="string1" to="string1" /></inputMap><outputMap><map f rom="output" to="output" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean xmlns=""> - <localworkerName>org.embl.ebi.escience.scuflworkers.java.StringConcat</localworkerName> - <script>output = string1 + string2;</script> - <dependencies /> - <classLoaderSharing>workflow</classLoaderSharing> - <localDependencies /> - <artifactDependencies /> - <inputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>string1</name> - <depth>0</depth> - <mimeTypes> - <string>'text/plain'</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - <handledReferenceSchemes /> - <translatedElementType>java.lang.String</translatedElementType> - <allowsLiteralValues>true</allowsLiteralValues> - <name>string2</name> - <depth>0</depth> - <mimeTypes> - <string>'text/plain'</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean> - </inputs> - <outputs> - <net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - <granularDepth>0</granularDepth> - <name>output</name> - <depth>0</depth> - <mimeTypes> - <string>'text/plain'</string> - </mimeTypes> - </net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean> - </outputs> -</net.sf.taverna.t2.activities.localworker.LocalworkerActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="string2" depth="0" /><port name="string1" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>string1_value</name><inputPorts /><outputPorts><port><name>value</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>stringconstant-activity</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.activities.stringconstant.StringConstantActivity</class><inputMap / ><outputMap><map from="value" to="value" /></outputMap><configBean >encoding="xstream"><net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean > xmlns=""> - <value>Hello </value> -</net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.2</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy /></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>Concatenate_two_strings</processor><port>string2</port></sink><source type="dataflow"><port>in</port></source></datalink><datalink><sink type="processor"><processor>Concatenate_two_strings</processor><port>string1</port></sink><source type="processor"><processor>string1_value</processor><port>value</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source type="processor"><processor>C oncatenate_two_strings</processor><port>output</port></source></datalink></datalinks><annotations><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>5eebce20-72f5-4ac7-a4bf-8086d59d0c9e</identification> - </annotationBean> - <date>2011-02-21 13:44:43.621 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2></annotations></dataflow></workflow> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/3ecb1291/taverna-integration-tests/src/test/resources/t2flow/rest.t2flow ---------------------------------------------------------------------- diff --git a/taverna-integration-tests/src/test/resources/t2flow/rest.t2flow b/taverna-integration-tests/src/test/resources/t2flow/rest.t2flow deleted file mode 100644 index f3f90b8..0000000 --- a/taverna-integration-tests/src/test/resources/t2flow/rest.t2flow +++ /dev/null @@ -1,154 +0,0 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.3.0"><dataflow id="8e36176a-2975-498b-93f7-f2beba774532" role="top"><name>Workflow11</name><inputPorts /><outputPorts><port><name>out</name><annotations /></port></outputPorts><processors><processor><name>REST_Service</name><inputPorts><port><name>id</name><depth>0</depth></port></inputPorts><outputPorts><port><name>responseBody</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>rest-activity</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.activities.rest.RESTActivity</class><inputMap><map from="id" to="id" /></inputMap><outputMap><map from="responseBody" to="responseBody" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean xmlns=""> - <httpMethod>GET</httpMethod> - <urlSignature>http://www.uniprot.org/uniprot/{id}.xml</urlSignature> - <acceptsHeaderValue>text/plain</acceptsHeaderValue> - <contentTypeForUpdates>application/xml</contentTypeForUpdates> - <outgoingDataFormat>String</outgoingDataFormat> - <sendHTTPExpectRequestHeader>false</sendHTTPExpectRequestHeader> - <showRedirectionOutputPort>false</showRedirectionOutputPort> - <escapeParameters>true</escapeParameters> - <otherHTTPHeaders /> - <activityInputs> - <entry> - <string>id</string> - <java-class>java.lang.String</java-class> - </entry> - </activityInputs> -</net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy><cross><port name="id" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>id_value</name><inputPorts /><outputPorts><port><name>value</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>stringconstant-activity</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.activities.stringconstant.StringConstantActivity</class><inputMap /><outputMap><map from="value" to="value" /> </outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean xmlns=""> - <value>P12345</value> -</net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig xmlns=" "> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy /></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>REST_Service</processor><port>id</port></sink><source type="processor"><processor>id_value</processor><port>value</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source type="processor"><processor>REST_Service</processor><port>responseBody</port></source></datalink></datalinks><annotations><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xm lns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>30c58a3d-4037-4b92-b7d6-3aea761bdada</identification> - </annotationBean> - <date>2011-11-02 08:52:32.796 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>d090ff3c-c84d-461f-9027-ccd07fe0a352</identification> - </annotationBean> - <date>2011-11-02 10:09:35.558 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>1e2069a6-54c3-4e09-b639-c9bb27356eb9</identification> - </annotationBean> - <date>2011-11-02 09:59:38.235 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>f88604da-4047-4ab9-bd19-23cbbb8be88b</identification> - </annotationBean> - <date>2011-11-02 10:12:00.757 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>8e36176a-2975-498b-93f7-f2beba774532</identification> - </annotationBean> - <date>2012-02-10 15:56:15.960 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>b3887d66-e945-444d-820a-ddb5c1d6cecb</identification> - </annotationBean> - <date>2011-11-02 10:00:26.717 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>bbf68124-dbeb-482b-80c6-e461d264a98b</identification> - </annotationBean> - <date>2011-11-02 10:12:59.372 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>c2802c60-cc0e-4bc0-b401-473476811e46</identification> - </annotationBean> - <date>2011-11-02 10:02:16.255 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>d73137e0-8cfb-4536-849e-6d30b1b1f4dc</identification> - </annotationBean> - <date>2011-11-02 08:49:30.655 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>3f67a647-2d0e-4d7e-9937-5bde3d562fde</identification> - </annotationBean> - <date>2011-11-02 10:10:29.316 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>f76689f8-2629-4168-b0a6-e70c88acaca9</identification> - </annotationBean> - <date>2012-02-10 15:49:11.156 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2></annotations></dataflow></workflow> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/3ecb1291/taverna-integration-tests/src/test/resources/t2flow/secure-basic-authentication-https.t2flow ---------------------------------------------------------------------- diff --git a/taverna-integration-tests/src/test/resources/t2flow/secure-basic-authentication-https.t2flow b/taverna-integration-tests/src/test/resources/t2flow/secure-basic-authentication-https.t2flow deleted file mode 100644 index 0cbff10..0000000 --- a/taverna-integration-tests/src/test/resources/t2flow/secure-basic-authentication-https.t2flow +++ /dev/null @@ -1,74 +0,0 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.3-SNAPSHOT-20110621T1150"><dataflow id="12203b36-f878-45f7-a16e-863e1bbc81b8" role="top"><name>Workflow18</name><inputPorts /><outputPorts><port><name>out</name><annotations /></port></outputPorts><processors><processor><name>Service_protected_with_Basic_AuthN_and_HTTPS</name><inputPorts /><outputPorts><port><name>responseBody</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>rest-activity</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.activities.rest.RESTActivity</class><inputMap /><outputMap><map from="responseBody" to="responseBody" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean xmlns=""> - <httpMethod>GET</httpMethod> - <urlSignature>https://heater.cs.man.ac.uk:7443/examples-basic-authentication/taverna-test-page.html</urlSignature> - <acceptsHeaderValue>text/plain</acceptsHeaderValue> - <contentTypeForUpdates>application/xml</contentTypeForUpdates> - <outgoingDataFormat>String</outgoingDataFormat> - <sendHTTPExpectRequestHeader>false</sendHTTPExpectRequestHeader> - <showRedirectionOutputPort>false</showRedirectionOutputPort> - <escapeParameters>true</escapeParameters> - <otherHTTPHeaders /> - <activityInputs /> -</net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch .layers.RetryConfig xmlns=""> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy /></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="dataflow"><port>out</port></sink><source type="processor"><processor>Service_protected_with_Basic_AuthN_and_HTTPS</processor><port>responseBody</port></source></datalink></datalinks><annotations><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>adb25995-c890-40c7-b091-2c2512024864</identification> - </annotationBean> - <date>2010-11-29 10:35:54.270 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>12203b36-f878-45f7-a16e-863e1bbc81b8</identification> - </annotationBean> - <date>2010-11-29 15:35:51.711 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>837b1710-ff29-4eef-85a0-51fc76139364</identification> - </annotationBean> - <date>2010-11-22 14:15:20.380 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>b7887959-6d6c-4466-8d15-16b4e20051db</identification> - </annotationBean> - <date>2010-11-22 14:16:43.484 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>388333c0-fd34-4571-ab0c-f67c10c2ed64</identification> - </annotationBean> - <date>2010-11-22 14:21:12.760 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2></annotations></dataflow></workflow> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/3ecb1291/taverna-integration-tests/src/test/resources/t2flow/secure-basic-authentication.t2flow ---------------------------------------------------------------------- diff --git a/taverna-integration-tests/src/test/resources/t2flow/secure-basic-authentication.t2flow b/taverna-integration-tests/src/test/resources/t2flow/secure-basic-authentication.t2flow deleted file mode 100644 index 998b69a..0000000 --- a/taverna-integration-tests/src/test/resources/t2flow/secure-basic-authentication.t2flow +++ /dev/null @@ -1,74 +0,0 @@ -<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.3-SNAPSHOT-20110621T1150"><dataflow id="6eca35ba-d7d4-43d9-8593-93eba828cc46" role="top"><name>Workflow18</name><inputPorts /><outputPorts><port><name>out</name><annotations /></port></outputPorts><processors><processor><name>Service_protected_with_Basic_AuthN</name><inputPorts /><outputPorts><port><name>responseBody</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>rest-activity</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.activities.rest.RESTActivity</class><inputMap /><outputMap><map from="responseBody" to="responseBody" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean xmlns=""> - <httpMethod>GET</httpMethod> - <urlSignature>http://heater.cs.man.ac.uk:7070/examples-basic-authentication/taverna-test-page.html</urlSignature> - <acceptsHeaderValue>text/plain</acceptsHeaderValue> - <contentTypeForUpdates>application/xml</contentTypeForUpdates> - <outgoingDataFormat>String</outgoingDataFormat> - <sendHTTPExpectRequestHeader>false</sendHTTPExpectRequestHeader> - <showRedirectionOutputPort>false</showRedirectionOutputPort> - <escapeParameters>true</escapeParameters> - <otherHTTPHeaders /> - <activityInputs /> -</net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean></configBean><annotations /></activity></activities><dispatchStack><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Parallelize</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig xmlns=""> - <maxJobs>1</maxJobs> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ParallelizeConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.ErrorBounce</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Failover</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Retry</class><configBean encoding="xstream"><net.sf.taverna.t2.workflowmodel.processor.dispatch .layers.RetryConfig xmlns=""> - <backoffFactor>1.0</backoffFactor> - <initialDelay>1000</initialDelay> - <maxDelay>5000</maxDelay> - <maxRetries>0</maxRetries> -</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.RetryConfig></configBean></dispatchLayer><dispatchLayer><raven><group>net.sf.taverna.t2.core</group><artifact>workflowmodel-impl</artifact><version>1.3-SNAPSHOT</version></raven><class>net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.Invoke</class><configBean encoding="xstream"><null xmlns="" /></configBean></dispatchLayer></dispatchStack><iterationStrategyStack><iteration><strategy /></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="dataflow"><port>out</port></sink><source type="processor"><processor>Service_protected_with_Basic_AuthN</processor><port>responseBody</port></source></datalink></datalinks><annotations><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>837b1710-ff29-4eef-85a0-51fc76139364</identification> - </annotationBean> - <date>2010-11-22 14:15:20.380 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>6eca35ba-d7d4-43d9-8593-93eba828cc46</identification> - </annotationBean> - <date>2010-11-29 10:41:02.602 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>adb25995-c890-40c7-b091-2c2512024864</identification> - </annotationBean> - <date>2010-11-29 10:35:54.270 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>b7887959-6d6c-4466-8d15-16b4e20051db</identification> - </annotationBean> - <date>2010-11-22 14:16:43.484 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain_2_2 encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns=""> - <annotationAssertions> - <net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.IdentificationAssertion"> - <identification>388333c0-fd34-4571-ab0c-f67c10c2ed64</identification> - </annotationBean> - <date>2010-11-22 14:21:12.760 GMT</date> - <creators /> - <curationEventList /> - </net.sf.taverna.t2.annotation.AnnotationAssertionImpl> - </annotationAssertions> -</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2></annotations></dataflow></workflow> \ No newline at end of file
