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 2018/01/18 01:27:43 UTC

svn commit: r1821447 [1/2] - in /incubator/taverna/site/trunk/content/ns/2010: .htaccess port.xsd xml/ xml/.htaccess xml/server.xsd xml/server/ xml/server/.htaccess xml/server/rest.xsd xml/server/tavserv.wadl

Author: stain
Date: Thu Jan 18 01:27:43 2018
New Revision: 1821447

URL: http://svn.apache.org/viewvc?rev=1821447&view=rev
Log:
Taverna Server namespaces

Extracted from tavserv.wadl in 3.1.0

Added:
    incubator/taverna/site/trunk/content/ns/2010/port.xsd
    incubator/taverna/site/trunk/content/ns/2010/xml/
    incubator/taverna/site/trunk/content/ns/2010/xml/.htaccess
    incubator/taverna/site/trunk/content/ns/2010/xml/server/
    incubator/taverna/site/trunk/content/ns/2010/xml/server.xsd
    incubator/taverna/site/trunk/content/ns/2010/xml/server/.htaccess
    incubator/taverna/site/trunk/content/ns/2010/xml/server/rest.xsd
    incubator/taverna/site/trunk/content/ns/2010/xml/server/tavserv.wadl
Modified:
    incubator/taverna/site/trunk/content/ns/2010/.htaccess

Modified: incubator/taverna/site/trunk/content/ns/2010/.htaccess
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/content/ns/2010/.htaccess?rev=1821447&r1=1821446&r2=1821447&view=diff
==============================================================================
--- incubator/taverna/site/trunk/content/ns/2010/.htaccess (original)
+++ incubator/taverna/site/trunk/content/ns/2010/.htaccess Thu Jan 18 01:27:43 2018
@@ -2,3 +2,5 @@ RewriteEngine On
 RewriteBase /ns/2010/
 # Try try to make scufl2.xsd work
 RewriteRule (scufl2[^/]+) scufl2/$1 [L,R=307] 
+
+RewriteRule port port.xsd
\ No newline at end of file

