Clean up the code

diff --git a/server/compbio/ws/jpred/Jpred.java b/server/compbio/ws/jpred/Jpred.java
index 7d5f586..7d72d64 100644 (file)
--- a/server/compbio/ws/jpred/Jpred.java
+++ b/server/compbio/ws/jpred/Jpred.java
@@ -1,13 +1,11 @@
 package compbio.ws.jpred;
 
-
 import javax.jws.WebParam;
 import javax.jws.WebService;
 
 @WebService(targetNamespace = "http://server.ws.compbio")
 public interface Jpred {
-       
-       public String findSequence(
-                       @WebParam(name = "sequence") String sequence);
+
+       public String findSequence(@WebParam(name = "sequence") String sequence);
 
 }

diff --git a/server/compbio/ws/jpred/JpredClient.java b/server/compbio/ws/jpred/JpredClient.java
index ae89eec..40cbdd6 100644 (file)
--- a/server/compbio/ws/jpred/JpredClient.java
+++ b/server/compbio/ws/jpred/JpredClient.java
@@ -1,9 +1,3 @@
-
-/**
- * Please modify this class to meet your needs
- * This class is not complete
- */
-
 package compbio.ws.jpred;
 
 import java.util.Properties;
@@ -14,8 +8,7 @@ import javax.xml.namespace.QName;
 import java.net.URL;
 
 /**
- * This class was generated by Apache CXF 2.7.8
- * 2013-12-09T11:22:58.858Z
+ * This class was generated by Apache CXF 2.7.8 2013-12-09T11:22:58.858Z
  * Generated source version: 2.7.8
  * 
  */

diff --git a/server/compbio/ws/jpred/WSPublisher.java b/server/compbio/ws/jpred/WSPublisher.java
index f3045cd..01747e0 100644 (file)
--- a/server/compbio/ws/jpred/WSPublisher.java
+++ b/server/compbio/ws/jpred/WSPublisher.java
@@ -3,10 +3,10 @@ package compbio.ws.jpred;
 import javax.xml.ws.Endpoint;
 
 public class WSPublisher {
-       
+
        public static void main(String[] args) {
-                  Endpoint.publish("http://localhost:1236/proteocache/services", new JpredWS());
-        
-                  System.out.println("Service is published!");
-           }
+               Endpoint.publish("http://localhost:1236/proteocache/services", new JpredWS());
+
+               System.out.println("Service is published!");
+       }
 }

diff --git a/server/compbio/ws/jpred/proteocache-WS/Jpred.java b/server/compbio/ws/jpred/proteocache-WS/Jpred.java
deleted file mode 100644 (file)
index 7d5f586..0000000
--- a/server/compbio/ws/jpred/proteocache-WS/Jpred.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package compbio.ws.jpred;
-
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-@WebService(targetNamespace = "http://server.ws.compbio")
-public interface Jpred {
-       
-       public String findSequence(
-                       @WebParam(name = "sequence") String sequence);
-
-}

diff --git a/server/compbio/ws/jpred/proteocache-WS/JpredClient.java b/server/compbio/ws/jpred/proteocache-WS/JpredClient.java
deleted file mode 100644 (file)
index 78d7d95..0000000
--- a/server/compbio/ws/jpred/proteocache-WS/JpredClient.java
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/**
- * Please modify this class to meet your needs
- * This class is not complete
- */
-
-package compbio.ws.server;
-
-import java.util.Properties;
-
-import javax.xml.ws.Service;
-import javax.xml.namespace.QName;
-
-import java.net.URL;
-
-/**
- * This class was generated by Apache CXF 2.7.8
- * 2013-12-09T11:22:58.858Z
- * Generated source version: 2.7.8
- * 
- */
-public class JpredClient {
-
-       public static void main(String[] args) throws Exception {
-               Properties properties = new Properties();
-               properties.setProperty("openejb.embedded.remotable", "true");
-               QName qname = new QName("http://server.ws.compbio", "JpredWSService");
-               Service service = Service.create(new URL("http://localhost:8080/proteocache/services/JpredWS?wsdl"),
-                               qname);
-
-       //      QName qq = service.getServiceName();
-       //      
-               Jpred sequense = service.getPort(service.getPorts().next(), Jpred.class);
-               System.out.println(" : " + sequense.findSequence("erwerw"));
-       }
-
-}

diff --git a/server/compbio/ws/jpred/proteocache-WS/JpredWS.java b/server/compbio/ws/jpred/proteocache-WS/JpredWS.java
deleted file mode 100644 (file)
index 15977aa..0000000
--- a/server/compbio/ws/jpred/proteocache-WS/JpredWS.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package compbio.ws.server;
-
-import javax.jws.WebService;
-
-import compbio.statistic.CassandraRequester;
-
-
-@WebService(endpointInterface = "compbio.ws.server.Jpred", 
-targetNamespace = "http://server.ws.compbio", serviceName = "JpredWS")
-public class JpredWS implements Jpred {
-
-       @Override
-       public String findSequence(String sequence) {
-               CassandraRequester cr = new CassandraRequester();
-               System.out.println("YES");
-               if (cr.readProteins(sequence, "whole") != null)
-                       return "The sequence is " + sequence;
-               else
-                       return "No sequence  " + sequence;
-       }
-
-}