You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 21:40:15 UTC
[24/51] [partial] incubator-taverna-language git commit: temporarily
empty repository
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-examples/src/test/resources/workflows/t2flow/helloanyone.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-examples/src/test/resources/workflows/t2flow/helloanyone.t2flow b/taverna-scufl2-examples/src/test/resources/workflows/t2flow/helloanyone.t2flow
deleted file mode 100644
index 2e100b1..0000000
--- a/taverna-scufl2-examples/src/test/resources/workflows/t2flow/helloanyone.t2flow
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="taverna-2.2.0"><dataflow id="01348671-5aaa-4cc2-84cc-477329b70b0d" role="top"><name>Hello_Anyone</name><inputPorts><port><name>name</name><depth>0</depth><granularDepth>0</granularDepth><annotations><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.ExampleValue">
- <text>World!</text>
- </annotationBean>
- <date>2012-01-03 15:13:04.106 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.FreeTextDescription">
- <text>Your name for the greeting</text>
- </annotationBean>
- <date>2012-01-03 15:13:12.530 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain></annotations></port></inputPorts><outputPorts><port><name>greeting</name><annotations /></port></outputPorts><processors><processor><name>hello</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><processor><name>Concatenate_two_strings</name><inputPorts><port><name>string1</name><depth>0</depth></port><port><name>string2</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.LocalworkerActivi
ty</class><inputMap><map from="string2" to="string2" /><map from="string1" to="string1" /></inputMap><outputMap><map from="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="string1" depth="0" /><port name="string2" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>Concatenate_two_strings</processor><port>string1</port></sink><source type="processor"><processor>hello</processor><port>value</port></source></datalink><datalink><sink type="processor"><processor>Concatenate_two_strings</processor><port>string2</port></sink><source type="dataflow"><port>name</port></source></datalink><datalin
k><sink type="dataflow"><port>greeting</port></sink><source type="processor"><processor>Concatenate_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>8781d5f4-d0ba-48a8-a1d1-14281bd8a917</identification>
- </annotationBean>
- <date>2012-01-03 15:12:21.684 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>ca7dba1d-1fdf-476f-b911-714d09227d70</identification>
- </annotationBean>
- <date>2012-01-03 15:14:18.734 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.Author">
- <text>Stian Soiland-Reyes</text>
- </annotationBean>
- <date>2012-01-03 15:10:48.73 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.DescriptiveTitle">
- <text>Hello Anyone</text>
- </annotationBean>
- <date>2012-01-03 15:14:25.703 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.DescriptiveTitle">
- <text>Hello World</text>
- </annotationBean>
- <date>2012-01-03 15:10:54.167 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.FreeTextDescription">
- <text>One of the simplest workflows possible, outputting the String Constant "Hello world!"</text>
- </annotationBean>
- <date>2012-01-03 15:11:14.557 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.FreeTextDescription">
- <text>An extension to helloworld.t2flow - this workflow takes a workflow input "name" which is combined with the string constant "Hello, " using the local worker "Concatenate two strings", and outputs the produced string to the workflow output "greeting".</text>
- </annotationBean>
- <date>2012-01-03 15:14:13.847 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.FreeTextDescription">
- <text>One of the simplest workflows possible. No workflow input ports, a single workflow output port "greeting", outputting "Hello, world!" as produced by the String Constant "hello".</text>
- </annotationBean>
- <date>2012-01-03 15:12:15.643 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><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>01348671-5aaa-4cc2-84cc-477329b70b0d</identification>
- </annotationBean>
- <date>2012-01-03 15:14:30.45 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-language/blob/316e4a8a/taverna-scufl2-examples/src/test/resources/workflows/t2flow/helloworld.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-examples/src/test/resources/workflows/t2flow/helloworld.t2flow b/taverna-scufl2-examples/src/test/resources/workflows/t2flow/helloworld.t2flow
deleted file mode 100644
index 2991433..0000000
--- a/taverna-scufl2-examples/src/test/resources/workflows/t2flow/helloworld.t2flow
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="taverna-2.2.0"><dataflow id="8781d5f4-d0ba-48a8-a1d1-14281bd8a917" role="top"><name>Hello_World</name><inputPorts /><outputPorts><port><name>greeting</name><annotations /></port></outputPorts><processors><processor><name>hello</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, World!</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="dataflow"><port>greeting</port></sink><source type="processor"><processor>hello</processor><port>value</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>8781d5f4-d0ba-48a8-a1d1-14281bd8a917</identification>
- </annotationBean>
- <date>2012-01-03 15:12:21.684 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain_2_2><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.Author">
- <text>Stian Soiland-Reyes</text>
- </annotationBean>
- <date>2012-01-03 15:10:48.73 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.DescriptiveTitle">
- <text>Hello World</text>
- </annotationBean>
- <date>2012-01-03 15:10:54.167 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.FreeTextDescription">
- <text>One of the simplest workflows possible, outputting the String Constant "Hello world!"</text>
- </annotationBean>
- <date>2012-01-03 15:11:14.557 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain><annotation_chain encoding="xstream"><net.sf.taverna.t2.annotation.AnnotationChainImpl xmlns="">
- <annotationAssertions>
- <net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- <annotationBean class="net.sf.taverna.t2.annotation.annotationbeans.FreeTextDescription">
- <text>One of the simplest workflows possible. No workflow input ports, a single workflow output port "greeting", outputting "Hello, world!" as produced by the String Constant "hello".</text>
- </annotationBean>
- <date>2012-01-03 15:12:15.643 GMT</date>
- <creators />
- <curationEventList />
- </net.sf.taverna.t2.annotation.AnnotationAssertionImpl>
- </annotationAssertions>
-</net.sf.taverna.t2.annotation.AnnotationChainImpl></annotation_chain></annotations></dataflow></workflow>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-examples/src/test/resources/workflows/wfbundle/as.wfbundle
----------------------------------------------------------------------
diff --git a/taverna-scufl2-examples/src/test/resources/workflows/wfbundle/as.wfbundle b/taverna-scufl2-examples/src/test/resources/workflows/wfbundle/as.wfbundle
deleted file mode 100644
index 40033a8..0000000
Binary files a/taverna-scufl2-examples/src/test/resources/workflows/wfbundle/as.wfbundle and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-examples/src/test/resources/workflows/wfbundle/defaultActivitiesTaverna2.wfbundle
----------------------------------------------------------------------
diff --git a/taverna-scufl2-examples/src/test/resources/workflows/wfbundle/defaultActivitiesTaverna2.wfbundle b/taverna-scufl2-examples/src/test/resources/workflows/wfbundle/defaultActivitiesTaverna2.wfbundle
deleted file mode 100644
index 2bed19b..0000000
Binary files a/taverna-scufl2-examples/src/test/resources/workflows/wfbundle/defaultActivitiesTaverna2.wfbundle and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/pom.xml b/taverna-scufl2-integration-tests/pom.xml
deleted file mode 100644
index 9670a8e..0000000
--- a/taverna-scufl2-integration-tests/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-language</artifactId>
- <version>0.16.1-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-integration-tests</artifactId>
- <name>Apache Taverna Scufl 2 integration tests</name>
- <packaging>bundle</packaging>
- <description>Integration tests depending on multiple modules</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.4</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-rdfxml</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-t2flow</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-scufl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/integration/CloningIT.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/integration/CloningIT.java b/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/integration/CloningIT.java
deleted file mode 100644
index 8cefc04..0000000
--- a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/integration/CloningIT.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.apache.taverna.scufl2.integration;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import org.apache.taverna.scufl2.api.common.AbstractCloneable;
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.core.Processor;
-import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
-import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyStack;
-import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyTopNode;
-
-public class CloningIT {
- @Test
- public void cloneIterationStack() throws Exception {
- WorkflowBundleIO io = new WorkflowBundleIO();
-
- WorkflowBundle wf = io.readBundle(getClass().getResource("/clone-error.wfbundle"), null);
-
- Processor proc = wf.getMainWorkflow().getProcessors().getByName("Beanshell");
- IterationStrategyStack stack = proc.getIterationStrategyStack();
- IterationStrategyTopNode root = stack.get(0);
- assertNotSame(stack, root);
- assertNotEquals(stack, root);
- System.out.println(stack);
- System.out.println(root);
- @SuppressWarnings("unused")
- AbstractCloneable clone = wf.clone();
-
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/integration/TestSimpleWf.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/integration/TestSimpleWf.java b/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/integration/TestSimpleWf.java
deleted file mode 100644
index 42c0f16..0000000
--- a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/integration/TestSimpleWf.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.apache.taverna.scufl2.integration;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-import java.io.File;
-import java.net.URI;
-
-import org.junit.Test;
-
-import org.apache.taverna.scufl2.api.activity.Activity;
-import org.apache.taverna.scufl2.api.common.Scufl2Tools;
-import org.apache.taverna.scufl2.api.configurations.Configuration;
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.core.DataLink;
-import org.apache.taverna.scufl2.api.core.Processor;
-import org.apache.taverna.scufl2.api.core.Workflow;
-import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
-import org.apache.taverna.scufl2.api.port.InputProcessorPort;
-import org.apache.taverna.scufl2.api.port.InputWorkflowPort;
-import org.apache.taverna.scufl2.api.port.OutputProcessorPort;
-import org.apache.taverna.scufl2.api.port.OutputWorkflowPort;
-import org.apache.taverna.scufl2.api.profiles.Profile;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-public class TestSimpleWf {
- private static final WorkflowBundleIO bundleIo = new WorkflowBundleIO();
- private static final Scufl2Tools scufl2Tools = new Scufl2Tools();
- private static final String bundleType = "application/vnd.taverna.scufl2.workflow-bundle";
- public static URI BEANSHELL = URI
- .create("http://ns.taverna.org.uk/2010/activity/beanshell");
-
- @Test
- public void testName() throws Exception {
- // Workflow
- WorkflowBundle wb = new WorkflowBundleIO().createBundle();
-
- Workflow wf = wb.getMainWorkflow();
- wf.setName("test_wf");
- InputWorkflowPort raw = new InputWorkflowPort(wf, "RAW");
- OutputWorkflowPort msconvert_log = new OutputWorkflowPort(wf, "MSCONVERT_LOG");
- OutputWorkflowPort cmd = new OutputWorkflowPort(wf, "cmd");
-
- // processor
- Processor msconvert = new Processor(wf, "MSCONVERT");
- InputProcessorPort ms_raw = new InputProcessorPort(msconvert, "raw");
- OutputProcessorPort ms_out = new OutputProcessorPort(msconvert, "out");
- OutputProcessorPort ms_cmd = new OutputProcessorPort(msconvert, "cmd");
-
- // links
- new DataLink(wf, raw, ms_raw);
- new DataLink(wf, ms_out, msconvert_log);
- new DataLink(wf, ms_cmd, cmd);
-
- // Beanshell script
- Activity script = new Activity("msconvert");
- script.setType(BEANSHELL);
-
- Profile profile = wb.getMainProfile();
- script.setParent(profile);
- profile.getActivities().add(script);
-
- scufl2Tools.createActivityPortsFromProcessor(script, msconvert);
- scufl2Tools.bindActivityToProcessorByMatchingPorts(script, msconvert);
-
- Configuration config = new Configuration();
- config.setConfigures(script);
- config.setType(BEANSHELL.resolve("#Config"));
- ((ObjectNode)config.getJson()).put("script",
- "blablalbal");
- profile.getConfigurations().add(config);
-
- // Save to file (or System.out ? )
- File file = File.createTempFile("test", ".wfbundle");
- bundleIo.writeBundle(wb, file, bundleType);
- System.out.println(file);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/EmptyStackIT.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/EmptyStackIT.java b/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/EmptyStackIT.java
deleted file mode 100644
index c2df966..0000000
--- a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/EmptyStackIT.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.apache.taverna.scufl2.translator.t2flow;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.net.URL;
-
-import org.junit.Test;
-
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
-
-public class EmptyStackIT {
-
- /* From http://dev.mygrid.org.uk/issues/browse/SCUFL2-121 */
-
- private static final String WF_REST = "/rest.t2flow";
- private static WorkflowBundleIO workflowBundleIO = new WorkflowBundleIO();
-
-
- @Test
- public void readSimpleWorkflow() throws Exception {
- URL wfResource = getClass().getResource(WF_REST);
- assertNotNull("Could not find workflow " + WF_REST,
- wfResource);
-
- File bundleFile = File.createTempFile("test", "wfbundle");
-
- WorkflowBundle wfBundle = workflowBundleIO.readBundle(wfResource, null);
- workflowBundleIO.writeBundle(wfBundle, bundleFile, "application/vnd.taverna.scufl2.workflow-bundle");
- wfBundle = workflowBundleIO.readBundle(bundleFile, null);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/LiteralNamespacesIT.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/LiteralNamespacesIT.java b/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/LiteralNamespacesIT.java
deleted file mode 100644
index 12b282f..0000000
--- a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/LiteralNamespacesIT.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.taverna.scufl2.translator.t2flow;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.net.URL;
-
-import org.junit.Test;
-
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
-
-public class LiteralNamespacesIT {
-
- /* From http://dev.mygrid.org.uk/issues/browse/SCUFL2-120 */
-
- private static final String WF_APICONSUMER = "/apiconsumer.t2flow";
- private static WorkflowBundleIO workflowBundleIO = new WorkflowBundleIO();
-
-
- @Test
- public void readSimpleWorkflow() throws Exception {
- URL wfResource = getClass().getResource(WF_APICONSUMER);
- assertNotNull("Could not find workflow " + WF_APICONSUMER,
- wfResource);
-
- File bundleFile = File.createTempFile("test", "wfbundle");
-
- WorkflowBundle wfBundle = workflowBundleIO.readBundle(wfResource, null);
- workflowBundleIO.writeBundle(wfBundle, bundleFile, "application/vnd.taverna.scufl2.workflow-bundle");
- wfBundle = workflowBundleIO.readBundle(bundleFile, null);
- @SuppressWarnings("unused")
- String profile = wfBundle.getResources().getResourceAsString("profile/taverna-2.3.0.rdf");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/PropertyListRoundtripIT.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/PropertyListRoundtripIT.java b/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/PropertyListRoundtripIT.java
deleted file mode 100644
index 383a5fb..0000000
--- a/taverna-scufl2-integration-tests/src/test/java/org/apache/taverna/scufl2/translator/t2flow/PropertyListRoundtripIT.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.apache.taverna.scufl2.translator.t2flow;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-import static org.junit.Assert.assertNotNull;
-
-import java.io.File;
-import java.net.URL;
-
-import org.junit.Test;
-
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
-
-public class PropertyListRoundtripIT {
-
- /* From http://dev.mygrid.org.uk/issues/browse/SCUFL2-120 */
-
- private static final String WF_APICONSUMER = "/apiconsumer.t2flow";
- private static WorkflowBundleIO workflowBundleIO = new WorkflowBundleIO();
-
-
- @Test
- public void readSimpleWorkflow() throws Exception {
- URL wfResource = getClass().getResource(WF_APICONSUMER);
- assertNotNull("Could not find workflow " + WF_APICONSUMER,
- wfResource);
-
- File bundleFile = File.createTempFile("test", "wfbundle");
-
- WorkflowBundle wfBundle = workflowBundleIO.readBundle(wfResource, null);
- workflowBundleIO.writeBundle(wfBundle, bundleFile, "application/vnd.taverna.scufl2.workflow-bundle");
- wfBundle = workflowBundleIO.readBundle(bundleFile, null);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-integration-tests/src/test/resources/apiconsumer.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/src/test/resources/apiconsumer.t2flow b/taverna-scufl2-integration-tests/src/test/resources/apiconsumer.t2flow
deleted file mode 100644
index 66ef4ac..0000000
--- a/taverna-scufl2-integration-tests/src/test/resources/apiconsumer.t2flow
+++ /dev/null
@@ -1,178 +0,0 @@
-<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="taverna-2.3.0"><dataflow id="8bf2b5e5-a3e0-4fbd-bfd2-aefc7b2a6b8a" role="top"><name>Workflow4</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>String</name><inputPorts><port><name>string</name><depth>0</depth></port></inputPorts><outputPorts><port><name>object</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>apiconsumer-activity</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.activities.apiconsumer.ApiConsumerActivity</class><inputMap><map from="string" to="string" /></inputMap><outputMap><map from="object" to="object" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.apic
onsumer.ApiConsumerActivityConfigurationBean xmlns="">
- <inputs />
- <outputs />
- <classLoaderSharing>workflow</classLoaderSharing>
- <localDependencies />
- <artifactDependencies />
- <apiConsumerName>No name</apiConsumerName>
- <apiConsumerDescription>No description</apiConsumerDescription>
- <description />
- <className>java.lang.String</className>
- <methodName>String</methodName>
- <parameterNames>
- <string>string</string>
- </parameterNames>
- <parameterDimensions>
- <int>0</int>
- </parameterDimensions>
- <parameterTypes>
- <string>java.lang.String</string>
- </parameterTypes>
- <returnType>java.lang.String</returnType>
- <returnDimension>0</returnDimension>
- <isMethodStatic>false</isMethodStatic>
- <isMethodConstructor>true</isMethodConstructor>
-</net.sf.taverna.t2.activities.apiconsumer.ApiConsumerActivityConfigurationBean></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="string" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor><processor><name>toUpperCase</name><inputPorts><port><name>object</name><depth>0</depth></port></inputPorts><outputPorts><port><name>result</name><depth>0</depth><granularDepth>0</granularDepth></port></outputPorts><annotations /><activities><activity><raven><group>net.sf.taverna.t2.activities</group><artifact>apiconsumer-activity</artifact><version>1.3</version></raven><class>net.sf.taverna.t2.activities.apiconsumer.ApiConsumerActivity</cl
ass><inputMap><map from="object" to="object" /></inputMap><outputMap><map from="result" to="result" /></outputMap><configBean encoding="xstream"><net.sf.taverna.t2.activities.apiconsumer.ApiConsumerActivityConfigurationBean xmlns="">
- <inputs />
- <outputs />
- <classLoaderSharing>workflow</classLoaderSharing>
- <localDependencies />
- <artifactDependencies />
- <apiConsumerName>No name</apiConsumerName>
- <apiConsumerDescription>No description</apiConsumerDescription>
- <description />
- <className>java.lang.String</className>
- <methodName>toUpperCase</methodName>
- <parameterNames />
- <parameterDimensions />
- <parameterTypes />
- <returnType>java.lang.String</returnType>
- <returnDimension>0</returnDimension>
- <isMethodStatic>false</isMethodStatic>
- <isMethodConstructor>false</isMethodConstructor>
-</net.sf.taverna.t2.activities.apiconsumer.ApiConsumerActivityConfigurationBean></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="object" depth="0" /></cross></strategy></iteration></iterationStrategyStack></processor></processors><conditions /><datalinks><datalink><sink type="processor"><processor>String</processor><port>string</port></sink><source type="dataflow"><port>in</port></source></datalink><datalink><sink type="processor"><processor>toUpperCase</processor><port>object</port></sink><source type="processor"><processor>String</processor><port>object</port></source></datalink><datalink><sink type="dataflow"><port>out</port></sink><source type="proc
essor"><processor>toUpperCase</processor><port>result</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>483d65c6-98c1-4b94-b628-d5bcbf351e97</identification>
- </annotationBean>
- <date>2011-05-16 13:07:03.385 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>d460e60a-43bb-47fc-a9f4-89e15274b100</identification>
- </annotationBean>
- <date>2011-11-02 12:43:09.911 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>0d977496-aa5d-4274-9827-85400d5f13a2</identification>
- </annotationBean>
- <date>2011-05-16 13:06:33.69 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>8bf2b5e5-a3e0-4fbd-bfd2-aefc7b2a6b8a</identification>
- </annotationBean>
- <date>2011-11-02 12:46:41.313 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>58f30a52-57df-46ce-b1bb-b9533984f8dd</identification>
- </annotationBean>
- <date>2011-11-02 12:29:15.575 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>c2693c41-1373-48cf-afbe-d8bbe0ea9e35</identification>
- </annotationBean>
- <date>2011-11-02 12:31:01.678 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>1ce7f3a0-71f4-4794-8bbd-dbb6de42442d</identification>
- </annotationBean>
- <date>2011-05-16 12:57:01.975 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>4c2b6995-eecb-47a7-b72c-63cfb96b6852</identification>
- </annotationBean>
- <date>2011-11-02 12:43:51.355 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>225db881-4e07-4cdb-920c-343dc1536edc</identification>
- </annotationBean>
- <date>2011-05-16 13:10:54.588 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>404e203c-ce51-4a9f-907c-1dab7f2eaaa2</identification>
- </annotationBean>
- <date>2011-05-16 12:44:02.533 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>0b6881f1-aa8d-483e-a7bb-7ad38b1da778</identification>
- </annotationBean>
- <date>2011-05-16 12:26:38.721 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-language/blob/316e4a8a/taverna-scufl2-integration-tests/src/test/resources/clone-error.wfbundle
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/src/test/resources/clone-error.wfbundle b/taverna-scufl2-integration-tests/src/test/resources/clone-error.wfbundle
deleted file mode 100644
index 485fac2..0000000
Binary files a/taverna-scufl2-integration-tests/src/test/resources/clone-error.wfbundle and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-integration-tests/src/test/resources/rest.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/src/test/resources/rest.t2flow b/taverna-scufl2-integration-tests/src/test/resources/rest.t2flow
deleted file mode 100644
index f3f90b8..0000000
--- a/taverna-scufl2-integration-tests/src/test/resources/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-language/blob/316e4a8a/taverna-scufl2-rdfxml/.gitignore
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/.gitignore b/taverna-scufl2-rdfxml/.gitignore
deleted file mode 100644
index ea8c4bf..0000000
--- a/taverna-scufl2-rdfxml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-rdfxml/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/pom.xml b/taverna-scufl2-rdfxml/pom.xml
deleted file mode 100644
index a31cacb..0000000
--- a/taverna-scufl2-rdfxml/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-language</artifactId>
- <version>0.16.1-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-rdfxml</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 RDF/XML</name>
- <description>XSD based XML serialisation which is RDF/XML compatible</description>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-schemas</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-ucfpackage</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>${jdom.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-repository-sail</artifactId>
- <version>${sesame.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-sail-memory</artifactId>
- <version>${sesame.version}</version>
- <scope>test</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- <optional>true</optional>
- </dependency>
- -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <version>${jaxb.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jaxen</groupId>
- <artifactId>com.springsource.org.jaxen</artifactId>
- <version>${jaxen.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-rdfxml/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java b/taverna-scufl2-rdfxml/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java
deleted file mode 100644
index bc4ce6f..0000000
--- a/taverna-scufl2-rdfxml/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.apache.taverna.scufl2.rdfxml;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-import java.net.URI;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import org.apache.taverna.scufl2.api.common.Scufl2Tools;
-import org.apache.taverna.scufl2.api.common.URITools;
-import org.apache.taverna.scufl2.api.common.WorkflowBean;
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.io.ReaderException;
-
-import org.apache.taverna.scufl2.rdfxml.jaxb.ObjectFactory;
-
-public class AbstractParser {
- protected JAXBContext jaxbContext;
- protected final ThreadLocal<ParserState> parserState;
- protected Scufl2Tools scufl2Tools = new Scufl2Tools();
- protected Unmarshaller unmarshaller;
- protected URITools uriTools = new URITools();
-
- /**
- * A static class for the thread-local parser state.
- */
- private static class ThreadLocalParserState extends ThreadLocal<ParserState> {
- @Override
- protected ParserState initialValue() {
- return new ParserState();
- };
- }
-
- public AbstractParser() {
- this(new ThreadLocalParserState());
- }
-
- public AbstractParser(ThreadLocal<ParserState> parserState) {
- this.parserState = parserState;
- createMarshaller();
- }
-
- protected void clearParserState() {
- parserState.remove();
- }
-
- private void createMarshaller() {
- try {
- jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
- unmarshaller = jaxbContext.createUnmarshaller();
- } catch (JAXBException e) {
- throw new IllegalStateException(
- "Can't create JAXBContext/unmarshaller", e);
- }
- }
-
- protected ParserState getParserState() {
- return parserState.get();
- }
-
- protected void mapBean(String about, WorkflowBean bean) {
- if (about == null)
- return;
- URI aboutUri = getParserState().getCurrentBase().resolve(about);
- mapBean(aboutUri, bean);
- }
-
- protected void mapBean(URI uri, WorkflowBean bean) {
- getParserState().getUriToBean().put(uri, bean);
- getParserState().getBeanToUri().put(bean, uri);
- }
-
- protected URI resolve(String uri) {
- return getParserState().getCurrentBase().resolve(uri);
- }
-
- protected <T extends WorkflowBean> T resolveBeanUri(String resource,
- Class<T> beanType) throws ReaderException {
- URI uri = resolve(resource);
- WorkflowBean bean = resolveBeanUri(uri);
- if (bean == null)
- throw new ReaderException("Can't find workflow bean for resource "
- + resource);
- if (!beanType.isInstance(bean))
- throw new ReaderException("Wrong type for workflow bean "
- + resource + ", expected " + beanType.getSimpleName()
- + " but was " + bean.getClass().getSimpleName());
- return beanType.cast(bean);
- }
-
- protected WorkflowBean resolveBeanUri(URI uri) {
- WorkflowBean workflowBean = getParserState().getUriToBean().get(uri);
- if (workflowBean != null)
- return workflowBean;
- uri = getParserState().getCurrentBase().resolve(uri);
- return uriTools.resolveUri(uri,
- getParserState().getCurrent(WorkflowBundle.class));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-rdfxml/src/main/java/org/apache/taverna/scufl2/rdfxml/ParserState.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/main/java/org/apache/taverna/scufl2/rdfxml/ParserState.java b/taverna-scufl2-rdfxml/src/main/java/org/apache/taverna/scufl2/rdfxml/ParserState.java
deleted file mode 100644
index cc54bc6..0000000
--- a/taverna-scufl2-rdfxml/src/main/java/org/apache/taverna/scufl2/rdfxml/ParserState.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.apache.taverna.scufl2.rdfxml;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Stack;
-
-import org.apache.taverna.scufl2.api.common.WorkflowBean;
-import org.apache.taverna.scufl2.api.core.Processor;
-import org.apache.taverna.scufl2.ucfpackage.UCFPackage;
-
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-public class ParserState {
- private Map<WorkflowBean, URI> beanToUri = new HashMap<>();
- private URI currentBase;
- private URI location;
- private Stack<WorkflowBean> stack = new Stack<>();
- private UCFPackage ucfPackage;
- private Map<URI, WorkflowBean> uriToBean = new HashMap<>();
- private Map<Processor, ObjectNode> dispatchConfigs = new HashMap<>();
-
- public Map<WorkflowBean, URI> getBeanToUri() {
- return beanToUri;
- }
-
- public <T extends WorkflowBean> T getCurrent(Class<T> beanType) {
- if (getStack().isEmpty())
- throw new IllegalStateException("Parser stack is empty");
- if (beanType.isInstance(getStack().peek()))
- return beanType.cast(getStack().peek());
- T candidate = null;
- for (WorkflowBean bean : getStack())
- if (beanType.isInstance(bean))
- // Don't return - we want the *last* candidate
- candidate = beanType.cast(bean);
- if (candidate == null)
- throw new IllegalStateException("Could not find a " + beanType + " on parser stack");
- return candidate;
- }
-
- public URI getCurrentBase() {
- return currentBase;
- }
-
- public URI getLocation() {
- return location;
- }
-
- public Stack<WorkflowBean> getStack() {
- return stack;
- }
-
- public UCFPackage getUcfPackage() {
- return ucfPackage;
- }
-
- public Map<URI, WorkflowBean> getUriToBean() {
- return uriToBean;
- }
-
- public WorkflowBean peek() {
- return getStack().peek();
- }
-
- public WorkflowBean pop() {
- return getStack().pop();
- }
-
- public void push(WorkflowBean workflowBean) {
- getStack().push(workflowBean);
- }
-
- public void setBeanToUri(Map<WorkflowBean, URI> beanToUri) {
- this.beanToUri = beanToUri;
- }
-
- public void setCurrentBase(URI currentBase) {
- this.currentBase = currentBase;
- }
-
- public void setLocation(URI location) {
- this.location = location;
- }
-
- public void setStack(Stack<WorkflowBean> currentIterationStrategyNode) {
- stack = currentIterationStrategyNode;
- }
-
- public void setUcfPackage(UCFPackage ucfPackage) {
- this.ucfPackage = ucfPackage;
- }
-
- public void setUriToBean(Map<URI, WorkflowBean> uriToBean) {
- this.uriToBean = uriToBean;
- }
-
- public Map<Processor, ObjectNode> getDispatchConfigs() {
- return dispatchConfigs;
- }
-
- public void setDispatchConfigs(Map<Processor, ObjectNode> dispatchConfigs) {
- this.dispatchConfigs = dispatchConfigs;
- }
-}