Author: ruwan
Date: Wed Sep 22 13:47:47 2010
New Revision: 999943
URL: http://svn.apache.org/viewvc?rev=999943&view=rev
Log:
Getting rid of all the problemetic static referrences :-) finally after almost
a day
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/config/SynapseConfiguration.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.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=999943&r1=999942&r2=999943&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 13:47:47 2010
@@ -266,12 +266,13 @@ public class SynapseConfigUtils {
* Return an OMElement from a URL source
*
* @param urlStr a URL string
+ * @param synapseHome synapse home parameter to be used
* @return an OMElement of the resource
* @throws IOException for invalid URL's or IO errors
*/
- public static OMNode getOMElementFromURL(String urlStr) throws IOException
{
+ public static OMNode getOMElementFromURL(String urlStr, String
synapseHome) throws IOException {
- URL url = getURLFromPath(urlStr);
+ URL url = getURLFromPath(urlStr, synapseHome);
if (url == null) {
return null;
}
@@ -572,9 +573,10 @@ public class SynapseConfigUtils {
* Utility method to resolve url(only If need) path using synapse home
system property
*
* @param path Path to the URL
+ * @param synapseHome synapse home parameter value to be used
* @return Valid URL instance or null(if it is invalid or can not open a
connection to it )
*/
- public static URL getURLFromPath(String path) {
+ public static URL getURLFromPath(String path, String synapseHome) {
if (path == null || "null".equals(path)) {
if (log.isDebugEnabled()) {
log.debug("Can not create a URL from 'null' ");
@@ -591,10 +593,8 @@ public class SynapseConfigUtils {
handleException("Invalid URL reference : " + path, e);
} catch (IOException ignored) {
if (log.isDebugEnabled()) {
- log.debug("Can not open a connection to the URL with a
path :" +
- path);
+ log.debug("Can not open a connection to the URL with a
path :" + path);
}
- String synapseHome = getSynapseHome();
if (synapseHome != null) {
if (synapseHome.endsWith("/")) {
synapseHome = synapseHome.substring(0,
synapseHome.lastIndexOf("/"));
@@ -716,21 +716,9 @@ public class SynapseConfigUtils {
}
- public static String getSynapseHome() {
- //TODO SUPUN
- /*ServerManager serverManager = ServerManager.getInstance();
- if (serverManager.isInitialized()) {
- ServerConfigurationInformation information =
- serverManager.getServerConfigurationInformation();
- if (information != null) {
- return information.getSynapseHome();
- }
- }*/
- return "";
- }
-
public static SynapseEnvironment getSynapseEnvironment(AxisConfiguration
axisCfg) {
- return (SynapseEnvironment)
axisCfg.getParameterValue(SynapseConstants.SYNAPSE_CONFIG);
+ return axisCfg != null &&
axisCfg.getParameter(SynapseConstants.SYNAPSE_HOME) != null ?
(SynapseEnvironment)
+ axisCfg.getParameterValue(SynapseConstants.SYNAPSE_CONFIG) :
null;
}
/**
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=999943&r1=999942&r2=999943&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Wed Sep 22 13:47:47 2010
@@ -329,8 +329,11 @@ public class SynapseConfiguration implem
if (entry.getType() == Entry.URL_SRC && entry.getValue() == null) {
try {
+ SynapseEnvironment synEnv =
SynapseConfigUtils.getSynapseEnvironment(
+ axisConfiguration);
entry.setValue(SynapseConfigUtils.getOMElementFromURL(entry.getSrc()
- .toString()));
+ .toString(), synEnv != null ?
synEnv.getServerContextInformation()
+ .getServerConfigurationInformation().getSynapseHome()
: ""));
localRegistry.put(key, entry);
for (SynapseObserver o : observers) {
o.entryAdded(entry);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java?rev=999943&r1=999942&r2=999943&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
Wed Sep 22 13:47:47 2010
@@ -48,7 +48,6 @@ public class RegistryFactory {
public static final QName NAME_Q
= new QName(XMLConfigConstants.NULL_NAMESPACE, "name");
- @SuppressWarnings({"UnusedDeclaration"})
public static Registry createRegistry(OMElement elem, Properties
properties) {
OMAttribute prov = elem.getAttribute(PROVIDER_Q);
@@ -56,7 +55,7 @@ public class RegistryFactory {
try {
Class provider = Class.forName(prov.getAttributeValue());
Registry registry = (Registry) provider.newInstance();
- registry.init(getProperties(elem));
+ registry.init(getProperties(elem, properties));
return registry;
} catch (ClassNotFoundException e) {
@@ -77,9 +76,9 @@ public class RegistryFactory {
return null;
}
- private static Properties getProperties(OMElement elem) {
+ private static Properties getProperties(OMElement elem, Properties
topLevelProps) {
Iterator params = elem.getChildrenWithName(PARAMETER_Q);
- Properties props =new Properties();
+ Properties props = new Properties(topLevelProps);
while (params.hasNext()) {
Object o = params.next();
if (o instanceof OMElement) {
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=999943&r1=999942&r2=999943&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 13:47:47 2010
@@ -245,6 +245,10 @@ public class ProxyService implements Asp
boolean wsdlFound = false;
String publishWSDL = null;
+ SynapseEnvironment synEnv =
SynapseConfigUtils.getSynapseEnvironment(axisCfg);
+ String synapseHome = synEnv != null ?
synEnv.getServerContextInformation()
+ .getServerConfigurationInformation().getSynapseHome() : "";
+
if (wsdlKey != null) {
synCfg.getEntryDefinition(wsdlKey);
Object keyObject = synCfg.getEntry(wsdlKey);
@@ -260,7 +264,7 @@ public class ProxyService implements Asp
URL url = wsdlURI.toURL();
publishWSDL = url.toString();
- OMNode node =
SynapseConfigUtils.getOMElementFromURL(publishWSDL);
+ OMNode node =
SynapseConfigUtils.getOMElementFromURL(publishWSDL, synapseHome);
if (node instanceof OMElement) {
wsdlElement = (OMElement) node;
}
@@ -363,10 +367,8 @@ public class ProxyService implements Asp
"Could not get the WSDL to Axis Service
Builder");
}
- wsdlToAxisServiceBuilder.setBaseUri(wsdlURI != null ?
wsdlURI.toString() :
-
SynapseConfigUtils.getSynapseEnvironment(axisCfg)
- .getServerContextInformation()
-
.getServerConfigurationInformation().getSynapseHome());
+ wsdlToAxisServiceBuilder.setBaseUri(wsdlURI != null ?
+ wsdlURI.toString() : synapseHome);
if (trace()) {
trace.info("Setting up custom resolvers");
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java?rev=999943&r1=999942&r2=999943&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
Wed Sep 22 13:47:47 2010
@@ -23,6 +23,7 @@ import org.apache.axiom.om.*;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.registry.AbstractRegistry;
@@ -60,7 +61,9 @@ public class SimpleURLRegistry extends A
log.debug("==> Repository fetch of resource with key : " + key);
}
- URL url = SynapseConfigUtils.getURLFromPath(root + key);
+ URL url = SynapseConfigUtils.getURLFromPath(root + key, properties.get(
+ SynapseConstants.SYNAPSE_HOME) != null ?
+ properties.get(SynapseConstants.SYNAPSE_HOME).toString() : "");
if (url == null) {
return null;
}
@@ -143,7 +146,9 @@ public class SimpleURLRegistry extends A
if (log.isDebugEnabled()) {
log.debug("Perform RegistryEntry lookup for key : " + key);
}
- URL url = SynapseConfigUtils.getURLFromPath(root + key);
+ URL url = SynapseConfigUtils.getURLFromPath(root + key, properties.get(
+ SynapseConstants.SYNAPSE_HOME) != null ?
+ properties.get(SynapseConstants.SYNAPSE_HOME).toString() : "");
if (url == null) {
return null;
}
@@ -222,7 +227,9 @@ public class SimpleURLRegistry extends A
entryImpl.setKey("");
entry = entryImpl;
}
- url = SynapseConfigUtils.getURLFromPath(root + entry.getKey());
+ url = SynapseConfigUtils.getURLFromPath(root + entry.getKey(),
properties.get(
+ SynapseConstants.SYNAPSE_HOME) != null ?
+ properties.get(SynapseConstants.SYNAPSE_HOME).toString() : "");
if (url == null) {
return null;
}
