From b54eea3c067b6abc2bd6b2f22adb4e2597f02251 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Sat, 22 Feb 2014 16:35:55 +0000
Subject: [PATCH] Moved sop dir to ws

---
 .../{http => ws}/soap/SOAPAbstractClient.java |  0
 .../{http => ws}/soap/SOAPClientFactory.java  | 20 +++++++-----------
 .../net/{http => ws}/soap/SOAPException.java  |  0
 .../net/{http => ws}/soap/SOAPHttpPage.java   | 21 +++++++------------
 src/zutil/test/SOAPClientTest.java            |  7 +++----
 5 files changed, 18 insertions(+), 30 deletions(-)
 rename src/zutil/net/{http => ws}/soap/SOAPAbstractClient.java (100%)
 rename src/zutil/net/{http => ws}/soap/SOAPClientFactory.java (93%)
 rename src/zutil/net/{http => ws}/soap/SOAPException.java (100%)
 rename src/zutil/net/{http => ws}/soap/SOAPHttpPage.java (95%)

diff --git a/src/zutil/net/http/soap/SOAPAbstractClient.java b/src/zutil/net/ws/soap/SOAPAbstractClient.java
similarity index 100%
rename from src/zutil/net/http/soap/SOAPAbstractClient.java
rename to src/zutil/net/ws/soap/SOAPAbstractClient.java
diff --git a/src/zutil/net/http/soap/SOAPClientFactory.java b/src/zutil/net/ws/soap/SOAPClientFactory.java
similarity index 93%
rename from src/zutil/net/http/soap/SOAPClientFactory.java
rename to src/zutil/net/ws/soap/SOAPClientFactory.java
index 66dae64..8787cd4 100644
--- a/src/zutil/net/http/soap/SOAPClientFactory.java
+++ b/src/zutil/net/ws/soap/SOAPClientFactory.java
@@ -20,25 +20,19 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
-package zutil.net.http.soap;
+package zutil.net.ws.soap;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javassist.CannotCompileException;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtField;
-import javassist.CtMethod;
-import javassist.CtNewMethod;
-import javassist.NotFoundException;
+import javassist.*;
 import zutil.log.LogUtil;
 import zutil.net.ws.WSInterface;
 import zutil.net.ws.WSMethodDef;
 import zutil.net.ws.WSParameterDef;
 import zutil.net.ws.WebServiceDef;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.logging.Logger;
+
 /**
  * This is an factory that generates clients for web services
  * 
@@ -102,7 +96,7 @@ public class SOAPClientFactory {
 									getOutputClass(methodDef.getOutputs()),			// Return type 
 									methodDef.getName(),							// Method name
 									getParameterClasses(methodDef.getInputs()),		// Parameters
-									new CtClass[]{pool.get( SOAPException.class.getName() )},	// Exceptions 
+									new CtClass[]{pool.get( SOAPException.class.getName() )},	// Exceptions
 									generateCodeBody(methodDef),					// Code Body 
 									cc); 											// Class
 			cc.addMethod(method);
diff --git a/src/zutil/net/http/soap/SOAPException.java b/src/zutil/net/ws/soap/SOAPException.java
similarity index 100%
rename from src/zutil/net/http/soap/SOAPException.java
rename to src/zutil/net/ws/soap/SOAPException.java
diff --git a/src/zutil/net/http/soap/SOAPHttpPage.java b/src/zutil/net/ws/soap/SOAPHttpPage.java
similarity index 95%
rename from src/zutil/net/http/soap/SOAPHttpPage.java
rename to src/zutil/net/ws/soap/SOAPHttpPage.java
index dcd1b5c..bbc0a33 100644
--- a/src/zutil/net/http/soap/SOAPHttpPage.java
+++ b/src/zutil/net/ws/soap/SOAPHttpPage.java
@@ -22,13 +22,6 @@
 
 package zutil.net.http.soap;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
@@ -36,19 +29,21 @@ import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 import org.xml.sax.SAXException;
-
 import zutil.converters.Converter;
 import zutil.log.LogUtil;
 import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
-import zutil.net.ws.WSInterface;
-import zutil.net.ws.WSMethodDef;
-import zutil.net.ws.WSParameterDef;
-import zutil.net.ws.WSReturnObject;
+import zutil.net.ws.*;
 import zutil.net.ws.WSReturnObject.WSValueName;
-import zutil.net.ws.WebServiceDef;
 import zutil.parser.wsdl.WSDLWriter;
 
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * This is an HTTPPage for the HTTPServer that 
  * handles soap messages.
diff --git a/src/zutil/test/SOAPClientTest.java b/src/zutil/test/SOAPClientTest.java
index c6b9e3d..823e011 100644
--- a/src/zutil/test/SOAPClientTest.java
+++ b/src/zutil/test/SOAPClientTest.java
@@ -22,15 +22,14 @@
 
 package zutil.test;
 
-import java.util.logging.Level;
-
 import javassist.CannotCompileException;
 import javassist.NotFoundException;
-
 import zutil.log.CompactLogFormatter;
 import zutil.log.LogUtil;
-import zutil.net.http.soap.SOAPClientFactory;
 import zutil.net.ws.WSInterface;
+import zutil.net.ws.soap.SOAPClientFactory;
+
+import java.util.logging.Level;
 
 public class SOAPClientTest {