You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:29:44 UTC
[40/50] [abbrv] incubator-taverna-server git commit: Basic
OSGification of the client.
Basic OSGification of the client.
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/e5bc8be7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/e5bc8be7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/e5bc8be7
Branch: refs/heads/master
Commit: e5bc8be7891b955cb7cbd3df8690fb708a6cf7d7
Parents: f769f20
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Fri Jun 27 15:24:52 2014 +0100
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Fri Jun 27 15:24:52 2014 +0100
----------------------------------------------------------------------
server-client/pom.xml | 12 +++++++
.../taverna/server/client/TavernaServer.java | 30 ++++++++--------
server-client/src/main/wadl/tavserv.wadl | 36 +++++++++++++++++---
3 files changed, 59 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e5bc8be7/server-client/pom.xml
----------------------------------------------------------------------
diff --git a/server-client/pom.xml b/server-client/pom.xml
index 93665f8..397f102 100644
--- a/server-client/pom.xml
+++ b/server-client/pom.xml
@@ -7,6 +7,7 @@
<version>2.5.5-SNAPSHOT</version>
</parent>
<artifactId>server-client</artifactId>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -34,6 +35,17 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>uk.org.taverna.server.client</Export-Package>
+ <Private-Package>uk.org.taverna.server.client.*</Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e5bc8be7/server-client/src/main/java/uk/org/taverna/server/client/TavernaServer.java
----------------------------------------------------------------------
diff --git a/server-client/src/main/java/uk/org/taverna/server/client/TavernaServer.java b/server-client/src/main/java/uk/org/taverna/server/client/TavernaServer.java
index 5a66256..3ceb208 100644
--- a/server-client/src/main/java/uk/org/taverna/server/client/TavernaServer.java
+++ b/server-client/src/main/java/uk/org/taverna/server/client/TavernaServer.java
@@ -31,21 +31,21 @@ import org.taverna.server.client.wadl.TavernaServer.Root;
import org.taverna.server.client.wadl.TavernaServer.Root.RunsRunName;
import org.w3c.dom.Element;
-import uk.org.taverna.ns._2010.port.InputPort;
-import uk.org.taverna.ns._2010.port.OutputPort;
-import uk.org.taverna.ns._2010.xml.server.Capability;
-import uk.org.taverna.ns._2010.xml.server.DirectoryEntry;
-import uk.org.taverna.ns._2010.xml.server.DirectoryReference;
-import uk.org.taverna.ns._2010.xml.server.FileReference;
-import uk.org.taverna.ns._2010.xml.server.KeyPairCredential;
-import uk.org.taverna.ns._2010.xml.server.PasswordCredential;
-import uk.org.taverna.ns._2010.xml.server.TavernaRun;
-import uk.org.taverna.ns._2010.xml.server.VersionedElement;
-import uk.org.taverna.ns._2010.xml.server.rest.DirectoryContents;
-import uk.org.taverna.ns._2010.xml.server.rest.InputDescription;
-import uk.org.taverna.ns._2010.xml.server.rest.InputDescription.Value;
-import uk.org.taverna.ns._2010.xml.server.rest.MakeDirectory;
-import uk.org.taverna.ns._2010.xml.server.rest.UploadFile;
+import uk.org.taverna.server.client.generic.port.InputPort;
+import uk.org.taverna.server.client.generic.port.OutputPort;
+import uk.org.taverna.server.client.generic.Capability;
+import uk.org.taverna.server.client.generic.DirectoryEntry;
+import uk.org.taverna.server.client.generic.DirectoryReference;
+import uk.org.taverna.server.client.generic.FileReference;
+import uk.org.taverna.server.client.generic.KeyPairCredential;
+import uk.org.taverna.server.client.generic.PasswordCredential;
+import uk.org.taverna.server.client.generic.TavernaRun;
+import uk.org.taverna.server.client.generic.VersionedElement;
+import uk.org.taverna.server.client.rest.DirectoryContents;
+import uk.org.taverna.server.client.rest.InputDescription;
+import uk.org.taverna.server.client.rest.InputDescription.Value;
+import uk.org.taverna.server.client.rest.MakeDirectory;
+import uk.org.taverna.server.client.rest.UploadFile;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientHandlerException;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e5bc8be7/server-client/src/main/wadl/tavserv.wadl
----------------------------------------------------------------------
diff --git a/server-client/src/main/wadl/tavserv.wadl b/server-client/src/main/wadl/tavserv.wadl
index 564864f..2ba8fbe 100644
--- a/server-client/src/main/wadl/tavserv.wadl
+++ b/server-client/src/main/wadl/tavserv.wadl
@@ -1,4 +1,18 @@
-<application xmlns="http://wadl.dev.java.net/2009/02" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:prefix1="http://ns.taverna.org.uk/2010/xml/server/rest/" xmlns:prefix3="http://ns.taverna.org.uk/2010/xml/server/" xmlns:prefix10="http://ns.taverna.org.uk/2010/port/"><grammars><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: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/">
+<application xmlns="http://wadl.dev.java.net/2009/02"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:prefix1="http://ns.taverna.org.uk/2010/xml/server/rest/"
+ xmlns:prefix3="http://ns.taverna.org.uk/2010/xml/server/"
+ xmlns:prefix10="http://ns.taverna.org.uk/2010/port/" xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jxb:version="2.1">
+<grammars>
+<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: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="uk.org.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">
@@ -337,10 +351,17 @@
<xs:attribute name="owner" type="xs:string"/>
<xs:attribute name="type" type="xs:string"/>
</xs:schema>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xlink" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.w3.org/1999/xlink">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/1999/xlink" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.w3.org/1999/xlink" jxb:version="2.1">
<xs:attribute name="href" type="xs:string"/>
</xs:schema>
-<xs:schema 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/">
+<xs:schema 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="uk.org.taverna.server.client.generic.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"/>
@@ -451,7 +472,14 @@
<xs:attribute name="workflowRun" type="xs:anyURI"/>
<xs:attribute name="workflowRunId" type="xs:string"/>
</xs:schema>
-<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/">
+<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="uk.org.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"/>