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/04 14:59:32 UTC
[7/9] incubator-taverna-server git commit: Ensure xlink works
Ensure xlink works
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/7fdfe10c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/7fdfe10c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/7fdfe10c
Branch: refs/heads/master
Commit: 7fdfe10c861283cf89b0549a0359ce0955b7e7db
Parents: 65e57db
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jan 4 14:58:46 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jan 4 14:58:46 2018 +0000
----------------------------------------------------------------------
taverna-server-client/src/main/wadl/tavserv.wadl | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/7fdfe10c/taverna-server-client/src/main/wadl/tavserv.wadl
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/wadl/tavserv.wadl b/taverna-server-client/src/main/wadl/tavserv.wadl
index 9abe957..20bfe18 100644
--- a/taverna-server-client/src/main/wadl/tavserv.wadl
+++ b/taverna-server-client/src/main/wadl/tavserv.wadl
@@ -1,6 +1,7 @@
<application jxb:version="2.1" xmlns="http://wadl.dev.java.net/2009/02"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:rest="http://ns.taverna.org.uk/2010/xml/server/rest/"
xmlns:server="http://ns.taverna.org.uk/2010/xml/server/" xmlns:port="http://ns.taverna.org.uk/2010/port/"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:jxb="http://java.sun.com/xml/ns/jaxb" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd ">
<!--
@@ -573,6 +574,14 @@ limitations under the License.
</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">
@@ -591,14 +600,6 @@ limitations under the License.
<xs:extension base="ts:DirectoryEntry" />
</xs:simpleContent>
</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="Workflow">
<xs:sequence>
<xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="lax" />