Added: incubator/taverna/site/trunk/content/ns/2010/port.xsd
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/content/ns/2010/port.xsd?rev=1821447&view=auto
==============================================================================
--- incubator/taverna/site/trunk/content/ns/2010/port.xsd (added)
+++ incubator/taverna/site/trunk/content/ns/2010/port.xsd Thu Jan 18 01:27:43 2018
@@ -0,0 +1,139 @@
+<!-- 
+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.
+-->
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:port="http://ns.taverna.org.uk/2010/port/"
+	xmlns:run="http://ns.taverna.org.uk/2010/run/" xmlns:tns="http://ns.taverna.org.uk/2010/port/"
+	xmlns:xlink="http://www.w3.org/1999/xlink" attributeFormDefault="qualified"
+	elementFormDefault="qualified" targetNamespace="http://ns.taverna.org.uk/2010/port/"
+	jxb:version="2.1">
+    <xs:annotation>
+    	<xs:appinfo>
+			<jxb:schemaBindings>
+				<jxb:package name="org.apache.taverna.server.client.port" />
+			</jxb:schemaBindings>
+    	</xs:appinfo>
+    </xs:annotation>
+    <xs:import namespace="http://www.w3.org/1999/xlink" />
+    <xs:element name="inputDescription" type="port:inputDescription" />
+    <xs:element name="workflowOutputs" type="port:outputDescription" />
+    <xs:complexType name="outputDescription">
+        <xs:complexContent>
+            <xs:extension base="port:PortDescription">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="output" type="port:OutputPort" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType abstract="true" name="PortDescription">
+        <xs:sequence />
+        <xs:attribute ref="port:workflowId" />
+        <xs:attribute ref="port:workflowRun" />
+        <xs:attribute ref="port:workflowRunId" />
+    </xs:complexType>
+    <xs:complexType name="OutputPort">
+        <xs:complexContent>
+            <xs:extension base="port:Port">
+                <xs:choice>
+                    <xs:element name="value" type="port:LeafValue" />
+                    <xs:element name="list" type="port:ListValue" />
+                    <xs:element name="error" type="port:ErrorValue" />
+                    <xs:element name="absent" type="port:AbsentValue" />
+                </xs:choice>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="Port">
+        <xs:sequence />
+        <xs:attribute ref="port:name" use="required" />
+        <xs:attribute ref="port:depth" />
+    </xs:complexType>
+    <xs:complexType name="LeafValue">
+        <xs:complexContent>
+            <xs:extension base="port:Value">
+                <xs:sequence />
+                <xs:attribute ref="port:contentFile" />
+                <xs:attribute ref="port:contentType" />
+                <xs:attribute ref="port:contentByteLength" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType abstract="true" name="Value">
+        <xs:sequence />
+        <xs:attribute ref="xlink:href" />
+    </xs:complexType>
+    <xs:complexType name="ErrorValue">
+        <xs:complexContent>
+            <xs:extension base="port:Value">
+                <xs:sequence />
+                <xs:attribute ref="port:depth" />
+                <xs:attribute ref="port:errorFile" />
+                <xs:attribute ref="port:errorByteLength" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="ListValue">
+        <xs:complexContent>
+            <xs:extension base="port:Value">
+                <xs:sequence>
+                    <xs:choice maxOccurs="unbounded" minOccurs="0">
+                        <xs:element name="value" type="port:LeafValue" />
+                        <xs:element name="list" type="port:ListValue" />
+                        <xs:element name="error" type="port:ErrorValue" />
+                        <xs:element name="absent" type="port:AbsentValue" />
+                    </xs:choice>
+                </xs:sequence>
+                <xs:attribute ref="port:length" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="AbsentValue">
+        <xs:complexContent>
+            <xs:extension base="port:Value">
+                <xs:sequence />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="inputDescription">
+        <xs:complexContent>
+            <xs:extension base="port:PortDescription">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="input" type="port:InputPort" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="InputPort">
+        <xs:complexContent>
+            <xs:extension base="port:Port">
+                <xs:sequence />
+                <xs:attribute ref="xlink:href" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:attribute name="contentByteLength" type="xs:long" />
+    <xs:attribute name="contentFile" type="xs:string" />
+    <xs:attribute name="contentType" type="xs:string" />
+    <xs:attribute name="depth" type="xs:int" />
+    <xs:attribute name="errorByteLength" type="xs:long" />
+    <xs:attribute name="errorFile" type="xs:string" />
+    <xs:attribute name="length" type="xs:int" />
+    <xs:attribute name="name" type="xs:ID" />
+    <xs:attribute name="workflowId" type="xs:string" />
+    <xs:attribute name="workflowRun" type="xs:anyURI" />
+    <xs:attribute name="workflowRunId" type="xs:string" />
+</xs:schema>

Added: incubator/taverna/site/trunk/content/ns/2010/xml/.htaccess
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/content/ns/2010/xml/.htaccess?rev=1821447&view=auto
==============================================================================
--- incubator/taverna/site/trunk/content/ns/2010/xml/.htaccess (added)
+++ incubator/taverna/site/trunk/content/ns/2010/xml/.htaccess Thu Jan 18 01:27:43 2018
@@ -0,0 +1,4 @@
+RewriteEngine On
+RewriteBase /ns/2010/xml
+
+RewriteRule server server.xsd
\ No newline at end of file

