[wsas-java-dev] svn commit r2317 - in trunk/wsas/java/modules: admin/src/org/wso2/wsas/admin/service core/src/org/wso2/wsas/persistence standalone-edition

[svn at wso2.org]

Author: saminda
Date: Tue May  8 00:57:45 2007
New Revision: 2317

Modified:
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/FileBasedConfigSerializer.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
   trunk/wsas/java/modules/standalone-edition/pom.xml
Log:
Fixing compilation errors 


Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java	Tue May  8 00:57:45 2007
@@ -41,10 +41,10 @@
 import org.wso2.wsas.persistence.exception.ModulePolicyNotFoundException;
 import org.wso2.wsas.security.RahasUtil;
 import org.wso2.wsas.security.ServerCrypto;
+import org.wso2.wsas.util.AdminFilter;
 import org.wso2.wsas.util.ModuleIdUtil;
 import org.wso2.wsas.util.ParameterUtil;
 import org.wso2.wsas.util.PolicyUtil;
-import org.wso2.wsas.util.AdminFilter;
 
 import javax.xml.namespace.QName;
 import java.io.ByteArrayInputStream;
@@ -564,7 +564,7 @@
                                                                 ServiceIdentifierDO.EMPTY_SERVICE_VERSION));
             }
         }
-        asg.engageModule(axisModule, axisConfig);
+        asg.engageModule(axisModule);
 
         // Persist the service group-module engagement
         pm.addEngagedServiceGroupToModule(moduleId,
@@ -670,7 +670,7 @@
 
         // Engage the module
         try {
-            axisService.engageModule(axisModule, axisConfig);
+            axisService.engageModule(axisModule);
         } catch (AxisFault e) {
             String msg = "System does not allow to engage module " + moduleId + moduleVersion;
             log.warn(msg, e);
@@ -859,8 +859,7 @@
 
         // ------------------- Do Engagement -------------------------------------
         try {
-            axisOp.engageModule(getAxisConfig().getModule(moduleName),
-                                getAxisConfig());
+            axisOp.engageModule(getAxisConfig().getModule(moduleName));
         } catch (AxisFault axisFault) {
             //For the moment we assume that this is because we tried to engage an
             // already engaged module so we ignore it

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/FileBasedConfigSerializer.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/FileBasedConfigSerializer.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/FileBasedConfigSerializer.java	Tue May  8 00:57:45 2007
@@ -191,7 +191,7 @@
                     AxisModule module = axisConfig.getModule(moduleName);
                     if (module != null) {
                         try {
-                            axisServiceGroup.engageModule(module, axisConfig);
+                            axisServiceGroup.engageModule(module);
                         } catch (AxisFault axisFault) {
                             //need to ignore this
                         }
@@ -213,7 +213,7 @@
                         OMElement omElement = (OMElement) service_module.next();
                         String moduleName = omElement.getAttribute(new QName("ref")).getAttributeValue();
                         try {
-                            service.engageModule(axisConfig.getModule(moduleName), axisConfig);
+                            service.engageModule(axisConfig.getModule(moduleName));
                         } catch (AxisFault axisFault) {
                             //need to ignore this
                         }
@@ -234,10 +234,7 @@
                             String moduleName = omElement.getAttribute(new QName("ref")).getAttributeValue();
                             try {
 
-                                operation.engageModule(
-                                        axisConfig.getModule(
-                                                moduleName),
-                                        axisConfig);
+                                operation.engageModule(axisConfig.getModule(moduleName));
 
                             } catch (AxisFault axisFault) {
                                 //need to ignore this

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java	Tue May  8 00:57:45 2007
@@ -838,7 +838,7 @@
                 AxisModule axisModule = axisConfig.getModule(moduleLocalPart);
                 if (!isGloballyEngaged(modID.getName(), modID.getVersion(), session)) {
                     axisService.disengageModule(axisModule);
-                    axisService.engageModule(axisModule, axisConfig);
+                    axisService.engageModule(axisModule);
                 }
             }
 
@@ -855,7 +855,7 @@
                     AxisModule axisModule = axisConfig.getModule(moduleLocalPart);
                     if (!isGloballyEngaged(modID.getName(), modID.getVersion(), session)) {
                         axisOp.disengageModule(axisModule);
-                        axisOp.engageModule(axisModule, axisConfig);
+                        axisOp.engageModule(axisModule);
                     }
                 }
 
@@ -973,7 +973,7 @@
                 AxisModule axisModule = axisConfig.getModule(moduleLocalPart);
                 if (!isGloballyEngaged(modID.getName(), modID.getVersion(), session)) {
                     serviceGroup.disengageModule(axisModule);
-                    serviceGroup.engageModule(axisModule, axisConfig);
+                    serviceGroup.engageModule(axisModule);
                 }
             }
             tx.commit();

Modified: trunk/wsas/java/modules/standalone-edition/pom.xml
==============================================================================
--- trunk/wsas/java/modules/standalone-edition/pom.xml	(original)
+++ trunk/wsas/java/modules/standalone-edition/pom.xml	Tue May  8 00:57:45 2007
@@ -59,6 +59,14 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.wso2.wsas.Main</mainClass>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
             </plugin>
 
             <plugin>