svn commit: r378160 [2/2] - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/client/ core/src/org/apache/axis2/context/ core/src/org/apache/axis2/description/ core/src/org/apache/axis2/engine/ core/src/org/apache/axis2/transport/ cor...

[de...@apache.org]

Modified: webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java?rev=378160&r1=378159&r2=378160&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/test/org/apache/axis2/saaj/integration/UtilServer.java Wed Feb 15 20:27:51 2006
@@ -25,6 +25,7 @@
 import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.engine.TransportManager;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
 
 import javax.xml.namespace.QName;
@@ -85,12 +86,12 @@
         File file = new File(repository);
         if (!file.exists()) {
             throw new Exception("repository directory "
-                                + file.getAbsolutePath() + " does not exists");
+                    + file.getAbsolutePath() + " does not exists");
         }
-        return ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(),null);
+        return ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(), null);
     }
 
-    public static synchronized void stop() {
+    public static synchronized void stop() throws AxisFault {
         if (count == 1) {
             receiver.stop();
             while (receiver.isRunning()) {
@@ -105,6 +106,10 @@
         } else {
             count--;
         }
+        if (TransportManager.transportManager != null) {
+            TransportManager.transportManager.stop();
+            TransportManager.transportManager = null;
+        }
     }
 
     public static ConfigurationContext getConfigurationContext() {
@@ -120,7 +125,7 @@
     private static File getAddressingMARFile() {
         File dir = new File(org.apache.axis2.Constants.TESTING_REPOSITORY);
         File[] files = dir.listFiles(new AddressingFilter());
-        TestCase.assertTrue(files.length==1);
+        TestCase.assertTrue(files.length == 1);
         File file = files[0];
         TestCase.assertTrue(file.exists());
         return file;
@@ -133,9 +138,9 @@
         TestCase.assertTrue(file.exists());
 
         ConfigurationContext configContext = ConfigurationContextFactory
-                .createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+                .createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
         AxisModule axisModule = deploymentEngine.buildModule(file,
-                                                                    configContext.getAxisConfiguration());
+                configContext.getAxisConfiguration());
         configContext.getAxisConfiguration().addModule(axisModule);
 
         configContext.getAxisConfiguration().addService(service);
@@ -149,9 +154,9 @@
         TestCase.assertTrue(file.exists());
         DeploymentEngine deploymentEngine = new DeploymentEngine();
 
-        ConfigurationContext configContext = ConfigurationContextFactory .createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+        ConfigurationContext configContext = ConfigurationContextFactory .createConfigurationContextFromFileSystem("target/test-resources/integrationRepo", null);
         AxisModule axisModule = deploymentEngine.buildModule(file,
-                                                                    configContext.getAxisConfiguration());
+                configContext.getAxisConfiguration());
         configContext.getAxisConfiguration().addModule(axisModule);
         configContext.getAxisConfiguration().engageModule(new QName("addressing"));
         return configContext;
@@ -164,9 +169,9 @@
         TestCase.assertTrue(file.exists());
 
         ConfigurationContext configContext = ConfigurationContextFactory
-                .createConfigurationContextFromFileSystem(clientHome,null);
+                .createConfigurationContextFromFileSystem(clientHome, null);
         AxisModule axisModule = deploymentEngine.buildModule(file,
-                                                                    configContext.getAxisConfiguration());
+                configContext.getAxisConfiguration());
 
         configContext.getAxisConfiguration().addModule(axisModule);
         // sysContext.getAxisConfiguration().engageModule(moduleDesc.getName());