[wsas-java-dev] [wsas commit] r18 - wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service

[svn at wso2.com]

Author: azeez
Date: Thu Nov 30 03:41:33 2006
New Revision: 18

Modified:
   wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
Log:
Need to disengage the relevant modules before engaging modules for other scenarios. Fix for wsas-147

Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java	(original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java	Thu Nov 30 03:41:33 2006
@@ -75,6 +75,7 @@
             "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
     private static final QName ID = new QName(WS_SEC_UTILITY_NS, "Id");
     private static final String WS_POLICY_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+    private static final String SCENARIO_DISABLE_SECURITY = "DisableSecurity";
 
     public SecurityScenarioConfigAdmin() {
         pm = new PersistenceManager(HibernateConfigFactory.
@@ -99,7 +100,7 @@
         if (!isServiceScenarioFound) {
             for (int i = 0; i < scenarios.length; i++) {
                 SecurityScenarioDO scenario = scenarios[i];
-                if (scenario.getScenarioId().equalsIgnoreCase("DisableSecurity")) {
+                if (scenario.getScenarioId().equalsIgnoreCase(SCENARIO_DISABLE_SECURITY)) {
                     scenario.setIsCurrentScenario(true);
                     break;
                 }
@@ -111,6 +112,7 @@
     private void configureScenario(String serviceName,
                                    String scenarioId,
                                    Properties props) throws AxisFault {
+        disengageModules(serviceName, SCENARIO_DISABLE_SECURITY);
 
         RampartConfig rampartConfig = new RampartConfig();
         rampartConfig.setTokenStoreClass(SecurityTokenStore.class.getName());
@@ -228,7 +230,7 @@
             serviceDO.removeAllUsers();
             pm.updateEntity(serviceDO);
 
-            disengageModules(serviceName, "DisableSecurity");
+            disengageModules(serviceName, SCENARIO_DISABLE_SECURITY);
         }
     }