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:30 UTC
[5/9] incubator-taverna-server git commit: Use package
org.apache.taverna.server.client.*
Use package org.apache.taverna.server.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/92acc9eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/92acc9eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/92acc9eb
Branch: refs/heads/master
Commit: 92acc9ebfb499acedec7685db6c56b5fee786716
Parents: 348fe7f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jan 4 12:20:14 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jan 4 12:20:14 2018 +0000
----------------------------------------------------------------------
taverna-server-client/pom.xml | 6 ++---
.../apache/taverna/server/client/Connected.java | 6 ++---
.../apache/taverna/server/client/DirEntry.java | 9 ++++----
.../apache/taverna/server/client/Directory.java | 21 +++++++++---------
.../org/apache/taverna/server/client/File.java | 9 ++++----
.../apache/taverna/server/client/Property.java | 2 +-
.../org/apache/taverna/server/client/Run.java | 23 ++++++++++----------
.../apache/taverna/server/client/Status.java | 2 +-
.../taverna/server/client/TavernaServer.java | 15 ++++++-------
.../client/TavernaServerConnectionFactory.java | 2 +-
.../taverna/server/client/package-info.java | 2 +-
.../src/main/wadl/tavserv.wadl | 6 ++---
12 files changed, 49 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-client/pom.xml b/taverna-server-client/pom.xml
index 3250e5c..ae633cd 100644
--- a/taverna-server-client/pom.xml
+++ b/taverna-server-client/pom.xml
@@ -61,8 +61,8 @@ limitations under the License.
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>uk.org.taverna.server.client</Export-Package>
- <Private-Package>uk.org.taverna.server.client.*</Private-Package>
+ <Export-Package>org.apache.taverna.server.client</Export-Package>
+ <Private-Package>org.apache.taverna.server.client.xml.*</Private-Package>
</instructions>
</configuration>
</plugin>
@@ -100,7 +100,7 @@ limitations under the License.
</execution>
</executions>
<configuration>
- <packageName>org.taverna.server.client.wadl</packageName>
+ <packageName>org.apache.taverna.server.client.wadl</packageName>
<includes>*.wadl</includes>
<customClassNames>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/Connected.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Connected.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Connected.java
index be2682d..206747b 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Connected.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Connected.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,8 +16,8 @@ package uk.org.taverna.server.client;
* limitations under the License.
*/
-import uk.org.taverna.server.client.TavernaServer.ClientException;
-import uk.org.taverna.server.client.TavernaServer.ServerException;
+import org.apache.taverna.server.client.TavernaServer.ClientException;
+import org.apache.taverna.server.client.TavernaServer.ServerException;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/DirEntry.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/DirEntry.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/DirEntry.java
index d5947ab..99629b6 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/DirEntry.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/DirEntry.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,10 +16,9 @@ package uk.org.taverna.server.client;
* limitations under the License.
*/
-import org.taverna.server.client.wadl.TavernaServer.Root.RunsRunName.Wd.Path2;
-
-import uk.org.taverna.server.client.TavernaServer.ClientException;
-import uk.org.taverna.server.client.TavernaServer.ServerException;
+import org.apache.taverna.server.client.TavernaServer.ClientException;
+import org.apache.taverna.server.client.TavernaServer.ServerException;
+import org.apache.taverna.server.client.wadl.TavernaServer.Root.RunsRunName.Wd.Path2;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/Directory.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Directory.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Directory.java
index cb1fbc5..4e008bc 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Directory.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Directory.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -28,16 +28,15 @@ import java.util.ArrayList;
import java.util.List;
import java.util.zip.ZipFile;
-import org.taverna.server.client.wadl.TavernaServer.Root.RunsRunName.Wd;
-
-import uk.org.taverna.server.client.TavernaServer.ClientException;
-import uk.org.taverna.server.client.TavernaServer.ServerException;
-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.rest.DirectoryContents;
-import uk.org.taverna.server.client.rest.MakeDirectory;
-import uk.org.taverna.server.client.rest.UploadFile;
+import org.apache.taverna.server.client.TavernaServer.ClientException;
+import org.apache.taverna.server.client.TavernaServer.ServerException;
+import org.apache.taverna.server.client.generic.DirectoryEntry;
+import org.apache.taverna.server.client.generic.DirectoryReference;
+import org.apache.taverna.server.client.generic.FileReference;
+import org.apache.taverna.server.client.rest.DirectoryContents;
+import org.apache.taverna.server.client.rest.MakeDirectory;
+import org.apache.taverna.server.client.rest.UploadFile;
+import org.apache.taverna.server.client.wadl.TavernaServer.Root.RunsRunName.Wd;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/File.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/File.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/File.java
index edcfdd5..1535187 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/File.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/File.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -28,11 +28,10 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.Charset;
+import org.apache.taverna.server.client.TavernaServer.ClientException;
+import org.apache.taverna.server.client.TavernaServer.ServerException;
+import org.apache.taverna.server.client.wadl.TavernaServer.Root.RunsRunName.Wd;
import org.apache.tika.mime.MimeTypeException;
-import org.taverna.server.client.wadl.TavernaServer.Root.RunsRunName.Wd;
-
-import uk.org.taverna.server.client.TavernaServer.ClientException;
-import uk.org.taverna.server.client.TavernaServer.ServerException;
import com.sun.jersey.api.client.ClientHandlerException;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/Property.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Property.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Property.java
index e67a06d..f7bfdd1 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Property.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Property.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/Run.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Run.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Run.java
index 6bcae87..4c1699b 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Run.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Run.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -29,20 +29,19 @@ import java.util.List;
import javax.xml.bind.JAXBException;
import org.apache.commons.io.IOUtils;
-import org.joda.time.DateTime;
+import org.apache.taverna.server.client.TavernaServer.ClientException;
+import org.apache.taverna.server.client.TavernaServer.ServerException;
+import org.apache.taverna.server.client.generic.KeyPairCredential;
+import org.apache.taverna.server.client.generic.PasswordCredential;
+import org.apache.taverna.server.client.port.InputPort;
+import org.apache.taverna.server.client.port.OutputPort;
+import org.apache.taverna.server.client.rest.InputDescription;
+import org.apache.taverna.server.client.rest.InputDescription.Value;
+import org.apache.taverna.server.client.wadl.TavernaServer.Root.RunsRunName;
import org.apache.taverna.server.usagerecord.JobUsageRecord;
-import org.taverna.server.client.wadl.TavernaServer.Root.RunsRunName;
+import org.joda.time.DateTime;
import org.w3c.dom.Element;
-import uk.org.taverna.server.client.TavernaServer.ClientException;
-import uk.org.taverna.server.client.TavernaServer.ServerException;
-import uk.org.taverna.server.client.generic.KeyPairCredential;
-import uk.org.taverna.server.client.generic.PasswordCredential;
-import uk.org.taverna.server.client.generic.port.InputPort;
-import uk.org.taverna.server.client.generic.port.OutputPort;
-import uk.org.taverna.server.client.rest.InputDescription;
-import uk.org.taverna.server.client.rest.InputDescription.Value;
-
import com.sun.jersey.api.client.ClientResponse;
public class Run extends Connected {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/Status.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Status.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Status.java
index c318e04..e9ac36c 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/Status.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/Status.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServer.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServer.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServer.java
index 40b7045..0cb8e6a 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServer.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServer.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,8 +17,8 @@ package uk.org.taverna.server.client;
*/
import static java.nio.file.Files.readAllBytes;
-import static org.taverna.server.client.wadl.TavernaServer.createClient;
-import static org.taverna.server.client.wadl.TavernaServer.root;
+import static org.apache.taverna.server.client.wadl.TavernaServer.createClient;
+import static org.apache.taverna.server.client.wadl.TavernaServer.root;
import java.io.File;
import java.io.IOException;
@@ -26,11 +26,10 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.taverna.server.client.wadl.TavernaServer.Root;
-
-import uk.org.taverna.server.client.generic.Capability;
-import uk.org.taverna.server.client.generic.TavernaRun;
-import uk.org.taverna.server.client.generic.VersionedElement;
+import org.apache.taverna.server.client.generic.Capability;
+import org.apache.taverna.server.client.generic.TavernaRun;
+import org.apache.taverna.server.client.generic.VersionedElement;
+import org.apache.taverna.server.client.wadl.TavernaServer.Root;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServerConnectionFactory.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServerConnectionFactory.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServerConnectionFactory.java
index f11485d..1d1bf9d 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServerConnectionFactory.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/TavernaServerConnectionFactory.java
@@ -1,4 +1,4 @@
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/taverna-server-client/src/main/java/org/apache/taverna/server/client/package-info.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/org/apache/taverna/server/client/package-info.java b/taverna-server-client/src/main/java/org/apache/taverna/server/client/package-info.java
index 92837b6..09d700f 100644
--- a/taverna-server-client/src/main/java/org/apache/taverna/server/client/package-info.java
+++ b/taverna-server-client/src/main/java/org/apache/taverna/server/client/package-info.java
@@ -2,7 +2,7 @@
* Implementation of a basic client for Taverna Server.
* @author Donal Fellows
*/
-package uk.org.taverna.server.client;
+package org.apache.taverna.server.client;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/92acc9eb/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 b59c693..1ded877 100644
--- a/taverna-server-client/src/main/wadl/tavserv.wadl
+++ b/taverna-server-client/src/main/wadl/tavserv.wadl
@@ -32,7 +32,7 @@ limitations under the License.
<xs:annotation>
<xs:appinfo>
<jxb:schemaBindings>
- <jxb:package name="org.apache.taverna.server.client.xml.rest" />
+ <jxb:package name="org.apache.taverna.server.client.rest" />
</jxb:schemaBindings>
</xs:appinfo>
</xs:annotation>
@@ -389,7 +389,7 @@ limitations under the License.
<xs:annotation>
<xs:appinfo>
<jxb:schemaBindings>
- <jxb:package name="org.apache.taverna.server.client.xml.port" />
+ <jxb:package name="org.apache.taverna.server.client.port" />
</jxb:schemaBindings>
</xs:appinfo>
</xs:annotation>
@@ -514,7 +514,7 @@ limitations under the License.
<xs:annotation>
<xs:appinfo>
<jxb:schemaBindings>
- <jxb:package name="org.apache.taverna.server.client.xml" />
+ <jxb:package name="org.apache.taverna.server.client.generic" />
</jxb:schemaBindings>
</xs:appinfo>
</xs:annotation>