[wsas-java-dev] svn commit r1688 - in trunk/wsas/java/modules: admin/src/org/wso2/wsas/admin/service www/extensions/core/js

[svn at wso2.org]

Author: saminda
Date: Mon Apr  2 00:56:17 2007
New Revision: 1688

Modified:
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
   trunk/wsas/java/modules/www/extensions/core/js/modules.js
Log:
Addressing will be allowd to engage/disengage as and when required 


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	Mon Apr  2 00:56:17 2007
@@ -339,10 +339,6 @@
 
     public boolean disengageModuleFromSystem(String moduleId,
                                              String moduleversion) throws AxisFault {
-        if (moduleId.equals("addressing")) {
-            throw new AxisFault("Cannot disengage the addressing module. " +
-                                "It is required by the Management Console.");
-        }
 
         AxisModule module = getAxisModule(moduleId, moduleversion);
         try {
@@ -458,11 +454,6 @@
      */
     public void removeModule(String moduleId, String moduleversion) throws AxisFault {
 
-        if (moduleId.equals("addressing")) {
-            throw new AxisFault("Cannot remove the addressing module." +
-                                " It is required by the Management Console.");
-        }
-
         // We cannot remove modules which are required by security scenarios
         ModuleDO moduleDO = pm.getModule(moduleId, moduleversion);
         if (moduleDO != null) {

Modified: trunk/wsas/java/modules/www/extensions/core/js/modules.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/modules.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/modules.js	Mon Apr  2 00:56:17 2007
@@ -29,12 +29,6 @@
 
 function disengageModuleForSystem(moduleId, moduleVersion){
 
-    var addressingRegx = /^addressing/i;
-    if (addressingRegx.test(moduleId)) {
-        alertWarning("Cannot disengage the addressing module. It is required by the Management Console.");
-        return false;
-    }
-
     var disengage= confirm("Do you really want to globally disengage the "+ moduleId +" module?");
     if (disengage == true) {
         var body_xml = '<ns1:disengageModuleFromSystem xmlns:ns1="http://org.apache.axis2/xsd">' +