[wsas-java-dev] svn commit r265 - in wsas/java/trunk/modules: admin/src/org/wso2/wsas/admin/service core/src/org/wso2/wsas/persistence/dao core/src/org/wso2/wsas/persistence/dataobject www/extensions/core

[svn at wso2.com]

Author: azeez
Date: Wed Dec 20 01:03:12 2006
New Revision: 265

Modified:
   wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
   wsas/java/trunk/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java
   wsas/java/trunk/modules/www/extensions/core/promotion.html
Log:
When deleting services, first remove all relationships between ServiceDO and other entities



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	Wed Dec 20 01:03:12 2006
@@ -1165,8 +1165,7 @@
         AxisServiceGroup asGroup = axisConfig.getServiceGroup(serviceGroupName);
 
         if (asGroup == null) {
-            throw new AxisFault("invalid service group name " +
-                                serviceGroupName);
+            throw new AxisFault("invalid service group name " + serviceGroupName);
         }
 
         String fileName = "";

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/persistence/dao/ServiceDAO.java	Wed Dec 20 01:03:12 2006
@@ -452,7 +452,6 @@
         ServiceDO serviceDO;
         try {
             serviceDO = getService(serviceId, version, session);
-            serviceDO.removeSecurityScenario();
 
             KeyStoreDO privateKeyStore = serviceDO.getPrivateKeyStore();
             if (privateKeyStore != null) {
@@ -465,7 +464,22 @@
                 KeyStoreDO keyStoreDO = (KeyStoreDO) iter.next();
                 keyStoreDO.getTrustStoreServices().remove(serviceDO);
             }
-            serviceDO.removeAllTrustedCertStores();
+
+           /* serviceDO.removeAllTrustedCertStores();
+            serviceDO.removeAllTransports();
+            serviceDO.removeAllUsers();
+            serviceDO.removeAllRoles();
+            serviceDO.removeSecurityScenario();*/
+
+            serviceDO.removeAllRelationships();
+//            SecurityScenarioDO securityScenario = serviceDO.getSecurityScenario();
+            /*if(securityScenario != null){
+                securityScenario.removeService(serviceDO);
+                session.update(securityScenario);
+            }*/
+
+
+
             session.update(serviceDO);
             session.delete(serviceDO);
             tx.commit();

Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java	(original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/persistence/dataobject/ServiceDO.java	Wed Dec 20 01:03:12 2006
@@ -326,6 +326,14 @@
         this.roles.clear();
     }
 
+    public void removeAllTransports(){
+       for (Iterator iter = transports.iterator(); iter.hasNext();) {
+            TransportDO transportDO = (TransportDO) iter.next();
+            transportDO.getServices().remove(this);
+        }
+        this.transports.clear();
+    }
+
     public void removeSecurityScenario() {
         if (securityScenario != null) {
             securityScenario.getServices().remove(this);
@@ -333,6 +341,14 @@
         }
     }
 
+    public void removeAllRelationships(){
+        removeAllRoles();
+        removeAllTransports();
+        removeAllTrustedCertStores();
+        removeAllUsers();
+        removeSecurityScenario();
+    }
+
     public void addParameter(ServiceParameterDO param) {
         parameters.add(param);
         param.setService(this);

Modified: wsas/java/trunk/modules/www/extensions/core/promotion.html
==============================================================================
--- wsas/java/trunk/modules/www/extensions/core/promotion.html	(original)
+++ wsas/java/trunk/modules/www/extensions/core/promotion.html	Wed Dec 20 01:03:12 2006
@@ -2,7 +2,7 @@
 <dl>
     <dt>@server_short_name@ Management Console</dt>
 
-    <dd>This is your one stop shop to administer the @server_name@ Server.
+    <dd>This is your one stop shop to administer the @server_name at .
         You can administer/configure your modules/services as well as monitor the system.</dd>
 
     <dt>AJAX and SOAP</dt>