Author: indika
Date: Mon Oct 15 08:45:57 2007
New Revision: 584808
URL: http://svn.apache.org/viewvc?rev=584808&view=rev
Log:
remove local varibales and remove method of getting ConfigurationContext from
servletcontext
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java?rev=584808&r1=584807&r2=584808&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/ServerManager.java
Mon Oct 15 08:45:57 2007
@@ -166,4 +166,8 @@
}
}
}
+
+ public ConfigurationContext getConfigurationContext() {
+ return configctx;
+ }
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java?rev=584808&r1=584807&r2=584808&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseAxisServlet.java
Mon Oct 15 08:45:57 2007
@@ -20,6 +20,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.transport.http.AxisServlet;
+import org.apache.synapse.ServerManager;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -27,7 +28,7 @@
import javax.servlet.http.HttpServletRequest;
/**
- *Extends axis2 servlet functionality so that avoid starting listeners again
+ * Extends axis2 servlet functionality so that avoid starting listeners again
*/
public class SynapseAxisServlet extends AxisServlet {
@@ -35,13 +36,13 @@
/**
* Overrides init method so that avoid starting listeners again
+ *
* @param config
* @throws ServletException
*/
public void init(ServletConfig config) throws ServletException {
ServletContext servletContext = config.getServletContext();
- this.configContext =
- (ConfigurationContext)
servletContext.getAttribute(CONFIGURATION_CONTEXT);
+ this.configContext =
ServerManager.getInstance().getConfigurationContext();
this.axisConfiguration = this.configContext.getAxisConfiguration();
servletContext.setAttribute(this.getClass().getName(), this);
this.servletConfig = config;
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java?rev=584808&r1=584807&r2=584808&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
Mon Oct 15 08:45:57 2007
@@ -39,14 +39,13 @@
public class SynapseStartUpServlet extends HttpServlet {
private static Log log = LogFactory.getLog(SynapseStartUpServlet.class);
- private final ServerManager serverManager = ServerManager.getInstance();
public void init() throws ServletException {
super.init();
}
public void init(ServletConfig servletConfig) throws ServletException {
-
+ ServerManager serverManager = ServerManager.getInstance();
ServletContext servletContext = servletConfig.getServletContext();
if ("true".equals(servletContext.getAttribute("hasAlreadyInit"))) {
return;
@@ -62,26 +61,26 @@
String axis2Repo =
System.getProperty(org.apache.axis2.Constants.AXIS2_REPO);
if (axis2Repo == null) {
ServerManager.axis2Repolocation = synapseHome + "/WEB-INF" +
- File.separator +
"repository";
+ File.separator + "repository";
System.setProperty(org.apache.axis2.Constants.AXIS2_REPO,
- synapseHome + "/WEB-INF" +
- File.separator + "repository");
+ synapseHome + "/WEB-INF" +
+ File.separator + "repository");
}
//setting axis2 configuration location
String axis2Xml =
System.getProperty(org.apache.axis2.Constants.AXIS2_CONF);
if (axis2Xml == null) {
System.setProperty(org.apache.axis2.Constants.AXIS2_CONF,
- synapseHome + File.separator
- + "WEB-INF/conf"
- + File.separator +
org.apache.axis2.Constants.AXIS2_CONF);
+ synapseHome + File.separator
+ + "WEB-INF/conf"
+ + File.separator +
org.apache.axis2.Constants.AXIS2_CONF);
}
//setting synapse configuration location
String synapseXml =
System.getProperty(org.apache.synapse.SynapseConstants.SYNAPSE_XML);
if (synapseXml == null) {
System.setProperty(org.apache.synapse.SynapseConstants.SYNAPSE_XML,
- synapseHome + File.separator
- + "WEB-INF/conf"
- + File.separator +
org.apache.synapse.SynapseConstants.SYNAPSE_XML);
+ synapseHome + File.separator
+ + "WEB-INF/conf"
+ + File.separator +
org.apache.synapse.SynapseConstants.SYNAPSE_XML);
}
} else {
@@ -95,19 +94,18 @@
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException,
- IOException {
+ IOException {
}
protected void doPost(HttpServletRequest request,
HttpServletResponse response) throws
ServletException,
- IOException {
+ IOException {
}
public void destroy() {
try {
- if (serverManager != null) {
- serverManager.stop(); // will stop all started listeners
- }
+ ServerManager serverManager = ServerManager.getInstance();
+ serverManager.stop(); // will stop all started listeners
} catch (Exception ignored) {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
