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 12:17:50 UTC

[34/52] [abbrv] incubator-taverna-language git commit: Delete unused testing workflows

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/14d0f060/taverna-scufl2-t2flow/src/test/resources/dispatchlayers-xsd.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/test/resources/dispatchlayers-xsd.t2flow b/taverna-scufl2-t2flow/src/test/resources/dispatchlayers-xsd.t2flow
deleted file mode 100644
index fd47f1e..0000000
--- a/taverna-scufl2-t2flow/src/test/resources/dispatchlayers-xsd.t2flow
+++ /dev/null
@@ -1,755 +0,0 @@
-<workflow xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://taverna.sf.net/2008/xml/t2flow ../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/t2flow-extended.xsd"
-	xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="taverna-2.3.0">
-	<dataflow id="3805e4de-40e6-4052-a292-8adc6515618c" role="top">
-		<name>Workflow1</name>
-		<inputPorts />
-		<outputPorts />
-		<processors>
-			<processor>
-				<name>retries</name>
-				<inputPorts />
-				<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 />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean
-								xmlns="">
-								<value>retries</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>3</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>
-			<processor>
-				<name>retries_custom</name>
-				<inputPorts />
-				<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 />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean
-								xmlns="">
-								<value>retries</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.13</backoffFactor>
-								<initialDelay>1337</initialDelay>
-								<maxDelay>7000</maxDelay>
-								<maxRetries>5</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>
-			<processor>
-				<name>parallelise</name>
-				<inputPorts />
-				<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 />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean
-								xmlns="">
-								<value>parallelise</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>5</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>
-			<processor>
-				<name>alternates</name>
-				<inputPorts />
-				<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 />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean
-								xmlns="">
-								<value>edit me!</value>
-							</net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean>
-						</configBean>
-						<annotations />
-					</activity>
-					<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>edit me!</value>
-							</net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean>
-						</configBean>
-						<annotations />
-					</activity>
-					<activity>
-						<raven>
-							<group>net.sf.taverna.t2.activities</group>
-							<artifact>beanshell-activity</artifact>
-							<version>1.3</version>
-						</raven>
-						<class>net.sf.taverna.t2.activities.beanshell.BeanshellActivity</class>
-						<inputMap />
-						<outputMap>
-							<map from="value" to="notValue" />
-						</outputMap>
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean
-								xmlns="">
-								<inputs />
-								<outputs>
-									<net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean>
-										<name>notValue</name>
-										<depth>0</depth>
-										<mimeTypes>
-											<string>'text/plain'</string>
-										</mimeTypes>
-										<granularDepth>0</granularDepth>
-									</net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean>
-								</outputs>
-								<classLoaderSharing>workflow</classLoaderSharing>
-								<localDependencies />
-								<artifactDependencies />
-								<script />
-								<dependencies />
-							</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.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>0</initialDelay>
-								<maxDelay>0</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 />
-						</strategy>
-					</iteration>
-				</iterationStrategyStack>
-			</processor>
-			<processor>
-				<name>looping</name>
-				<inputPorts />
-				<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 />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean
-								xmlns="">
-								<value>looping</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.Loop</class>
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.LoopConfiguration
-								xmlns="">
-								<conditionXML>&lt;activity xmlns="http://taverna.sf.net/2008/xml/t2flow"&gt;&lt;raven&gt;&lt;group&gt;net.sf.taverna.t2.activities&lt;/group&gt;&lt;artifact&gt;beanshell-activity&lt;/artifact&gt;&lt;version&gt;1.3&lt;/version&gt;&lt;/raven&gt;&lt;class&gt;net.sf.taverna.t2.activities.beanshell.BeanshellActivity&lt;/class&gt;&lt;inputMap /&gt;&lt;outputMap /&gt;&lt;configBean encoding="xstream"&gt;&lt;net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""&gt;&#xD;
-  &lt;inputs&gt;&#xD;
-    &lt;net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean&gt;&#xD;
-      &lt;name&gt;value&lt;/name&gt;&#xD;
-      &lt;depth&gt;0&lt;/depth&gt;&#xD;
-      &lt;translatedElementType&gt;java.lang.String&lt;/translatedElementType&gt;&#xD;
-      &lt;allowsLiteralValues&gt;true&lt;/allowsLiteralValues&gt;&#xD;
-    &lt;/net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean&gt;&#xD;
-  &lt;/inputs&gt;&#xD;
-  &lt;outputs&gt;&#xD;
-    &lt;net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean&gt;&#xD;
-      &lt;name&gt;loop&lt;/name&gt;&#xD;
-      &lt;depth&gt;0&lt;/depth&gt;&#xD;
-      &lt;granularDepth&gt;0&lt;/granularDepth&gt;&#xD;
-    &lt;/net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean&gt;&#xD;
-  &lt;/outputs&gt;&#xD;
-  &lt;classLoaderSharing&gt;workflow&lt;/classLoaderSharing&gt;&#xD;
-  &lt;localDependencies /&gt;&#xD;
-  &lt;artifactDependencies /&gt;&#xD;
-  &lt;script&gt;loop = "" + ! value.equals("fred"); &#xD;
-if ("true".matches(loop)) {&#xD;
-   Thread.sleep(500);&#xD;
-}&lt;/script&gt;&#xD;
-  &lt;dependencies /&gt;&#xD;
-&lt;/net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean&gt;&lt;/configBean&gt;&lt;annotations /&gt;&lt;/activity&gt;</conditionXML>
-								<runFirst>true</runFirst>
-								<properties>
-									<property name="compareValue" value="fred" />
-									<property name="delay" value="0.5" />
-									<property name="comparePort" value="value" />
-									<property name="isFeedBack" value="false" />
-									<property name="comparison" value="EqualTo" />
-								</properties>
-							</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.LoopConfiguration>
-						</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>
-			<processor>
-				<name>looping_2</name>
-				<inputPorts />
-				<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 />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.stringconstant.StringConstantConfigurationBean
-								xmlns="">
-								<value>looping</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.Loop</class>
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.LoopConfiguration
-								xmlns="">
-								<conditionXML>&lt;activity xmlns="http://taverna.sf.net/2008/xml/t2flow"&gt;&lt;raven&gt;&lt;group&gt;net.sf.taverna.t2.activities&lt;/group&gt;&lt;artifact&gt;beanshell-activity&lt;/artifact&gt;&lt;version&gt;1.3&lt;/version&gt;&lt;/raven&gt;&lt;class&gt;net.sf.taverna.t2.activities.beanshell.BeanshellActivity&lt;/class&gt;&lt;inputMap /&gt;&lt;outputMap /&gt;&lt;configBean encoding="xstream"&gt;&lt;net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean xmlns=""&gt;&#xD;
-  &lt;inputs&gt;&#xD;
-    &lt;net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean&gt;&#xD;
-      &lt;name&gt;value&lt;/name&gt;&#xD;
-      &lt;depth&gt;0&lt;/depth&gt;&#xD;
-      &lt;translatedElementType&gt;java.lang.String&lt;/translatedElementType&gt;&#xD;
-      &lt;allowsLiteralValues&gt;true&lt;/allowsLiteralValues&gt;&#xD;
-    &lt;/net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean&gt;&#xD;
-  &lt;/inputs&gt;&#xD;
-  &lt;outputs&gt;&#xD;
-    &lt;net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean&gt;&#xD;
-      &lt;name&gt;loop&lt;/name&gt;&#xD;
-      &lt;depth&gt;0&lt;/depth&gt;&#xD;
-      &lt;granularDepth&gt;0&lt;/granularDepth&gt;&#xD;
-    &lt;/net.sf.taverna.t2.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean&gt;&#xD;
-  &lt;/outputs&gt;&#xD;
-  &lt;classLoaderSharing&gt;workflow&lt;/classLoaderSharing&gt;&#xD;
-  &lt;localDependencies /&gt;&#xD;
-  &lt;artifactDependencies /&gt;&#xD;
-  &lt;script&gt;loop = "" + ! value.equals("fred"); &#xD;
-if ("true".matches(loop)) {&#xD;
-   Thread.sleep(500);&#xD;
-}&lt;/script&gt;&#xD;
-  &lt;dependencies /&gt;&#xD;
-&lt;/net.sf.taverna.t2.activities.beanshell.BeanshellActivityConfigurationBean&gt;&lt;/configBean&gt;&lt;annotations /&gt;&lt;/activity&gt;</conditionXML>
-								<runFirst>true</runFirst>
-								<properties>
-									<property name="compareValue" value="fred" />
-									<property name="comparePort" value="value" />
-									<property name="delay" value="0.5" />
-									<property name="comparison" value="EqualTo" />
-									<property name="isFeedBack" value="false" />
-								</properties>
-							</net.sf.taverna.t2.workflowmodel.processor.dispatch.layers.LoopConfiguration>
-						</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 />
-		<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>3805e4de-40e6-4052-a292-8adc6515618c
-								</identification>
-							</annotationBean>
-							<date>2011-09-14 14:23:05.364 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/14d0f060/taverna-scufl2-t2flow/src/test/resources/rest-2-2-saved-2-3-xsd.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/test/resources/rest-2-2-saved-2-3-xsd.t2flow b/taverna-scufl2-t2flow/src/test/resources/rest-2-2-saved-2-3-xsd.t2flow
deleted file mode 100755
index b725379..0000000
--- a/taverna-scufl2-t2flow/src/test/resources/rest-2-2-saved-2-3-xsd.t2flow
+++ /dev/null
@@ -1,367 +0,0 @@
-<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://taverna.sf.net/2008/xml/t2flow ../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/t2flow-extended.xsd"
-	xsi:noNamespaceSchemaLocation="../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd"
-	version="1" producedBy="taverna-2.3.0">
-	<dataflow id="44e3e7d3-df8c-401b-8b77-9d001343d8c2" role="top">
-		<name>Workflow1</name>
-		<inputPorts />
-		<outputPorts />
-		<processors>
-			<processor>
-				<name>default</name>
-				<inputPorts />
-				<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 />
-						<outputMap />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean
-								xmlns="">
-								<httpMethod>GET</httpMethod>
-								<urlSignature>http://www.myexperiment.org/user.xml?id={userID}</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>userID</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 />
-					</iteration>
-				</iterationStrategyStack>
-			</processor>
-			<processor>
-				<name>put</name>
-				<inputPorts />
-				<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 />
-						<outputMap />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean
-								xmlns="">
-								<httpMethod>PUT</httpMethod>
-								<urlSignature>http://example.com/{thing}/user.xml?id={userID}</urlSignature>
-								<acceptsHeaderValue>application/xml</acceptsHeaderValue>
-								<contentTypeForUpdates>application/json</contentTypeForUpdates>
-								<outgoingDataFormat>String</outgoingDataFormat>
-								<sendHTTPExpectRequestHeader>true</sendHTTPExpectRequestHeader>
-								<showRedirectionOutputPort>true</showRedirectionOutputPort>
-								<escapeParameters>true</escapeParameters>
-								<otherHTTPHeaders />
-								<activityInputs>
-									<entry>
-										<string>userID</string>
-										<java-class>java.lang.String</java-class>
-									</entry>
-									<entry>
-										<string>thing</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 />
-					</iteration>
-				</iterationStrategyStack>
-			</processor>
-			<processor>
-				<name>post</name>
-				<inputPorts />
-				<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 />
-						<outputMap />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean
-								xmlns="">
-								<httpMethod>POST</httpMethod>
-								<urlSignature>http://www.myexperiment.org/user.xml?id={userID}</urlSignature>
-								<acceptsHeaderValue>text/plain</acceptsHeaderValue>
-								<contentTypeForUpdates>application/zip</contentTypeForUpdates>
-								<outgoingDataFormat>Binary</outgoingDataFormat>
-								<sendHTTPExpectRequestHeader>false</sendHTTPExpectRequestHeader>
-								<showRedirectionOutputPort>false</showRedirectionOutputPort>
-								<escapeParameters>true</escapeParameters>
-								<otherHTTPHeaders />
-								<activityInputs>
-									<entry>
-										<string>userID</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 />
-					</iteration>
-				</iterationStrategyStack>
-			</processor>
-		</processors>
-		<conditions />
-		<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>44e3e7d3-df8c-401b-8b77-9d001343d8c2</identification>
-							</annotationBean>
-							<date>2011-08-30 16:11:29.231 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/14d0f060/taverna-scufl2-t2flow/src/test/resources/rest-2-2-saved-2-3.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/test/resources/rest-2-2-saved-2-3.t2flow b/taverna-scufl2-t2flow/src/test/resources/rest-2-2-saved-2-3.t2flow
deleted file mode 100755
index 9d4d7b0..0000000
--- a/taverna-scufl2-t2flow/src/test/resources/rest-2-2-saved-2-3.t2flow
+++ /dev/null
@@ -1,85 +0,0 @@
-<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow" version="1" producedBy="taverna-2.3.0"><dataflow id="44e3e7d3-df8c-401b-8b77-9d001343d8c2" role="top"><name>Workflow1</name><inputPorts /><outputPorts /><processors><processor><name>default</name><inputPorts /><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 /><outputMap /><configBean encoding="xstream"><net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean xmlns="">
-  <httpMethod>GET</httpMethod>
-  <urlSignature>http://www.myexperiment.org/user.xml?id={userID}</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>userID</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 /></iteration></iterationStrategyStack></processor><processor><name>put</name><inputPorts /><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 /><outputMap /><configBean encoding="xstream"><net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean xmlns="">
-  <httpMethod>PUT</httpMethod>
-  <urlSignature>http://example.com/{thing}/user.xml?id={userID}</urlSignature>
-  <acceptsHeaderValue>application/xml</acceptsHeaderValue>
-  <contentTypeForUpdates>application/json</contentTypeForUpdates>
-  <outgoingDataFormat>String</outgoingDataFormat>
-  <sendHTTPExpectRequestHeader>true</sendHTTPExpectRequestHeader>
-  <showRedirectionOutputPort>true</showRedirectionOutputPort>
-  <escapeParameters>true</escapeParameters>
-  <otherHTTPHeaders />
-  <activityInputs>
-    <entry>
-      <string>userID</string>
-      <java-class>java.lang.String</java-class>
-    </entry>
-    <entry>
-      <string>thing</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 /></iteration></iterationStrategyStack></processor><processor><name>post</name><inputPorts /><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 /><outputMap /><configBean encoding="xstream"><net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean xmlns="">
-  <httpMethod>POST</httpMethod>
-  <urlSignature>http://www.myexperiment.org/user.xml?id={userID}</urlSignature>
-  <acceptsHeaderValue>text/plain</acceptsHeaderValue>
-  <contentTypeForUpdates>application/zip</contentTypeForUpdates>
-  <outgoingDataFormat>Binary</outgoingDataFormat>
-  <sendHTTPExpectRequestHeader>false</sendHTTPExpectRequestHeader>
-  <showRedirectionOutputPort>false</showRedirectionOutputPort>
-  <escapeParameters>true</escapeParameters>
-  <otherHTTPHeaders />
-  <activityInputs>
-    <entry>
-      <string>userID</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 /></iteration></iterationStrategyStack></processor></processors><conditions /><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>44e3e7d3-df8c-401b-8b77-9d001343d8c2</identification>
-      </annotationBean>
-      <date>2011-08-30 16:11:29.231 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/14d0f060/taverna-scufl2-t2flow/src/test/resources/rest-2-2-xsd.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/test/resources/rest-2-2-xsd.t2flow b/taverna-scufl2-t2flow/src/test/resources/rest-2-2-xsd.t2flow
deleted file mode 100755
index 026b77d..0000000
--- a/taverna-scufl2-t2flow/src/test/resources/rest-2-2-xsd.t2flow
+++ /dev/null
@@ -1,361 +0,0 @@
-<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://taverna.sf.net/2008/xml/t2flow ../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/t2flow-extended.xsd"
-	xsi:noNamespaceSchemaLocation="../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd"
-	version="1" producedBy="taverna-2.2.0">
-	<dataflow id="44e3e7d3-df8c-401b-8b77-9d001343d8c2" role="top">
-		<name>Workflow1</name>
-		<inputPorts />
-		<outputPorts />
-		<processors>
-			<processor>
-				<name>default</name>
-				<inputPorts />
-				<outputPorts />
-				<annotations />
-				<activities>
-					<activity>
-						<raven>
-							<group>net.sf.taverna.t2.ui-activities</group>
-							<artifact>rest-activity</artifact>
-							<version>0.3.1</version>
-						</raven>
-						<class>net.sf.taverna.t2.activities.rest.RESTActivity</class>
-						<inputMap />
-						<outputMap />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean
-								xmlns="">
-								<httpMethod>GET</httpMethod>
-								<urlSignature>http://www.myexperiment.org/user.xml?id={userID}</urlSignature>
-								<acceptsHeaderValue>text/plain</acceptsHeaderValue>
-								<contentTypeForUpdates>application/xml</contentTypeForUpdates>
-								<outgoingDataFormat>String</outgoingDataFormat>
-								<sendHTTPExpectRequestHeader>false</sendHTTPExpectRequestHeader>
-								<showRedirectionOutputPort>false</showRedirectionOutputPort>
-								<activityInputs>
-									<entry>
-										<string>userID</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.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>put</name>
-				<inputPorts />
-				<outputPorts />
-				<annotations />
-				<activities>
-					<activity>
-						<raven>
-							<group>net.sf.taverna.t2.ui-activities</group>
-							<artifact>rest-activity</artifact>
-							<version>0.3.1</version>
-						</raven>
-						<class>net.sf.taverna.t2.activities.rest.RESTActivity</class>
-						<inputMap />
-						<outputMap />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean
-								xmlns="">
-								<httpMethod>PUT</httpMethod>
-								<urlSignature>http://example.com/{thing}/user.xml?id={userID}</urlSignature>
-								<acceptsHeaderValue>application/xml</acceptsHeaderValue>
-								<contentTypeForUpdates>application/json</contentTypeForUpdates>
-								<outgoingDataFormat>String</outgoingDataFormat>
-								<sendHTTPExpectRequestHeader>true</sendHTTPExpectRequestHeader>
-								<showRedirectionOutputPort>true</showRedirectionOutputPort>
-								<activityInputs>
-									<entry>
-										<string>userID</string>
-										<java-class>java.lang.String</java-class>
-									</entry>
-									<entry>
-										<string>thing</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.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>post</name>
-				<inputPorts />
-				<outputPorts />
-				<annotations />
-				<activities>
-					<activity>
-						<raven>
-							<group>net.sf.taverna.t2.ui-activities</group>
-							<artifact>rest-activity</artifact>
-							<version>0.3.1</version>
-						</raven>
-						<class>net.sf.taverna.t2.activities.rest.RESTActivity</class>
-						<inputMap />
-						<outputMap />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean
-								xmlns="">
-								<httpMethod>POST</httpMethod>
-								<urlSignature>http://www.myexperiment.org/user.xml?id={userID}</urlSignature>
-								<acceptsHeaderValue>text/plain</acceptsHeaderValue>
-								<contentTypeForUpdates>application/zip</contentTypeForUpdates>
-								<outgoingDataFormat>Binary</outgoingDataFormat>
-								<sendHTTPExpectRequestHeader>false</sendHTTPExpectRequestHeader>
-								<showRedirectionOutputPort>false</showRedirectionOutputPort>
-								<activityInputs>
-									<entry>
-										<string>userID</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.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 />
-		<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>44e3e7d3-df8c-401b-8b77-9d001343d8c2</identification>
-							</annotationBean>
-							<date>2011-08-30 16:11:29.231 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/14d0f060/taverna-scufl2-t2flow/src/test/resources/rest-2-3-xsd.t2flow
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/src/test/resources/rest-2-3-xsd.t2flow b/taverna-scufl2-t2flow/src/test/resources/rest-2-3-xsd.t2flow
deleted file mode 100755
index fe0e4aa..0000000
--- a/taverna-scufl2-t2flow/src/test/resources/rest-2-3-xsd.t2flow
+++ /dev/null
@@ -1,376 +0,0 @@
-<workflow xmlns="http://taverna.sf.net/2008/xml/t2flow"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://taverna.sf.net/2008/xml/t2flow ../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/t2flow-extended.xsd"
-	xsi:noNamespaceSchemaLocation="../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd"
-	version="1" producedBy="taverna-2.3.0">
-	<dataflow id="e63fe2cd-a6f3-46e2-9d5a-06e7b2fbb0d5" role="top">
-		<name>Workflow1</name>
-		<inputPorts />
-		<outputPorts />
-		<processors>
-			<processor>
-				<name>default</name>
-				<inputPorts />
-				<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 />
-						<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>application/xml</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 />
-					</iteration>
-				</iterationStrategyStack>
-			</processor>
-			<processor>
-				<name>put</name>
-				<inputPorts />
-				<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 />
-						<outputMap />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean
-								xmlns="">
-								<httpMethod>PUT</httpMethod>
-								<urlSignature>http://www.uniprot.org/{db}/{id}.xml</urlSignature>
-								<acceptsHeaderValue>audio/mp4</acceptsHeaderValue>
-								<contentTypeForUpdates>application/xml</contentTypeForUpdates>
-								<outgoingDataFormat>String</outgoingDataFormat>
-								<sendHTTPExpectRequestHeader>true</sendHTTPExpectRequestHeader>
-								<showRedirectionOutputPort>true</showRedirectionOutputPort>
-								<escapeParameters>true</escapeParameters>
-								<otherHTTPHeaders>
-									<list>
-										<string>X-Fish</string>
-										<string>Soup</string>
-									</list>
-									<list>
-										<string>X-Taverna</string>
-										<string>Very funny</string>
-									</list>
-								</otherHTTPHeaders>
-								<activityInputs>
-									<entry>
-										<string>id</string>
-										<java-class>java.lang.String</java-class>
-									</entry>
-									<entry>
-										<string>db</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 />
-					</iteration>
-				</iterationStrategyStack>
-			</processor>
-			<processor>
-				<name>post</name>
-				<inputPorts />
-				<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 />
-						<outputMap />
-						<configBean encoding="xstream">
-							<net.sf.taverna.t2.activities.rest.RESTActivityConfigurationBean
-								xmlns="">
-								<httpMethod>POST</httpMethod>
-								<urlSignature>http://www.uniprot.org/uniprot/{id}.xml</urlSignature>
-								<acceptsHeaderValue>application/xml</acceptsHeaderValue>
-								<contentTypeForUpdates>application/zip</contentTypeForUpdates>
-								<outgoingDataFormat>Binary</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 />
-					</iteration>
-				</iterationStrategyStack>
-			</processor>
-		</processors>
-		<conditions />
-		<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>e63fe2cd-a6f3-46e2-9d5a-06e7b2fbb0d5</identification>
-							</annotationBean>
-							<date>2011-08-30 16:15:25.25 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