Author: sanka Date: Fri Jun 6 12:40:24 2008 New Revision: 18092 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18092
Log: Modified: branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java Modified: branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml?rev=18092&r1=18091&r2=18092&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml (original) +++ branches/wsas/java/2.3/wsas/modules/core/conf/hibernate/wso2wsas.hbm.xml Fri Jun 6 12:40:24 2008 @@ -619,7 +619,8 @@ <property name="name" column="c_name" not-null="true" /> <many-to-one name="service" column="c_service_id" not-null="true" /> - <many-to-one name="binding" column="c_binding_id" not-null="false"/> + <many-to-one name="binding" column="c_binding_id" + not-null="true" lazy="false" /> <set name="policies" inverse="true" cascade="all-delete-orphan" lazy="false"> <key column="c_endpoint_id" on-delete="cascade" /> Modified: branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java?rev=18092&r1=18091&r2=18092&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java (original) +++ branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java Fri Jun 6 12:40:24 2008 @@ -742,8 +742,7 @@ } else { BindingDO bindingDO = new BindingDO(); - bindingDO.setName(binding.getName().toString()); - + bindingDO.setName(binding.getName().getLocalPart()); Set bindingOpDOs = new HashSet(); for (Iterator bindingOperations = binding.getChildren(); bindingOperations .hasNext();) { @@ -788,7 +787,7 @@ bindingDO.setPolicies(getBindingPolcies(binding, bindingDO, axisService)); bindingDOs.put(binding.getName(), bindingDO); - session.save(bindingDO); + session.persist(bindingDO); endpointDO.setBinding(bindingDO); } endpointDOs.add(endpointDO); Modified: branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java?rev=18092&r1=18091&r2=18092&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java (original) +++ branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java Fri Jun 6 12:40:24 2008 @@ -440,18 +440,17 @@ keyStoreDO.getTrustStoreServices().remove(serviceDO); } serviceDO.removeAllRelationships(); - - List associatedBindingDOs = serviceDO.removeBindingHierarchy(); + List associatedBindingDOs = null; + associatedBindingDOs = serviceDO.removeBindingHierarchy(); + + session.update(serviceDO); + session.delete(serviceDO); for (Iterator iterator = associatedBindingDOs.iterator(); iterator .hasNext();) { - BindingDO bindingDO =(BindingDO) iterator.next(); + BindingDO bindingDO = (BindingDO) iterator.next(); session.update(bindingDO); session.delete(bindingDO); } - - - session.update(serviceDO); - session.delete(serviceDO); } public void deleteService(ServiceDO serviceDO, Session session) { @@ -467,8 +466,18 @@ keyStoreDO.getTrustStoreServices().remove(serviceDO); } serviceDO.removeAllRelationships(); - session.update(serviceDO); - session.delete(serviceDO); + + List associatedBindingDOs = null; + associatedBindingDOs = serviceDO.removeBindingHierarchy(); + session.update(serviceDO); + session.delete(serviceDO); + for (Iterator iterator = associatedBindingDOs.iterator(); iterator + .hasNext();) { + BindingDO bindingDO = (BindingDO) iterator.next(); + session.update(bindingDO); + session.delete(bindingDO); + } + } public ModuleDO[] getEngagedModules(String serviceId, String version) { Modified: branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java?rev=18092&r1=18091&r2=18092&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java (original) +++ branches/wsas/java/2.3/wsas/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java Fri Jun 6 12:40:24 2008 @@ -17,9 +17,11 @@ package org.wso2.wsas.persistence.dataobject; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -418,12 +420,17 @@ } public List removeBindingHierarchy() { - List bindingDOs = new ArrayList(); + Map bindingDOs = new HashMap(); + for (Iterator iterator = endpoints.iterator(); iterator.hasNext();) { EndpointDO endpointDO = (EndpointDO) iterator.next(); - bindingDOs.add(endpointDO.getBinding()); + BindingDO bindingDO = endpointDO.getBinding(); + String name = bindingDO.getName(); + if (! bindingDOs.containsKey(name)) { + bindingDOs.put(name, bindingDO); + } } - for (Iterator iterator = bindingDOs.iterator(); iterator.hasNext();) { + for (Iterator iterator = bindingDOs.values().iterator(); iterator.hasNext();) { BindingDO bindingDO = (BindingDO) iterator.next(); Set bindingOperationDOs = bindingDO.getBindingOperations(); for (Iterator i2 = bindingOperationDOs.iterator(); i2.hasNext();) { @@ -438,7 +445,7 @@ } } } - return bindingDOs; + return new ArrayList(bindingDOs.values()); } public void removeAllRelationships() { @@ -448,7 +455,7 @@ removeAllUsers(); removeAllPolicies(); removeSecurityScenario(); - removeBindingHierarchy(); +// removeBindingHierarchy(); } public void addParameter(ServiceParameterDO param) { _______________________________________________ Wsas-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
