You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/02/06 12:08:02 UTC
svn commit: r375247 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
Constants.java deployment/DeploymentEngine.java
deployment/FileSystemConfigurator.java engine/AxisConfiguration.java
Author: deepal
Date: Mon Feb 6 03:08:00 2006
New Revision: 375247
URL: http://svn.apache.org/viewcvs?rev=375247&view=rev
Log:
- add a new system property called axis2.repo , so now user can give three System properties axis2.home, axis2.repo and axis2.conf
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=375247&r1=375246&r2=375247&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Mon Feb 6 03:08:00 2006
@@ -75,9 +75,10 @@
public static final String SCOPE_TRANSPORT_SESSION = "transportsession";
public static final String SCOPE_REQUEST = "request";
- public static final String HOME_AXIS2 = "axis2.home";
- public static final String CONF_AXIS2 = "axis2.xml";
- public static final String HOME_USER = "user.home";
+ public static final String AXIS2_HOME = "axis2.home";
+ public static final String AXIS2_REPO = "axis2.repo";
+ public static final String AXIS2_CONF = "axis2.xml";
+ public static final String USER_HOME = "user.home";
/**
* Field TRANSPORT_TCP
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=375247&r1=375246&r2=375247&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Mon Feb 6 03:08:00 2006
@@ -18,6 +18,7 @@
package org.apache.axis2.deployment;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.deployment.listener.RepositoryListener;
import org.apache.axis2.deployment.listener.RepositoryListenerImpl;
import org.apache.axis2.deployment.repository.util.ArchiveFileData;
@@ -89,10 +90,17 @@
throws DeploymentException {
if ((repositoryName == null || "".equals(repositoryName.trim())) &&
(xmlFile == null || "".equals(xmlFile.trim()))) {
- useDefault = true;
- axis2repository = null;
- log.debug("neither repository location nor axis2.xml are given ," +
- " so system will continue using default configuration (using default_axis2.xml)");
+ String axis2_home = System.getProperty(Constants.AXIS2_HOME);
+ if (axis2_home != null && !"".equals("")) {
+ useDefault = false;
+ axis2repository = axis2_home;
+ } else {
+ useDefault = true;
+ axis2repository = null;
+ log.debug("neither repository location nor axis2.xml are given ," +
+ " so system will continue using default configuration (using default_axis2.xml)");
+ }
+
} else if (!(repositoryName == null || "".equals(repositoryName.trim()))) {
axis2repository = repositoryName.trim();
File axisRepo = new File(axis2repository);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java?rev=375247&r1=375246&r2=375247&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/FileSystemConfigurator.java Mon Feb 6 03:08:00 2006
@@ -40,10 +40,10 @@
public FileSystemConfigurator(String repoLocation, String axis2xml) {
if (repoLocation == null) {
//checking wether user has set the system property
- repoLocation = System.getProperty(Constants.HOME_AXIS2);
+ repoLocation = System.getProperty(Constants.AXIS2_REPO);
}
if (axis2xml == null) {
- axis2xml = System.getProperty(Constants.CONF_AXIS2);
+ axis2xml = System.getProperty(Constants.AXIS2_CONF);
}
this.repoLocation = repoLocation;
this.axis2xml = axis2xml;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java?rev=375247&r1=375246&r2=375247&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfiguration.java Mon Feb 6 03:08:00 2006
@@ -653,9 +653,9 @@
public static String getAxis2HomeDirectory() {
// if user has set the axis2 home variable try to get that from System properties
- String axis2home = System.getProperty(Constants.HOME_AXIS2);
+ String axis2home = System.getProperty(Constants.AXIS2_HOME);
if (axis2home == null) {
- axis2home = System.getProperty(Constants.HOME_USER);
+ axis2home = System.getProperty(Constants.USER_HOME);
if (axis2home != null) {
axis2home = axis2home + '/' + DeploymentConstants.DIRECTORY_AXIS2_HOME;
}