Added: incubator/taverna/site/trunk/content/ns/2010/xml/server.xsd
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/content/ns/2010/xml/server.xsd?rev=1821447&view=auto
==============================================================================
--- incubator/taverna/site/trunk/content/ns/2010/xml/server.xsd (added)
+++ incubator/taverna/site/trunk/content/ns/2010/xml/server.xsd Thu Jan 18 01:27:43 2018
@@ -0,0 +1,139 @@
+<!-- 
+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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:admin="http://ns.taverna.org.uk/2010/xml/server/admin/"
+	xmlns:feed="http://ns.taverna.org.uk/2010/xml/server/feed/" xmlns:tns="http://ns.taverna.org.uk/2010/xml/server/"
+	xmlns:ts="http://ns.taverna.org.uk/2010/xml/server/" xmlns:ts-rest="http://ns.taverna.org.uk/2010/xml/server/rest/"
+	xmlns:ts-soap="http://ns.taverna.org.uk/2010/xml/server/soap/"
+	xmlns:xlink="http://www.w3.org/1999/xlink" attributeFormDefault="qualified"
+	elementFormDefault="qualified" targetNamespace="http://ns.taverna.org.uk/2010/xml/server/"
+	jxb:version="2.1">
+    <xs:annotation>
+    	<xs:appinfo>
+			<jxb:schemaBindings>
+				<jxb:package name="org.apache.taverna.server.client.generic" />
+			</jxb:schemaBindings>
+    	</xs:appinfo>
+    </xs:annotation>
+    <xs:import namespace="http://www.w3.org/1999/xlink" />
+    <xs:element name="capability" type="ts:Capability" />
+    <xs:element name="dir" type="ts:DirectoryReference" />
+    <xs:element name="file" type="ts:FileReference" />
+    <xs:element name="keypair" type="ts:KeyPairCredential" />
+    <xs:element name="runReference" type="ts:TavernaRun" />
+    <xs:element name="trustedIdentity" type="ts:TrustDescriptor" />
+    <xs:element name="userpass" type="ts:PasswordCredential" />
+    <xs:element name="workflow" type="ts:Workflow" />
+    <xs:complexType abstract="true" name="VersionedElement">
+        <xs:sequence />
+        <xs:attribute ref="ts:serverVersion" />
+        <xs:attribute ref="ts:serverRevision" />
+        <xs:attribute ref="ts:serverBuildTimestamp" />
+    </xs:complexType>
+    <xs:complexType name="Location">
+        <xs:sequence />
+        <xs:attribute ref="xlink:href" />
+    </xs:complexType>
+    <xs:complexType name="Capability">
+        <xs:sequence />
+        <xs:attribute ref="ts:capability" />
+        <xs:attribute ref="ts:version" />
+    </xs:complexType>
+    <xs:complexType name="KeyPairCredential">
+        <xs:complexContent>
+            <xs:extension base="ts:CredentialDescriptor">
+                <xs:sequence>
+                    <xs:element name="credentialName" type="xs:string" />
+                    <xs:element minOccurs="0" name="credentialFile" type="xs:string" />
+                    <xs:element minOccurs="0" name="fileType" type="xs:string" />
+                    <xs:element minOccurs="0" name="unlockPassword" type="xs:string" />
+                    <xs:element minOccurs="0" name="credentialBytes" type="xs:base64Binary" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType abstract="true" name="CredentialDescriptor">
+        <xs:sequence>
+            <xs:element minOccurs="0" name="serviceURI" type="xs:anyURI" />
+        </xs:sequence>
+        <xs:attribute ref="xlink:href" />
+    </xs:complexType>
+    <xs:complexType name="PasswordCredential">
+        <xs:complexContent>
+            <xs:extension base="ts:CredentialDescriptor">
+                <xs:sequence>
+                    <xs:element name="username" type="xs:string" />
+                    <xs:element name="password" type="xs:string" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="TavernaRun">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute ref="xlink:href" />
+                <xs:attribute ref="ts:serverVersion" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="DirectoryEntry">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute ref="xlink:href" />
+                <xs:attribute ref="ts:name" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="DirectoryReference">
+        <xs:simpleContent>
+            <xs:extension base="ts:DirectoryEntry" />
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="FileReference">
+        <xs:simpleContent>
+            <xs:extension base="ts:DirectoryEntry" />
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="Workflow">
+        <xs:sequence>
+            <xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="lax" />
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType final="extension restriction" name="TrustDescriptor">
+        <xs:sequence>
+            <xs:element minOccurs="0" name="certificateFile" type="xs:string" />
+            <xs:element minOccurs="0" name="fileType" type="xs:string" />
+            <xs:element minOccurs="0" name="certificateBytes" type="xs:base64Binary" />
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="serverName" type="xs:string" />
+        </xs:sequence>
+        <xs:attribute ref="xlink:href" />
+    </xs:complexType>
+    <xs:simpleType name="Permission">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="none" />
+            <xs:enumeration value="read" />
+            <xs:enumeration value="update" />
+            <xs:enumeration value="destroy" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:attribute name="capability" type="xs:anyURI" />
+    <xs:attribute name="name" type="xs:string" />
+    <xs:attribute name="serverBuildTimestamp" type="xs:string" />
+    <xs:attribute name="serverRevision" type="xs:string" />
+    <xs:attribute name="serverVersion" type="xs:string" />
+    <xs:attribute name="version" type="xs:string" />
+</xs:schema>

