svn commit: r372274 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/engine/AxisConfiguration.java integration/test/org/apache/axis2/integration/UtilServer.java

[ch...@apache.org]

Author: chinthaka
Date: Wed Jan 25 09:03:38 2006
New Revision: 372274

URL: http://svn.apache.org/viewcvs?rev=372274&view=rev
Log:
BUILD SUCCESSFULL !!! What else can I say as the comment :)

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=372274&r1=372273&r2=372274&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Wed Jan 25 09:03:38 2006
@@ -137,7 +137,7 @@
      */
     public void addModule(AxisModule module) throws AxisFault {
         module.setParent(this);
-        notifyObservers(AxisEvent.MODULE_DEPLOY,module);
+        notifyObservers(AxisEvent.MODULE_DEPLOY, module);
         allModules.put(module.getName(), module);
     }
 
@@ -378,7 +378,7 @@
         }
     }
 
-     public void notifyObservers(int event_type, AxisModule moule) {
+    public void notifyObservers(int event_type, AxisModule moule) {
         AxisEvent event = new AxisEvent(event_type);
 
         for (int i = 0; i < observersList.size(); i++) {
@@ -580,7 +580,8 @@
     }
 
     public boolean isEngaged(QName moduleName) {
-        return engagedModules.contains(moduleName);
+        boolean b = engagedModules.contains(moduleName);
+        return b ? b : engagedModules.contains(this.getDefaultModule(moduleName.getLocalPart()).getName());
     }
 
     public void setGlobalOutPhase(ArrayList outPhases) {

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=372274&r1=372273&r2=372274&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java Wed Jan 25 09:03:38 2006
@@ -96,7 +96,7 @@
             throw new Exception("repository directory "
                     + file.getAbsolutePath() + " does not exists");
         }
-        return ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(),null);
+        return ConfigurationContextFactory.createConfigurationContextFromFileSystem(file.getAbsolutePath(), null);
     }
 
     public static synchronized void stop() {
@@ -127,7 +127,7 @@
         TestCase.assertTrue(file.exists());
         ConfigurationContext configContext = ConfigurationContextFactory
                 .createConfigurationContextFromFileSystem(
-                        "target/test-resources/integrationRepo",null);
+                        "target/test-resources/integrationRepo", null);
         AxisModule axisModule = deploymentEngine.buildModule(file,
                 configContext.getAxisConfiguration());
         configContext.getAxisConfiguration().addModule(axisModule);
@@ -145,9 +145,9 @@
     }
 
     private static File getAddressingMARFile() {
-        File dir = new File(org.apache.axis2.Constants.TESTING_REPOSITORY);
+        File dir = new File(org.apache.axis2.Constants.TESTING_REPOSITORY + "/modules");
         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;
@@ -159,7 +159,7 @@
         DeploymentEngine deploymentEngine = new DeploymentEngine();
 
         ConfigurationContext configContext = ConfigurationContextFactory .createConfigurationContextFromFileSystem(
-                "target/test-resources/integrationRepo",null);
+                "target/test-resources/integrationRepo", null);
         AxisModule axisModule = deploymentEngine.buildModule(file,
                 configContext.getAxisConfiguration());
         configContext.getAxisConfiguration().addModule(axisModule);
@@ -174,7 +174,7 @@
         TestCase.assertTrue(file.exists());
 
         ConfigurationContext configContext = ConfigurationContextFactory
-                .createConfigurationContextFromFileSystem(clientHome,null);
+                .createConfigurationContextFromFileSystem(clientHome, null);
         AxisModule axisModule = deploymentEngine.buildModule(file,
                 configContext.getAxisConfiguration());