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:08 UTC

[17/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-scufl/src/main/resources/META-INF/services/org.apache.taverna.scufl2.api.io.WorkflowBundleReader
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/META-INF/services/org.apache.taverna.scufl2.api.io.WorkflowBundleReader b/taverna-scufl2-scufl/src/main/resources/META-INF/services/org.apache.taverna.scufl2.api.io.WorkflowBundleReader
deleted file mode 100644
index a37156a..0000000
--- a/taverna-scufl2-scufl/src/main/resources/META-INF/services/org.apache.taverna.scufl2.api.io.WorkflowBundleReader
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.taverna.scufl2.translator.scufl.ScuflReader
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/META-INF/services/org.apache.taverna.scufl2.translator.scufl.ScuflExtensionParser
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/META-INF/services/org.apache.taverna.scufl2.translator.scufl.ScuflExtensionParser b/taverna-scufl2-scufl/src/main/resources/META-INF/services/org.apache.taverna.scufl2.translator.scufl.ScuflExtensionParser
deleted file mode 100644
index 32b7279..0000000
--- a/taverna-scufl2-scufl/src/main/resources/META-INF/services/org.apache.taverna.scufl2.translator.scufl.ScuflExtensionParser
+++ /dev/null
@@ -1,10 +0,0 @@
-org.apache.taverna.scufl2.translator.scufl.processorelement.AbstractProcessorExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.ApiConsumerExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.BeanshellExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.BiomartExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.BiomobyExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.LocalExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.RshellExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.SoaplabExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.StringConstantExtensionParser
-org.apache.taverna.scufl2.translator.scufl.processorelement.WsdlExtensionParser

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-abstract.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-abstract.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-abstract.xsd
deleted file mode 100644
index ba3bea7..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-abstract.xsd
+++ /dev/null
@@ -1,78 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-            jaxb:version="1.0">
-
-
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="inputPortType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      <xsd:attribute name="syntacticType" type="xsd:string" form="qualified"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="inputPortListType">
-  <xsd:sequence>
-    <xsd:element ref="inputPort" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="outputPortType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      <xsd:attribute name="syntacticType" type="xsd:string" form="qualified"/>
-     </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="outputPortListType">
-  <xsd:sequence>
-    <xsd:element ref="outputPort" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="abstractprocessorType" mixed="true">
-  <xsd:sequence>
-    <xsd:element ref="inputPortList"/>
-    <xsd:element ref="outputPortList"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-
-<xsd:element name="inputPort" type="scufl:inputPortType"/>
-
-<xsd:element name="inputPortList" type="scufl:inputPortListType"/>
-
-
-<xsd:element name="outputPort" type="scufl:outputPortType"/>
-
-<xsd:element name="outputPortList" type="scufl:outputPortListType"/>
-
-<xsd:element name="abstractprocessor" type="scufl:abstractprocessorType" substitutionGroup="processorElement"/>
-
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-apiconsumer.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-apiconsumer.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-apiconsumer.xsd
deleted file mode 100644
index 1a198a4..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-apiconsumer.xsd
+++ /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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-            jaxb:version="1.0">
-
-
-<xsd:include schemaLocation="scufl.xsd" />
-<xsd:include schemaLocation="scufl-dependency.xsd" />
-
-<xsd:complexType name="apiconsumerType">
-      <xsd:sequence>
-      <xsd:element ref="class" maxOccurs="1" minOccurs="1"/>
-      <xsd:element ref="method" maxOccurs="1" minOccurs="1"/>
-      <xsd:element ref="description" maxOccurs="1" minOccurs="1"/>
-      <xsd:sequence>
-        <xsd:element ref="parameter" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:element ref="dependencies" maxOccurs="1" minOccurs="1"/>
-      <xsd:element ref="repositories" maxOccurs="1" minOccurs="1"/>
-      </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="classType">
-  <xsd:attribute name="name" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="methodType">
-  <xsd:attribute name="name" type="xsd:string"/>
-  <xsd:attribute name="static" type="xsd:boolean"/>
-  <xsd:attribute name="constructor" type="xsd:boolean"/>
-  <xsd:attribute name="type" type="xsd:string"/>
-  <xsd:attribute name="dimension" type="xsd:nonNegativeInteger"/>
-</xsd:complexType>
-
-<xsd:complexType name="parameterType">
-  	<xsd:annotation>
-         <xsd:appinfo>
-            <jaxb:class name="ApiConsumerParameterType"/>
-         </xsd:appinfo>
-      </xsd:annotation>
-  <xsd:attribute name="name" type="xsd:string"/>
-  <xsd:attribute name="type" type="xsd:string"/>
-  <xsd:attribute name="dimension" type="xsd:nonNegativeInteger"/>
-</xsd:complexType>
-
-<xsd:element name="parameter" type="scufl:parameterType">
- 	<xsd:annotation>
-         <xsd:appinfo>
-            <jaxb:class name="ApiConsumerParameter"/>
-         </xsd:appinfo>
-      </xsd:annotation>
-</xsd:element>
-
-<xsd:element name="class" type="scufl:classType"/>
-
-<xsd:element name="method" type="scufl:methodType"/>
-
-<xsd:element name="apiconsumer" type="scufl:apiconsumerType" substitutionGroup="processorElement"/>
-
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-beanshell.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-beanshell.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-beanshell.xsd
deleted file mode 100644
index 7a9665f..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-beanshell.xsd
+++ /dev/null
@@ -1,86 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-
-<xsd:include schemaLocation="scufl.xsd" />
-<xsd:include schemaLocation="scufl-dependency.xsd" />
-
-<xsd:complexType name="beanshellType">
-      <xsd:sequence>
-      <xsd:element ref="scriptvalue" maxOccurs="1" minOccurs="1"/>
-      <xsd:element ref="beanshellinputlist" maxOccurs="1" minOccurs="1"/>
-      <xsd:element ref="beanshelloutputlist" maxOccurs="1" minOccurs="1"/>
-      <xsd:element ref="dependencies" maxOccurs="1" minOccurs="1"/>
-      <xsd:element ref="repositories" maxOccurs="1" minOccurs="1"/>      
-      </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="scriptvalueType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="beanshellinputType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="syntactictype" type="xsd:string" form="qualified"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="beanshellinputlistType">
-  <xsd:sequence>
-    <xsd:element ref="beanshellinput" maxOccurs="unbounded" minOccurs="0"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="beanshelloutputType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="syntactictype" type="xsd:string" form="qualified"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="beanshelloutputlistType">
-  <xsd:sequence>
-    <xsd:element ref="beanshelloutput" maxOccurs="unbounded" minOccurs="0"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="beanshelloutput" type="scufl:beanshelloutputType"/>
-
-<xsd:element name="beanshelloutputlist" type="scufl:beanshelloutputlistType"/>
-
-<xsd:element name="beanshellinput" type="scufl:beanshellinputType"/>
-
-<xsd:element name="beanshellinputlist" type="scufl:beanshellinputlistType"/>
-
-<xsd:element name="scriptvalue" type="scufl:scriptvalueType"/>
-
-<xsd:element name="beanshell" type="scufl:beanshellType" substitutionGroup="processorElement"/>
-
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-biomart.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-biomart.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-biomart.xsd
deleted file mode 100644
index ffa99af..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-biomart.xsd
+++ /dev/null
@@ -1,36 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="biomartType">
-  <xsd:sequence>
-  <xsd:any/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="biomart" type="scufl:biomartType" substitutionGroup="processorElement"/>
-
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-biomoby.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-biomoby.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-biomoby.xsd
deleted file mode 100644
index 46cf697..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-biomoby.xsd
+++ /dev/null
@@ -1,140 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-            jaxb:version="1.0">
-
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="biomobywsdlType">
-  <xsd:sequence>
-    <xsd:element ref="mobyEndpoint"/>
-    <xsd:element ref="serviceName"/>
-    <xsd:element ref="authorityName"/>
-    <xsd:element ref="Parameter" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="mobyEndpointType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="serviceNameType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="authorityNameType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="ParameterType">
-	<xsd:annotation>
-         <xsd:appinfo>
-            <jaxb:class name="BiomobyParameterType"/>
-         </xsd:appinfo>
-      </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      <xsd:attribute name="name" type="xsd:string"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="endpointType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="articleNameType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="datatypeType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-
-
-<xsd:complexType name="biomobyparserType">
-  <xsd:sequence>
-    <xsd:element ref="endpoint"/>
-    <xsd:element ref="datatype"/>
-    <xsd:element ref="articleName"/>
-    <xsd:element ref="description"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="Parameter" type="ParameterType">
-	<xsd:annotation>
-         <xsd:appinfo>
-            <jaxb:class name="BiomobyParameter"/>
-         </xsd:appinfo>
-      </xsd:annotation>
-</xsd:element>
-
-<xsd:complexType name="biomobyobjectType">
-  <xsd:sequence>
-    <xsd:element ref="mobyEndpoint"/>
-    <xsd:element ref="serviceName"/>
-    <xsd:element ref="authorityName"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-
-<xsd:element name="articleName" type="articleNameType"/>
-
-<xsd:element name="datatype" type="datatypeType"/>
-
-<xsd:element name="endpoint" type="endpointType"/>
-
-<xsd:element name="mobyEndpoint" type="mobyEndpointType"/>
-
-<xsd:element name="serviceName" type="serviceNameType"/>
-
-<xsd:element name="authorityName" type="authorityNameType"/>
-
-<xsd:element name="biomobywsdl" type="scufl:biomobywsdlType" substitutionGroup="processorElement"/>
-
-<xsd:element name="biomobyparser" type="scufl:biomobyparserType" substitutionGroup="processorElement"/>
-
-<xsd:element name="biomobyobject" type="scufl:biomobyobjectType" substitutionGroup="processorElement"/>
-
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-dependency.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-dependency.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-dependency.xsd
deleted file mode 100644
index 2abaeeb..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-dependency.xsd
+++ /dev/null
@@ -1,72 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-            
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="dependenciesType">
-      <xsd:sequence>
-      <xsd:element ref="jarfile" maxOccurs="unbounded" minOccurs="0"/>     
-      <xsd:element ref="artifact" maxOccurs="unbounded" minOccurs="0"/>     
-      </xsd:sequence>
-      <xsd:attribute name="classloader" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="jarfileType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="artifactType">
-  <xsd:attribute name="groupId" type="xsd:string"/>
-  <xsd:attribute name="artifact" type="xsd:string"/>
-  <xsd:attribute name="version" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="repositoriesType">
-      <xsd:sequence>
-      <xsd:element ref="repository" maxOccurs="unbounded" minOccurs="0"/>         
-      </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="repositoryType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:element name="artifact" type="artifactType"/>
-
-
-<xsd:element name="jarfile" type="jarfileType"/>
-
-<xsd:element name="dependencies" type="scufl:dependenciesType"/>
-
-<xsd:element name="repositories" type="scufl:repositoriesType"/>
-<xsd:element name="repository" type="scufl:repositoryType"/>
-
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-inferno.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-inferno.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-inferno.xsd
deleted file mode 100644
index 20c002d..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-inferno.xsd
+++ /dev/null
@@ -1,67 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-            jaxb:version="1.0">
-
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="hostType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="portType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:nonNegativeInteger">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="serviceType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="infernoType">
-  <xsd:sequence>
-    <xsd:element ref="host"/>
-    <xsd:element ref="port"/>
-    <xsd:element ref="service"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:element name="host" type="scufl:hostType"/>
-
-<xsd:element name="port" type="scufl:portType"/>
-
-<xsd:element name="service" type="scufl:serviceType"/>
-
-<xsd:element name="inferno" type="scufl:infernoType" substitutionGroup="processorElement"/>
-
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-local.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-local.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-local.xsd
deleted file mode 100644
index 79d26fc..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-local.xsd
+++ /dev/null
@@ -1,62 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-            
-<xsd:include schemaLocation="scufl.xsd" />
-<xsd:include schemaLocation="scufl-wsdl.xsd" />
-
-<xsd:complexType name="flattenlistType">
-  <xsd:attribute name="depth" type="xsd:nonNegativeInteger"/>
-</xsd:complexType>
-            
-<xsd:complexType name="slicelistType">
-  <xsd:attribute name="depth" type="xsd:nonNegativeInteger"/>
-</xsd:complexType>
-            
-<xsd:complexType name="extensionsType">
-	<xsd:choice>
-        <xsd:element ref="complextype"/>
-        <xsd:element ref="arraytype"/>
-        <xsd:element ref="flattenlist"/>
-        <xsd:element ref="slicelist"/>
-      </xsd:choice>
-</xsd:complexType>
-
-<xsd:complexType name="localType" mixed="true">
-      <xsd:sequence>
-      <xsd:element ref="extensions" maxOccurs="1" minOccurs="0"/>
-      </xsd:sequence>
-     <xsd:attributeGroup ref="scufl:processorElementAttributes"/>
-</xsd:complexType>
-
-<xsd:element name="slicelist" type="scufl:slicelistType"/>
-
-<xsd:element name="flattenlist" type="scufl:flattenlistType"/>
-
-<xsd:element name="extensions" type="scufl:extensionsType"/>
-
-<xsd:element name="local" type="scufl:localType" substitutionGroup="processorElement">
-</xsd:element>
-
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-notification.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-notification.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-notification.xsd
deleted file mode 100644
index 9f24db1..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-notification.xsd
+++ /dev/null
@@ -1,34 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-            
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="notificationType">
-</xsd:complexType>
-
-<xsd:element name="notification" type="scufl:notificationType" substitutionGroup="processorElement">
-</xsd:element>
-
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-rshell.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-rshell.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-rshell.xsd
deleted file mode 100644
index 6eb3710..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-rshell.xsd
+++ /dev/null
@@ -1,84 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-            jaxb:version="1.0">
-
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="rshellInputPortType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      <xsd:attribute name="syntacticType" type="xsd:string" form="qualified"/>
-      <xsd:attribute name="symanticType" type="xsd:string" form="qualified"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="rshellInputPortListType">
-  <xsd:sequence>
-    <xsd:element ref="rshellInputPort" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="rshellOutputPortType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      <xsd:attribute name="syntacticType" type="xsd:string" form="qualified"/>
-       <xsd:attribute name="symanticType" type="xsd:string" form="qualified"/>
-     </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="rshellOutputPortListType">
-  <xsd:sequence>
-    <xsd:element ref="rshellOutputPort" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="rshellType" mixed="true">
-  <xsd:sequence>
-    <xsd:element ref="rshellInputPortList"/>
-    <xsd:element ref="rshellOutputPortList"/>
-  </xsd:sequence>
-  <xsd:attribute name="hostname" type="xsd:string" form="qualified"/>
-  <xsd:attribute name="port" type="xsd:nonNegativeInteger" form="qualified"/>
-  <xsd:attribute name="username" type="xsd:string" form="qualified"/>
-  <xsd:attribute name="password" type="xsd:string" form="qualified"/>
-  <xsd:attribute name="keepSessionAlive" type="xsd:boolean" form="qualified"/>
-</xsd:complexType>
-
-
-<xsd:element name="rshellInputPort" type="scufl:rshellInputPortType"/>
-
-<xsd:element name="rshellInputPortList" type="scufl:rshellInputPortListType"/>
-
-
-<xsd:element name="rshellOutputPort" type="scufl:rshellOutputPortType"/>
-
-<xsd:element name="rshellOutputPortList" type="scufl:rshellOutputPortListType"/>
-
-<xsd:element name="rshell" type="scufl:rshellType" substitutionGroup="processorElement"/>
-
-</xsd:schema>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-soaplab.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-soaplab.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-soaplab.xsd
deleted file mode 100644
index 7c4c893..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-soaplab.xsd
+++ /dev/null
@@ -1,41 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-            
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="soaplabwsdlType">
- <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-    <xsd:attribute name="interval" type="xsd:nonNegativeInteger"/>
-    <xsd:attribute name="backoff" type="xsd:double"/>
-    <xsd:attribute name="maxinterval" type="xsd:nonNegativeInteger"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-    
-<xsd:element name="soaplabwsdl" type="scufl:soaplabwsdlType" substitutionGroup="processorElement">
-</xsd:element>
-
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-stringconstant.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-stringconstant.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-stringconstant.xsd
deleted file mode 100644
index f0a2ce6..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-stringconstant.xsd
+++ /dev/null
@@ -1,38 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-            
-<xsd:include schemaLocation="scufl.xsd" />
-
-<xsd:complexType name="stringconstantType">
- <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-    
-<xsd:element name="stringconstant" type="scufl:stringconstantType" substitutionGroup="processorElement">
-</xsd:element>
-
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-wsdl.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-wsdl.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-wsdl.xsd
deleted file mode 100644
index 27b8ba6..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl-wsdl.xsd
+++ /dev/null
@@ -1,118 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-            
-<xsd:include schemaLocation="scufl.xsd" />
-<xsd:include schemaLocation="scufl-local.xsd" />
-
-<xsd:attributeGroup name="xmlElementAttributes">
-  <xsd:attribute name="optional" type="xsd:boolean"/>
-  <xsd:attribute name="unbounded" type="xsd:boolean"/>
-  <xsd:attribute name="wrapped" type="xsd:boolean"/>
-  <xsd:attribute name="typename" type="xsd:string"/>
-  <xsd:attribute name="name" type="xsd:string"/>
-</xsd:attributeGroup>
-
-<xsd:complexType name="elementtypeType">
-  <xsd:choice>
-    <xsd:element ref="complextype"/>
-    <xsd:element ref="arraytype"/>
-    <xsd:element ref="basetype"/>
-  </xsd:choice>
-</xsd:complexType>
-
-<xsd:complexType name="basetypeType">
-    <xsd:attribute name="qname" type="xsd:string"/>
-    <xsd:attributeGroup ref="scufl:xmlElementAttributes"/>
-</xsd:complexType>
-
-<xsd:complexType name="elementsType">
-    <xsd:sequence>
-      <xsd:choice maxOccurs="unbounded" minOccurs="0">
-        <xsd:element ref="complextype"/>
-        <xsd:element ref="arraytype"/>
-        <xsd:element ref="basetype"/>
-      </xsd:choice>
-    </xsd:sequence>
-</xsd:complexType>
-            
-<xsd:complexType name="complextypeType">
-    <xsd:sequence>
-     <xsd:element ref="elements" maxOccurs="1" minOccurs="0"/>
-     </xsd:sequence>
-    <xsd:attribute name="qname" type="xsd:string"/>
-    <xsd:attribute name="id" type="xsd:string"/>
-    <xsd:attributeGroup ref="scufl:xmlElementAttributes"/>
-</xsd:complexType>
-
-<xsd:complexType name="arraytypeType">
-    <xsd:sequence>
-      <xsd:element ref="elementtype"/>
-    </xsd:sequence>
-    <xsd:attribute name="qname" type="xsd:string"/>
-    <xsd:attribute name="id" type="xsd:string"/>
-    <xsd:attributeGroup ref="scufl:xmlElementAttributes"/>
-</xsd:complexType>
-
-
-<xsd:complexType name="wsdlType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="operationType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="arbitraryWsdlType">
- 			<xsd:sequence>
-			  <xsd:element ref="wsdl" minOccurs="1" maxOccurs="1"/>
-			  <xsd:element ref="operation" minOccurs="1" maxOccurs="1"/>
-			</xsd:sequence>
-     <xsd:attributeGroup ref="scufl:processorElementAttributes"/>
-</xsd:complexType>
-
-<xsd:element name="elementtype" type="scufl:elementtypeType"/>
-
-<xsd:element name="basetype" type="scufl:basetypeType"/>
-
-<xsd:element name="elements" type="scufl:elementsType"/>
-
-<xsd:element name="complextype" type="scufl:complextypeType"/>
-
-<xsd:element name="arraytype" type="scufl:arraytypeType"/>
-
-<xsd:element name="wsdl" type="scufl:wsdlType"/>
-
-<xsd:element name="operation" type="scufl:operationType"/>
-    
-<xsd:element name="arbitrarywsdl" type="scufl:arbitraryWsdlType" substitutionGroup="processorElement">
-</xsd:element>
-
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl.xsd b/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl.xsd
deleted file mode 100644
index 423fc69..0000000
--- a/taverna-scufl2-scufl/src/main/resources/org/apache/taverna/scufl2/translator/scufl/xsd/scufl.xsd
+++ /dev/null
@@ -1,354 +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.
--->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            targetNamespace="http://org.embl.ebi.escience/xscufl/0.1alpha"
-            xmlns:scufl="http://org.embl.ebi.escience/xscufl/0.1alpha">
-
-
-<xsd:complexType name="workflowDescriptionType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="lsid" type="xsd:string"/>
-        <xsd:attribute name="author" type="xsd:string"/>
-        <xsd:attribute name="title" type="xsd:string"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="descriptionType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="defaultType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="name" type="xsd:string"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="defaultsType">
-  <xsd:sequence>
-    <xsd:element ref="default" maxOccurs="unbounded" minOccurs="0"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:attributeGroup name="processorElementAttributes">
-  <xsd:attribute name="maxretries" type="xsd:positiveInteger"/>
-  <xsd:attribute name="retrydelay" type="xsd:positiveInteger"/>
-  <xsd:attribute name="retrybackoff" type="xsd:double"/>
-  <xsd:attribute name="critical" type="xsd:boolean"/>
-  <xsd:attribute name="breakpoint" type="xsd:boolean"/>
-</xsd:attributeGroup>
-
-<xsd:complexType name="mergemodeType">
-  <xsd:attribute name="input" type="xsd:string"/>
-  <xsd:attribute name="mode" fixed="merge" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="iteratorType">
-  <xsd:sequence/>
-  <xsd:attribute name="name" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="iterationstrategyType">
-  <xsd:choice>
-    <xsd:element ref="iterator"/>
-    <xsd:element ref="dot"/>
-    <xsd:element ref="cross"/>
-  </xsd:choice>
-</xsd:complexType>
-
-<xsd:complexType name="dotType">
-  <xsd:sequence>
-  <xsd:choice>
-    <xsd:element ref="iterator"/>
-    <xsd:element ref="dot"/>
-    <xsd:element ref="cross"/>
-  </xsd:choice>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="crossType">
-  <xsd:sequence>
-  <xsd:choice>
-    <xsd:element ref="iterator"/> 
-    <xsd:element ref="dot"/>
-    <xsd:element ref="cross"/>
-  </xsd:choice>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="templateLiteralType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="templatePortReferenceType">
-  <xsd:attribute name="name" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="mapType">
-  <xsd:attribute name="key" type="xsd:string"/>
-  <xsd:attribute name="value" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="templateType">
-  <xsd:sequence>
-    <xsd:choice maxOccurs="unbounded" minOccurs="1">
-      <xsd:element ref="templateLiteral"/>
-      <xsd:element ref="templatePortReference"/>
-    </xsd:choice>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="processorType">
-  <xsd:sequence>
-    <xsd:element ref="description" maxOccurs="1" minOccurs="0"/>
-    <xsd:element ref="defaults" maxOccurs="1" minOccurs="0"/>
-    <xsd:element ref="processorElement" maxOccurs="1" minOccurs="1"/>
-    <xsd:element ref="mergemode" maxOccurs="unbounded" minOccurs="0"/>
-    <xsd:element ref="iterationstrategy" maxOccurs="1" minOccurs="0"/>
-    <xsd:element ref="alternate" maxOccurs="unbounded" minOccurs="0"/>
-    <xsd:element ref="template"/>
-  </xsd:sequence>
-  <xsd:attribute name="name" type="xsd:string"/>
-  <xsd:attribute name="workers" type="xsd:positiveInteger"/>
-  <xsd:attribute name="boring" type="xsd:boolean"/>
-  <xsd:attribute name="log" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="alternateType">
-  <xsd:complexContent>
-    <xsd:extension base="scufl:processorType">
-      <xsd:sequence>
-        <xsd:element ref="inputmap" maxOccurs="unbounded" minOccurs="0"/>
-       <xsd:element ref="outputmap" maxOccurs="unbounded" minOccurs="0"/>
-      </xsd:sequence>
-    </xsd:extension>
-  </xsd:complexContent>
-</xsd:complexType>
-
-<xsd:complexType name="nodeType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="linkType">
-  <xsd:sequence>
-    <xsd:element ref="input"/>
-    <xsd:element ref="output"/>
-  </xsd:sequence>
-  <xsd:attribute name="source" type="xsd:string"/>
-  <xsd:attribute name="sink" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="mimeTypeType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="semanticTypeType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="metadataType">
-  <xsd:sequence>
-    <xsd:element ref="mimeTypes"/>
-    <xsd:element ref="description"/>
-    <xsd:element ref="semanticType"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="sourceType">
-  <xsd:sequence>
-    <xsd:element ref="metadata"/>
-  </xsd:sequence>
-  <xsd:attribute name="name" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="sinkType">
-  <xsd:sequence>
-   <xsd:element ref="metadata"/>
-  </xsd:sequence>
-  <xsd:attribute name="mode" type="xsd:string"/>
-  <xsd:attribute name="name" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="conditionStateType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="targetType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-
-<xsd:complexType name="conditionType">
-  <xsd:sequence>
-    <xsd:element ref="state" minOccurs="1" maxOccurs="1"/>
-     <xsd:element ref="target" minOccurs="1" maxOccurs="1"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="statusCodeType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-      </xsd:extension>
-    </xsd:simpleContent>
-</xsd:complexType>
-
-<xsd:complexType name="statechangeType">
-  <xsd:sequence>
-    <xsd:element ref="from" minOccurs="1" maxOccurs="1"/>
-     <xsd:element ref="to" minOccurs="1" maxOccurs="1"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-
-<xsd:complexType name="actionType">
-  <xsd:sequence>
-    <xsd:element ref="target" minOccurs="1" maxOccurs="1"/>
-    <xsd:element ref="statechange" minOccurs="1" maxOccurs="1"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="coordinationType">
-  <xsd:sequence>
-    <xsd:element ref="condition" minOccurs="1" maxOccurs="1"/>
-    <xsd:element ref="action" minOccurs="1" maxOccurs="1"/>
-  </xsd:sequence>
-  <xsd:attribute name="name" type="xsd:string"/>
-</xsd:complexType>
-
-<xsd:complexType name="scuflType">
-  <xsd:sequence>
-    <xsd:element ref="workflowdescription" minOccurs="1" maxOccurs="1"/>
-    <xsd:element ref="processor" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element ref="link" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element ref="source" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element ref="sink" minOccurs="0" maxOccurs="unbounded"/>
-    <xsd:element ref="coordination" minOccurs ="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-  <xsd:attribute name="version" type="xsd:string"/>
-  <xsd:attribute name="log" type="xsd:nonNegativeInteger"/>
-</xsd:complexType>
-
-
-<xsd:element name="action" type="scufl:actionType"/>
-
-<xsd:element name="alternate" type="scufl:alternateType"/>
-    
-<xsd:element name="condition" type="scufl:conditionType"/>
-
-<xsd:element name="coordination" type="scufl:coordinationType"/>
-
-<xsd:element name="cross" type="scufl:crossType"/>
-
-<xsd:element name="default" type="scufl:defaultType"/>
-
-<xsd:element name="defaults" type="scufl:defaultsType"/>
-
-<xsd:element name="description" type="scufl:descriptionType"/>
-
-<xsd:element name="dot" type="scufl:dotType"/>
-
-<xsd:element name="from" type="scufl:statusCodeType"/>
-
-<xsd:element name="input" type="scufl:nodeType"/>
-
-<xsd:element name="inputmap" type="scufl:mapType"/>
-
-<xsd:element name="iterationstrategy" type="scufl:iterationstrategyType"/>
- 
-
-<xsd:element name="iterator" type="scufl:iteratorType"/>
-
-<xsd:element name="link" type="scufl:linkType"/>
-
-<xsd:element name="mergemode" type="scufl:mergemodeType"/>
-
-<xsd:element name="metadata" type="scufl:metadataType"/>
-
-<xsd:element name="mimeType" type="scufl:mimeTypeType"/>
-
-<xsd:element name="mimeTypes">
-      <xsd:complexType>
-      <xsd:sequence>
-      <xsd:element ref="mimeType"/>
-      </xsd:sequence>
-      </xsd:complexType>
-</xsd:element>
-
-<xsd:element name="output" type="scufl:nodeType"/>
-
-<xsd:element name="outputmap" type="scufl:mapType"/>
-
-<xsd:element name="processor" type="scufl:processorType"/>
-
-<xsd:element name="processorElement" abstract="true"/>
-
-<xsd:element name="scufl" type="scufl:scuflType"/>
-
-<xsd:element name="semanticType" type="scufl:semanticTypeType"/>
-
-<xsd:element name="sink" type="scufl:sinkType"/>
-
-<xsd:element name="source" type="scufl:sourceType"/>
-
-<xsd:element name="state" type="scufl:conditionStateType"/>
-
-<xsd:element name="statechange" type="scufl:statechangeType"/>
-
-
-<xsd:element name="target" type="scufl:targetType"/>
-
-<xsd:element name="template" type="scufl:templateType"/>
-
-<xsd:element name="templateLiteral" type="scufl:templateLiteralType"/>
-
-<xsd:element name="templatePortReference"
-                   type="scufl:templatePortReferenceType"/>
-                   
-<xsd:element name="to" type="scufl:statusCodeType"/>
-
-<xsd:element name="workflowdescription" type="scufl:workflowDescriptionType"/>
-
-</xsd:schema>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/test/java/org/apache/taverna/scufl2/translator/scufl2/TestScuflReader.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/test/java/org/apache/taverna/scufl2/translator/scufl2/TestScuflReader.java b/taverna-scufl2-scufl/src/test/java/org/apache/taverna/scufl2/translator/scufl2/TestScuflReader.java
deleted file mode 100644
index 97daa69..0000000
--- a/taverna-scufl2-scufl/src/test/java/org/apache/taverna/scufl2/translator/scufl2/TestScuflReader.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.apache.taverna.scufl2.translator.scufl2;
-/*
- *
- * 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.apache.taverna.scufl2.translator.scufl.ScuflReader.APPLICATION_VND_TAVERNA_SCUFL_XML;
-import static org.junit.Assert.assertEquals;
-
-import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
-import org.junit.Test;
-
-
-public class TestScuflReader {
-
-	private static final String WORKFLOW10_XML = "/workflow10.xml";
-	WorkflowBundleIO io = new WorkflowBundleIO();
-
-	@Test
-	public void guessMediaType() throws Exception {
-		byte[] firstBytes = new byte[1024];
-		getClass().getResourceAsStream(WORKFLOW10_XML).read(firstBytes);
-		assertEquals(APPLICATION_VND_TAVERNA_SCUFL_XML,
-				io.guessMediaTypeForSignature(firstBytes));
-		// Mess up the namespace
-		firstBytes[70] = 32;
-		assertEquals(null, io.guessMediaTypeForSignature(firstBytes));
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/316e4a8a/taverna-scufl2-scufl/src/test/java/org/apache/taverna/scufl2/translator/scufl2/TestStarterPack.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/src/test/java/org/apache/taverna/scufl2/translator/scufl2/TestStarterPack.java b/taverna-scufl2-scufl/src/test/java/org/apache/taverna/scufl2/translator/scufl2/TestStarterPack.java
deleted file mode 100644
index 5890bf8..0000000
--- a/taverna-scufl2-scufl/src/test/java/org/apache/taverna/scufl2/translator/scufl2/TestStarterPack.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 
- */
-package org.apache.taverna.scufl2.translator.scufl2;
-/*
- *
- * 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.
- *
-*/
-
-
-/**
- * @author alanrw
- *
- */
-public class TestStarterPack {
-
-}