Move Category into data.msa package from ws.server to get it into min jabaws package.

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4700 e3abac25-378b-4346-85de-24260fe3988d

diff --git a/webservices/compbio/ws/server/Category.java b/webservices/compbio/data/msa/Category.java
similarity index 95%
rename from webservices/compbio/ws/server/Category.java
rename to webservices/compbio/data/msa/Category.java
index 203949f..db9bbfd 100644 (file)
--- a/webservices/compbio/ws/server/Category.java
+++ b/webservices/compbio/data/msa/Category.java
@@ -1,4 +1,4 @@
-package compbio.ws.server;\r
+package compbio.data.msa;\r

 \r
 import java.util.HashSet;\r
 import java.util.Set;\r
 \r
 import java.util.HashSet;\r
 import java.util.Set;\r

diff --git a/webservices/compbio/data/msa/RegistryWS.java b/webservices/compbio/data/msa/RegistryWS.java
index 71a2519..439a340 100644 (file)
--- a/webservices/compbio/data/msa/RegistryWS.java
+++ b/webservices/compbio/data/msa/RegistryWS.java
@@ -23,7 +23,6 @@ import java.util.Set;
 import javax.jws.WebService;\r
 \r
 import compbio.ws.client.Services;\r
 import javax.jws.WebService;\r
 \r
 import compbio.ws.client.Services;\r

-import compbio.ws.server.Category;\r

 \r
 /**\r
  * JABAWS services registry\r
 \r
 /**\r
  * JABAWS services registry\r

diff --git a/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java b/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java
index 536dabc..9db80f7 100644 (file)
--- a/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java
+++ b/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java
@@ -14,14 +14,14 @@ import javax.xml.bind.annotation.XmlType;
 public class GetServiceCategoriesResponse {\r
 \r
     @XmlElement(name = "return", namespace = "")\r
 public class GetServiceCategoriesResponse {\r
 \r
     @XmlElement(name = "return", namespace = "")\r

-    private Set<compbio.ws.server.Category> _return;\r
+    private Set<compbio.data.msa.Category> _return;\r

 \r
     /**\r
      * \r
      * @return\r
      *     returns Set<Category>\r
      */\r
 \r
     /**\r
      * \r
      * @return\r
      *     returns Set<Category>\r
      */\r

-    public Set<compbio.ws.server.Category> getReturn() {\r
+    public Set<compbio.data.msa.Category> getReturn() {\r

         return this._return;\r
     }\r
 \r
         return this._return;\r
     }\r
 \r

@@ -30,7 +30,7 @@ public class GetServiceCategoriesResponse {
      * @param _return\r
      *     the value for the _return property\r
      */\r
      * @param _return\r
      *     the value for the _return property\r
      */\r

-    public void setReturn(Set<compbio.ws.server.Category> _return) {\r
+    public void setReturn(Set<compbio.data.msa.Category> _return) {\r

         this._return = _return;\r
     }\r
 \r
         this._return = _return;\r
     }\r
 \r

diff --git a/webservices/compbio/ws/server/RegistryWS.java b/webservices/compbio/ws/server/RegistryWS.java
index 3898b88..c54fc56 100644 (file)
--- a/webservices/compbio/ws/server/RegistryWS.java
+++ b/webservices/compbio/ws/server/RegistryWS.java
@@ -33,6 +33,7 @@ import javax.xml.ws.handler.MessageContext;
 \r
 import org.apache.log4j.Logger;\r
 \r
 \r
 import org.apache.log4j.Logger;\r
 \r

+import compbio.data.msa.Category;\r

 import compbio.data.msa.JABAService;\r
 import compbio.ws.client.Services;\r
 import compbio.ws.client.WSTester;\r
 import compbio.data.msa.JABAService;\r
 import compbio.ws.client.Services;\r
 import compbio.ws.client.WSTester;\r