Author: ruwan
Date: Wed Sep 22 12:09:59 2010
New Revision: 999893
URL: http://svn.apache.org/viewvc?rev=999893&view=rev
Log:
Trying to get rid of the synapse home static referrence
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=999893&r1=999892&r2=999893&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
Wed Sep 22 12:09:59 2010
@@ -423,6 +423,11 @@ public class Axis2SynapseController impl
serverConfigurationInformation.getResolveRoot());
}
+ if (serverConfigurationInformation.getSynapseHome() != null) {
+ properties.put(SynapseConstants.SYNAPSE_HOME,
+ serverConfigurationInformation.getSynapseHome());
+ }
+
if (synapseXMLLocation != null) {
synapseConfiguration =
SynapseConfigurationBuilder.getConfiguration(
synapseXMLLocation, properties);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=999893&r1=999892&r2=999893&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
Wed Sep 22 12:09:59 2010
@@ -158,7 +158,7 @@ public class SynapseConfigUtils {
log.debug("Can not open a connection to the URL with a
path :" +
path);
}
- String synapseHome = getSynapseHome();
+ String synapseHome =
properties.get(SynapseConstants.SYNAPSE_HOME).toString();
if (synapseHome != null) {
if (log.isDebugEnabled()) {
log.debug("Trying to resolve an absolute path of
the " +
