[Carbon-dev] svn commit r15561 - in trunk/carbon/core/src/org/wso2/carbon: deployment persistence

[svn at wso2.org]

Author: azeez
Date: Fri Apr  4 04:17:01 2008
New Revision: 15561

Log:

Fixing a small error in the operation resource path



Modified:
   trunk/carbon/core/src/org/wso2/carbon/deployment/DeploymentInterceptor.java
   trunk/carbon/core/src/org/wso2/carbon/persistence/PersistenceManager.java

Modified: trunk/carbon/core/src/org/wso2/carbon/deployment/DeploymentInterceptor.java
==============================================================================
--- trunk/carbon/core/src/org/wso2/carbon/deployment/DeploymentInterceptor.java	(original)
+++ trunk/carbon/core/src/org/wso2/carbon/deployment/DeploymentInterceptor.java	Fri Apr  4 04:17:01 2008
@@ -29,7 +29,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.RegistryResources;
 import org.wso2.carbon.persistence.PersistenceManager;
-import org.wso2.carbon.persistence.exception.ServiceGroupNotFoundException;
 import org.wso2.carbon.util.SystemFilter;
 import org.wso2.carbon.utils.CarbonUtils;
 import org.wso2.registry.RegistryException;
@@ -137,7 +136,6 @@
                 if (service == null) {
                     persistenceMgr.handleNewServiceAddition(axisService);
                 } else {
-                    // TODO AZEEZ
                     persistenceMgr.handleExistingServiceInit(service,  axisService);
                 }
             }else if (eventType == AxisEvent.SERVICE_START) {
@@ -178,7 +176,7 @@
         // Else this is a AxisEvent.MODULE_DEPLOY event. This may be a new or existing module
         String moduleVersion = axisModule.getVersion();
         if (moduleVersion == null) {
-            moduleVersion = "";
+            moduleVersion = "SNAPSHOT";
         }
         Resource module = persistenceMgr.getModule(moduleName, moduleVersion);
 

Modified: trunk/carbon/core/src/org/wso2/carbon/persistence/PersistenceManager.java
==============================================================================
--- trunk/carbon/core/src/org/wso2/carbon/persistence/PersistenceManager.java	(original)
+++ trunk/carbon/core/src/org/wso2/carbon/persistence/PersistenceManager.java	Fri Apr  4 04:17:01 2008
@@ -601,7 +601,7 @@
                         String moduleResourcePath =
                                 RegistryResources.MODULES + moduleName + "/" + moduleVersion;
                         String opResourcePath =
-                                serviceResourcePath + "/" +
+                                serviceResourcePath +
                                 RegistryResources.ServiceProperties.OPERATIONS +
                                 axisOperation.getName().getLocalPart();
                         registry.addAssociation(RegistryResources.Associations.ENGAGED_MODULES,