[wsas-java-dev] svn commit r1735 - trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment

[svn at wso2.org]

Author: azeez
Date: Tue Apr  3 07:40:35 2007
New Revision: 1735

Modified:
   trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java
Log:
Get the axis2.xml from the Utils class



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	Tue Apr  3 07:40:35 2007
@@ -33,6 +33,7 @@
 import org.wso2.wsas.persistence.dataobject.TransportDO;
 import org.wso2.wsas.persistence.exception.TransportAlreadyExistsException;
 import org.wso2.wsas.ServerConstants;
+import org.wso2.wsas.util.Utils;
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -113,16 +114,8 @@
             }
         }
 
-        if (axis2xml == null) {
-            // If not, check for a system property setting
-            axis2xml = System.getProperty(Constants.AXIS2_CONF);
-
-            // If system property not set, use default filename
-            if (axis2xml == null) {
-                axis2xml = Constants.AXIS2_CONF;
-            }
-        }
-
+        axis2xml = Utils.getAxis2Xml();
+        
         isUrlAxis2Xml = axis2xml.indexOf("://") != -1;
         if (isUrlAxis2Xml) { // Is axis2xml a URL to the axis2.xml file?
             this.axis2xml = axis2xml;