[Carbon-commits] [Carbon] svn commit r115025 - trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy

[isuru at wso2.com]

Author: isuru
Date: Wed Oct 26 01:27:18 2011
New Revision: 115025
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=115025

Log:
fixing https://wso2.org/jira/browse/STRATOS-1769

Modified:
   trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy/TenantAxisConfigurator.java

Modified: trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy/TenantAxisConfigurator.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy/TenantAxisConfigurator.java?rev=115025&r1=115024&r2=115025&view=diff
==============================================================================
--- trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy/TenantAxisConfigurator.java	(original)
+++ trunk/carbon/core/org.wso2.carbon.core/src/main/java/org/wso2/carbon/core/multitenancy/TenantAxisConfigurator.java	Wed Oct 26 01:27:18 2011
@@ -21,6 +21,7 @@
 import org.apache.axis2.deployment.DeploymentEngine;
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.deployment.ModuleDeployer;
+import org.apache.axis2.deployment.util.Utils;
 import org.apache.axis2.description.AxisModule;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisConfiguration;
@@ -192,6 +193,14 @@
             // register the service deployer. DeploymentEngine doesn't have to deal with it..
             axisConfig.addParameter(new Parameter(DeploymentConstants.SERVICE_DIR_PATH,
                     SERVICES_DIR));
+            // set the service class loader in the axisConfig, this is needed due to ghost deployer
+            // as the service deployer is no longer treated as a special case, we have to do this
+            File axis2ServicesDir = new File(repoLocation, SERVICES_DIR);
+            if (axis2ServicesDir.exists()) {
+                axisConfig.setServiceClassLoader(
+                        Utils.getClassLoader(axisConfig.getSystemClassLoader(), axis2ServicesDir,
+                                axisConfig.isChildFirstClassLoading()));
+            }
 
             for (Object globallyEngagedModule : globallyEngagedModules) {
                 AxisModule module = (AxisModule) globallyEngagedModule;