From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Mon, 31 Oct 2011 17:47:35 +0000 (+0000)
Subject: Move Category into data.msa package from ws.server to get it into min jabaws package.
X-Git-Url: http://source.jalview.org/gitweb/?p=jabaws.git;a=commitdiff_plain;h=d92ac5284d2c918deda443f89e60cab6f0f8667e

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
--- a/webservices/compbio/ws/server/Category.java
+++ b/webservices/compbio/data/msa/Category.java
@@ -1,4 +1,4 @@
-package compbio.ws.server;
+package compbio.data.msa;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/webservices/compbio/data/msa/RegistryWS.java b/webservices/compbio/data/msa/RegistryWS.java
index 71a2519..439a340 100644
--- 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;
 
 import compbio.ws.client.Services;
-import compbio.ws.server.Category;
 
 /**
  * JABAWS services registry
diff --git a/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java b/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java
index 536dabc..9db80f7 100644
--- 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 {
 
     @XmlElement(name = "return", namespace = "")
-    private Set<compbio.ws.server.Category> _return;
+    private Set<compbio.data.msa.Category> _return;
 
     /**
      * 
      * @return
      *     returns Set<Category>
      */
-    public Set<compbio.ws.server.Category> getReturn() {
+    public Set<compbio.data.msa.Category> getReturn() {
         return this._return;
     }
 
@@ -30,7 +30,7 @@ public class GetServiceCategoriesResponse {
      * @param _return
      *     the value for the _return property
      */
-    public void setReturn(Set<compbio.ws.server.Category> _return) {
+    public void setReturn(Set<compbio.data.msa.Category> _return) {
         this._return = _return;
     }
 
diff --git a/webservices/compbio/ws/server/RegistryWS.java b/webservices/compbio/ws/server/RegistryWS.java
index 3898b88..c54fc56 100644
--- a/webservices/compbio/ws/server/RegistryWS.java
+++ b/webservices/compbio/ws/server/RegistryWS.java
@@ -33,6 +33,7 @@ import javax.xml.ws.handler.MessageContext;
 
 import org.apache.log4j.Logger;
 
+import compbio.data.msa.Category;
 import compbio.data.msa.JABAService;
 import compbio.ws.client.Services;
 import compbio.ws.client.WSTester;