[wsas-java-dev] svn commit r91 - in wsas/java/trunk/modules: admin/src/org/wso2/wsas/admin/service core/conf/hibernate

[svn at wso2.com]

Author: azeez
Date: Fri Dec  1 12:12:53 2006
New Revision: 91

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/ServiceAdmin.java
   wsas/java/trunk/modules/core/conf/hibernate/wso2wsas.hbm.xml
Log:
Fixed secpolicy persistence

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	Fri Dec  1 12:12:53 2006
@@ -191,6 +191,7 @@
                     XMLOutputFactory.newInstance().createXMLStreamWriter(baos);
             policy.serialize(xmlStreamWriter);
             xmlStreamWriter.flush();
+            removeAllSecurityScenarioPolicies(serviceAdmin, serviceName);
             serviceAdmin.setPolicy(serviceName,
                                    ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
                                    baos.toString());

Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	(original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	Fri Dec  1 12:12:53 2006
@@ -735,6 +735,15 @@
             throw new AxisFault("Invalid service name " + serviceId);
         }
         axisService.getPolicyInclude().removePolicyElement(policyId);
+        ServiceDO serviceDO = pm.getService(serviceId, version);
+        for (Iterator policyIter = serviceDO.getPolicies().iterator();
+             policyIter.hasNext();) {
+            ServicePolicyDO servicePolicyDO = (ServicePolicyDO) policyIter.next();
+            if (servicePolicyDO.getUuid().equals(policyId)) {
+                serviceDO.getPolicies().remove(servicePolicyDO);
+            }
+        }
+        pm.updateEntity(serviceDO);
     }
 
     public void setPolicy(String serviceId,

Modified: wsas/java/trunk/modules/core/conf/hibernate/wso2wsas.hbm.xml
==============================================================================
--- wsas/java/trunk/modules/core/conf/hibernate/wso2wsas.hbm.xml	(original)
+++ wsas/java/trunk/modules/core/conf/hibernate/wso2wsas.hbm.xml	Fri Dec  1 12:12:53 2006
@@ -389,7 +389,7 @@
             <many-to-many class="org.wso2.wsas.persistence.dataobject.ServiceUserDO"
                           column="c_user_id"/>
         </set>
-        <set name="policies" inverse="true" cascade="all-delete-orphan">
+        <set name="policies" inverse="true" cascade="all-delete-orphan" lazy="false">
             <key column="c_service_id" on-delete="cascade"/>
             <one-to-many class="org.wso2.wsas.persistence.dataobject.ServicePolicyDO"/>
         </set>