Added: incubator/taverna/site/trunk/content/ns/2010/xml/server/.htaccess
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/content/ns/2010/xml/server/.htaccess?rev=1821447&view=auto
==============================================================================
--- incubator/taverna/site/trunk/content/ns/2010/xml/server/.htaccess (added)
+++ incubator/taverna/site/trunk/content/ns/2010/xml/server/.htaccess Thu Jan 18 01:27:43 2018
@@ -0,0 +1,7 @@
+RewriteEngine On
+RewriteBase /ns/2010/xml/server
+
+RewriteRule rest rest.xsd
+# TODO - where's the XSD for these?
+#RewriteRule admin admin.xsd
+#RewriteRule feed feed.xsd
\ No newline at end of file

Added: incubator/taverna/site/trunk/content/ns/2010/xml/server/rest.xsd
URL: http://svn.apache.org/viewvc/incubator/taverna/site/trunk/content/ns/2010/xml/server/rest.xsd?rev=1821447&view=auto
==============================================================================
--- incubator/taverna/site/trunk/content/ns/2010/xml/server/rest.xsd (added)
+++ incubator/taverna/site/trunk/content/ns/2010/xml/server/rest.xsd Thu Jan 18 01:27:43 2018
@@ -0,0 +1,370 @@
+<!-- 
+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.
+-->
+<xs:schema 
+		xmlns:admin="http://ns.taverna.org.uk/2010/xml/server/admin/"
+		xmlns:feed="http://ns.taverna.org.uk/2010/xml/server/feed/"
+		xmlns:port="http://ns.taverna.org.uk/2010/port/" xmlns:tns="http://ns.taverna.org.uk/2010/xml/server/rest/"
+		xmlns:ts="http://ns.taverna.org.uk/2010/xml/server/" xmlns:ts-rest="http://ns.taverna.org.uk/2010/xml/server/rest/"
+		xmlns:ts-soap="http://ns.taverna.org.uk/2010/xml/server/soap/"
+		xmlns:xlink="http://www.w3.org/1999/xlink" attributeFormDefault="qualified"
+		elementFormDefault="qualified" targetNamespace="http://ns.taverna.org.uk/2010/xml/server/rest/"
+		jxb:version="2.1">
+    <xs:annotation>
+    	<xs:appinfo>
+			<jxb:schemaBindings>
+				<jxb:package name="org.apache.taverna.server.client.rest" />
+			</jxb:schemaBindings>
+    	</xs:appinfo>
+    </xs:annotation>
+    <xs:import namespace="http://ns.taverna.org.uk/2010/xml/server/" />
+    <xs:import namespace="http://www.w3.org/1999/xlink" />
+    <xs:element name="capabilities">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" minOccurs="0" name="capability" type="ts:Capability" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="credential" type="ts-rest:Credential" />
+    <xs:element name="credentials" type="ts-rest:credentialList" />
+    <xs:element name="directoryContents" type="ts-rest:DirectoryContents" />
+    <xs:element name="enabledNotificationFabrics">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" minOccurs="0" name="notifier" type="xs:string" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="filesystemOperation" type="ts-rest:FilesystemCreationOperation" />
+    <xs:element name="listenerDefinition" type="ts-rest:ListenerDefinition" />
+    <xs:element name="listenerDescription" type="ts-rest:ListenerDescription" />
+    <xs:element name="listeners">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="ts:VersionedElement">
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="listener" type="ts-rest:ListenerDescription" />
+                    </xs:sequence>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="mkdir" type="ts-rest:MakeDirectory" />
+    <xs:element name="permissionUpdate" type="ts-rest:permissionDescription" />
+    <xs:element name="permissionsDescriptor" type="ts-rest:permissionsDescription" />
+    <xs:element name="permittedListeners">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" minOccurs="0" name="type" type="xs:string" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="permittedWorkflows">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" minOccurs="0" name="workflow" type="xs:string" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="policyDescription">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="ts:VersionedElement">
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="runLimit" type="ts:Location" />
+                        <xs:element minOccurs="0" name="operatingLimit" type="ts:Location" />
+                        <xs:element minOccurs="0" name="permittedWorkflows" type="ts:Location" />
+                        <xs:element minOccurs="0" name="permittedListenerTypes" type="ts:Location" />
+                        <xs:element minOccurs="0" name="enabledNotificationFabrics" type="ts:Location" />
+                        <xs:element minOccurs="0" name="capabilities" type="ts:Location" />
+                    </xs:sequence>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="properties">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="ts:VersionedElement">
+                    <xs:sequence>
+                        <xs:element maxOccurs="unbounded" minOccurs="0" name="property" type="ts-rest:PropertyDescription" />
+                    </xs:sequence>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="runDescription">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="ts:VersionedElement">
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="expiry">
+                            <xs:complexType>
+                                <xs:simpleContent>
+                                    <xs:extension base="xs:string">
+                                        <xs:attribute ref="xlink:href" />
+                                    </xs:extension>
+                                </xs:simpleContent>
+                            </xs:complexType>
+                        </xs:element>
+                        <xs:element minOccurs="0" name="creationWorkflow" type="ts:Location" />
+                        <xs:element minOccurs="0" name="createTime" type="ts:Location" />
+                        <xs:element minOccurs="0" name="startTime" type="ts:Location" />
+                        <xs:element minOccurs="0" name="finishTime" type="ts:Location" />
+                        <xs:element minOccurs="0" name="status" type="ts:Location" />
+                        <xs:element minOccurs="0" name="workingDirectory" type="ts:Location" />
+                        <xs:element minOccurs="0" name="inputs" type="ts:Location" />
+                        <xs:element minOccurs="0" name="output" type="ts:Location" />
+                        <xs:element minOccurs="0" name="securityContext" type="ts:Location" />
+                        <xs:element minOccurs="0" name="listeners">
+                            <xs:complexType>
+                                <xs:complexContent>
+                                    <xs:extension base="ts:Location">
+                                        <xs:sequence>
+                                            <xs:element maxOccurs="unbounded" minOccurs="0" name="listener" nillable="true" type="ts:Location" />
+                                        </xs:sequence>
+                                    </xs:extension>
+                                </xs:complexContent>
+                            </xs:complexType>
+                        </xs:element>
+                        <xs:element minOccurs="0" name="interaction" type="ts:Location" />
+                        <xs:element minOccurs="0" name="name" type="ts:Location" />
+                        <xs:element minOccurs="0" name="stdout" type="ts:Location" />
+                        <xs:element minOccurs="0" name="stderr" type="ts:Location" />
+                        <xs:element minOccurs="0" name="usage" type="ts:Location" />
+                        <xs:element minOccurs="0" name="log" type="ts:Location" />
+                        <xs:element minOccurs="0" name="run-bundle" type="ts:Location" />
+                        <xs:element minOccurs="0" name="generate-provenance" type="ts:Location" />
+                    </xs:sequence>
+                    <xs:attribute ref="ts-rest:owner" />
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="runInput" type="ts-rest:InputDescription" />
+    <xs:element name="runInputs" type="ts-rest:TavernaRunInputs" />
+    <xs:element name="runList">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" minOccurs="0" name="run" type="ts:TavernaRun" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="securityDescriptor" type="ts-rest:SecurityDescriptor" />
+    <xs:element name="serverDescription">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="ts:VersionedElement">
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="runs" type="ts:Location" />
+                        <xs:element minOccurs="0" name="policy" type="ts:Location" />
+                        <xs:element minOccurs="0" name="feed" type="ts:Location" />
+                        <xs:element minOccurs="0" name="interactionFeed" type="ts:Location" />
+                    </xs:sequence>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="trustedIdentities" type="ts-rest:trustList" />
+    <xs:element name="upload" type="ts-rest:UploadFile" />
+    <xs:element name="userPermission" type="ts-rest:linkedPermissionDescription" />
+    <xs:complexType name="InputDescription">
+        <xs:complexContent>
+            <xs:extension base="ts:VersionedElement">
+                <xs:sequence>
+                    <xs:choice minOccurs="0">
+                        <xs:element name="file">
+                            <xs:complexType>
+                                <xs:simpleContent>
+                                    <xs:extension base="ts-rest:InputContents" />
+                                </xs:simpleContent>
+                            </xs:complexType>
+                        </xs:element>
+                        <xs:element name="reference">
+                            <xs:complexType>
+                                <xs:simpleContent>
+                                    <xs:extension base="ts-rest:InputContents" />
+                                </xs:simpleContent>
+                            </xs:complexType>
+                        </xs:element>
+                        <xs:element name="value">
+                            <xs:complexType>
+                                <xs:simpleContent>
+                                    <xs:extension base="ts-rest:InputContents" />
+                                </xs:simpleContent>
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:choice>
+                </xs:sequence>
+                <xs:attribute ref="ts-rest:name" />
+                <xs:attribute ref="ts-rest:descriptorRef" />
+                <xs:attribute ref="ts-rest:listDelimiter" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:simpleType name="InputContents">
+        <xs:restriction base="xs:string" />
+    </xs:simpleType>
+    <xs:complexType name="ListenerDescription">
+        <xs:complexContent>
+            <xs:extension base="ts:VersionedElement">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="configuration" type="ts:Location" />
+                    <xs:element minOccurs="0" name="properties">
+                        <xs:complexType>
+                            <xs:sequence>
+                                <xs:element maxOccurs="unbounded" minOccurs="0" name="property" type="ts-rest:PropertyDescription" />
+                            </xs:sequence>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:sequence>
+                <xs:attribute ref="xlink:href" />
+                <xs:attribute ref="ts-rest:name" />
+                <xs:attribute ref="ts-rest:type" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="PropertyDescription">
+        <xs:complexContent>
+            <xs:extension base="ts:Location">
+                <xs:sequence />
+                <xs:attribute ref="ts-rest:name" />
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="TavernaRunInputs">
+        <xs:complexContent>
+            <xs:extension base="ts:VersionedElement">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="expected" type="ts:Location" />
+                    <xs:element minOccurs="0" name="baclava" type="ts:Location" />
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="input" nillable="true" type="ts:Location" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType final="extension restriction" name="Credential">
+        <xs:choice>
+            <xs:element ref="ts:keypair" />
+            <xs:element ref="ts:userpass" />
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="DirectoryContents">
+        <xs:sequence>
+            <xs:choice maxOccurs="unbounded" minOccurs="0">
+                <xs:element ref="ts:dir" />
+                <xs:element ref="ts:file" />
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FilesystemCreationOperation">
+        <xs:simpleContent>
+            <xs:extension base="xs:base64Binary">
+                <xs:attribute ref="ts-rest:name" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="MakeDirectory">
+        <xs:simpleContent>
+            <xs:extension base="ts-rest:FilesystemCreationOperation" />
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="UploadFile">
+        <xs:simpleContent>
+            <xs:extension base="ts-rest:FilesystemCreationOperation" />
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="permissionsDescription">
+        <xs:complexContent>
+            <xs:extension base="ts:VersionedElement">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="permission" type="ts-rest:linkedPermissionDescription" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="linkedPermissionDescription">
+        <xs:complexContent>
+            <xs:extension base="ts:Location">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="userName" type="xs:string" />
+                    <xs:element minOccurs="0" name="permission" type="ts:Permission" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType final="extension restriction" name="trustList">
+        <xs:complexContent>
+            <xs:extension base="ts:VersionedElement">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" name="trust" type="ts:TrustDescriptor" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="permissionDescription">
+        <xs:sequence>
+            <xs:element minOccurs="0" name="userName" type="xs:string" />
+            <xs:element minOccurs="0" name="permission" type="ts:Permission" />
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType final="extension restriction" name="SecurityDescriptor">
+        <xs:complexContent>
+            <xs:extension base="ts:VersionedElement">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="owner" type="xs:string" />
+                    <xs:element minOccurs="0" name="permissions" type="ts:Location" />
+                    <xs:element minOccurs="0" name="credentials" type="ts-rest:CredentialCollection" />
+                    <xs:element minOccurs="0" name="trusts" type="ts-rest:TrustCollection" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType final="extension restriction" name="CredentialCollection">
+        <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" ref="ts-rest:credential" />
+        </xs:sequence>
+        <xs:attribute ref="xlink:href" />
+    </xs:complexType>
+    <xs:complexType final="extension restriction" name="TrustCollection">
+        <xs:sequence>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="trust" type="ts:TrustDescriptor" />
+        </xs:sequence>
+        <xs:attribute ref="xlink:href" />
+    </xs:complexType>
+    <xs:complexType final="extension restriction" name="credentialList">
+        <xs:complexContent>
+            <xs:extension base="ts:VersionedElement">
+                <xs:sequence>
+                    <xs:element maxOccurs="unbounded" minOccurs="0" ref="ts-rest:credential" />
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="ListenerDefinition">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute ref="ts-rest:type" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:attribute name="descriptorRef" type="xs:anyURI" />
+    <xs:attribute name="listDelimiter" type="xs:string" />
+    <xs:attribute name="name" type="xs:string" />
+    <xs:attribute name="owner" type="xs:string" />
+    <xs:attribute name="type" type="xs:string" />
+</xs:schema>
\ No newline at end of file