[wsas-java-dev] svn commit r1898 - in trunk/wsas/java/modules: admin/src/org/wso2/wsas/admin/service core/src/org/wso2/wsas/deployment

[svn at wso2.org]

Author: azeez
Date: Thu Apr 19 00:54:35 2007
New Revision: 1898

Modified:
   trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java
Log:

Pick the repository specified in the WSAS server.xml. Repo's specified anywhere else will not be valid.

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	Thu Apr 19 00:54:35 2007
@@ -1278,7 +1278,7 @@
         String uuid = String.valueOf(System.currentTimeMillis() + Math.random());
 
         File springDir =
-                new File(serverConfig.getFirstProperty("Axis2Config.RepositoryLocation") +
+                new File(serverConfig.getFirstProperty(ServerConfiguration.AXIS2_CONFIG_REPO_LOCATION) +
                          File.separator + "spring" + File.separator + uuid);
         ConfigurationContext configCtx =
                 MessageContext.getCurrentMessageContext().getConfigurationContext();

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java	Thu Apr 19 00:54:35 2007
@@ -51,8 +51,8 @@
     private static Log log = LogFactory.getLog(ServerConfigurator.class);
 
     private static List globallyEngagedModules = new ArrayList();
-    private String axis2xml = null;
-    private String repoLocation = null;
+    private String axis2xml;
+    private String repoLocation;
     private String webLocation;
 
     private static ServerConfigurator instance;
@@ -82,14 +82,10 @@
      */
     public void init(String repoLocation,
                      String weblocation) throws ServerException {
-        this.webLocation = weblocation;
-        if (repoLocation == null) {
-            repoLocation = System.getProperty(Constants.AXIS2_REPO);
-        }
-
         if (repoLocation == null) {
             throw new ServerException("Axis2 repository not specified!");
         }
+        this.webLocation = weblocation;
 
         // Check whether this is a URL
         isUrlRepo = isURL(repoLocation);
@@ -158,10 +154,6 @@
             throw new AxisFault("System cannot find the given axis2.xml " + axis2xml);
         }
         globallyEngagedModules = getAxisConfig().getGlobalModules();
-        Parameter axis2repoPara = axisConfiguration.getParameter(DeploymentConstants.AXIS2_REPO);
-        if (axis2repoPara != null) {
-            repoLocation = (String) axis2repoPara.getValue();
-        }
         if (repoLocation != null && repoLocation.trim().length() != 0) {
             try {
                 if (isUrlRepo) {