svn commit: r999903 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/SynapseConfigUtils.java core/axis2/ProxyService.java

[ru...@apache.org]

Author: ruwan
Date: Wed Sep 22 12:22:01 2010
New Revision: 999903

URL: http://svn.apache.org/viewvc?rev=999903&view=rev
Log:
Another step towards getting rid of the static referrence to the synapse home

Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java

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=999903&r1=999902&r2=999903&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:22:01 2010
@@ -23,6 +23,7 @@ import org.apache.axiom.om.*;
 import org.apache.axiom.om.util.AXIOMUtil;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.codec.binary.Base64;
@@ -728,6 +729,10 @@ public class SynapseConfigUtils {
         return "";
     }
 
+    public static SynapseEnvironment getSynapseEnvironment(AxisConfiguration axisCfg) {
+        return (SynapseEnvironment) axisCfg.getParameterValue(SynapseConstants.SYNAPSE_CONFIG);
+    }
+
     /**
      * Get the StatisticsCollector from synapse env.
      *

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=999903&r1=999902&r2=999903&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java Wed Sep 22 12:22:01 2010
@@ -363,9 +363,10 @@ public class ProxyService implements Asp
                                     "Could not get the WSDL to Axis Service Builder");
                         }
 
-                        wsdlToAxisServiceBuilder.setBaseUri(
-                                wsdlURI != null ? wsdlURI.toString() :
-                                        SynapseConfigUtils.getSynapseHome());
+                        wsdlToAxisServiceBuilder.setBaseUri(wsdlURI != null ? wsdlURI.toString() :
+                                SynapseConfigUtils.getSynapseEnvironment(axisCfg)
+                                        .getServerContextInformation()
+                                        .getServerConfigurationInformation().getSynapseHome());
 
                         if (trace()) {
                             trace.info("Setting up custom resolvers");