You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by az...@apache.org on 2007/03/28 12:19:46 UTC
svn commit: r523260 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/axis2/engine/
kernel/src/org/apache/axis2/deployment/ kernel/src/org/apache/axis2/engine/
kernel/src/org/apache/axis2/transport/ kernel/src/org/apache/axis2/tra...
Author: azeez
Date: Wed Mar 28 03:19:34 2007
New Revision: 523260
URL: http://svn.apache.org/viewvc?view=rev&rev=523260
Log:
Added destroy method to ListenerManager & TransportListener interfaces. This method will be used to release resources.
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPServer.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java Wed Mar 28 03:19:34 2007
@@ -112,6 +112,9 @@
public SessionContext getSessionContext(MessageContext messageContext) {
return null;
}
+
+ public void destroy() {
+ }
});
config.addTransportIn(tIn);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java Wed Mar 28 03:19:34 2007
@@ -19,7 +19,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
@@ -28,30 +27,19 @@
import org.apache.axis2.deployment.scheduler.Scheduler;
import org.apache.axis2.deployment.scheduler.SchedulerTask;
import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.Flow;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
+import org.apache.axis2.description.*;
import org.apache.axis2.description.WSDL2Constants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -71,10 +59,14 @@
DeploymentEngine.webLocationString = webLocationString;
}
- /** Support for hot update is controlled by this flag */
+ /**
+ * Support for hot update is controlled by this flag
+ */
protected boolean hotUpdate = true;
- /** Support for hot deployment is controlled by this flag */
+ /**
+ * Support for hot deployment is controlled by this flag
+ */
protected boolean hotDeployment = true;
/**
@@ -132,7 +124,11 @@
prepareRepository(repoDir);
// setting the CLs
setClassLoaders(repoDir);
- repoListener = new RepositoryListener(this, false);
+ if (repoListener == null) {
+ repoListener = new RepositoryListener(this, false);
+ } else {
+ repoListener.init2(false);
+ }
org.apache.axis2.util.Utils
.calculateDefaultModuleVersion(axisConfig.getModules(), axisConfig);
try {
@@ -208,7 +204,7 @@
DeploymentClassLoader deploymentClassLoader =
new DeploymentClassLoader(
new URL[]{moduleurl},
- axisConfig.getModuleClassLoader(),false);
+ axisConfig.getModuleClassLoader(), false);
AxisModule module = new AxisModule();
module.setModuleClassLoader(deploymentClassLoader);
module.setParent(axisConfig);
@@ -254,7 +250,7 @@
try {
serviceGroup.setServiceGroupName(serviceName);
DeploymentClassLoader serviceClassLoader = new DeploymentClassLoader(
- new URL[]{servicesURL}, axisConfig.getServiceClassLoader(),false);
+ new URL[]{servicesURL}, axisConfig.getServiceClassLoader(), false);
String metainf = "meta-inf";
serviceGroup.setServiceGroupClassLoader(serviceClassLoader);
//processing wsdl.list
@@ -467,7 +463,7 @@
ArrayList list = axisService.getModules();
for (int i = 0; i < list.size(); i++) {
- AxisModule module = axisConfig.getModule((String)list.get(i));
+ AxisModule module = axisConfig.getModule((String) list.get(i));
if (module == null) {
throw new DeploymentException(
@@ -588,7 +584,7 @@
}
}
- }finally {
+ } finally {
wsToDeploy.clear();
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Wed Mar 28 03:19:34 2007
@@ -55,6 +55,10 @@
public RepositoryListener(DeploymentEngine deploymentEngine, boolean isClasspath) {
this.deploymentEngine = deploymentEngine;
wsInfoList = new WSInfoList(deploymentEngine);
+ init2(isClasspath);
+ }
+
+ public void init2(boolean isClasspath) {
if (!isClasspath) {
init();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java Wed Mar 28 03:19:34 2007
@@ -115,14 +115,15 @@
* To start all the transports
*/
public synchronized void start() {
- Iterator transportNames = configctx.getAxisConfiguration().
- getTransportsIn().values().iterator();
- while (transportNames.hasNext()) {
+
+ for (Iterator transportNames =
+ configctx.getAxisConfiguration().getTransportsIn().values().iterator();
+ transportNames.hasNext();) {
try {
TransportInDescription transportIn = (TransportInDescription) transportNames.next();
TransportListener listener = transportIn.getReceiver();
if (listener != null &&
- startedTransports.get(transportIn.getName()) == null) {
+ startedTransports.get(transportIn.getName()) == null) {
listener.init(configctx, transportIn);
listener.start();
if (startedTransports.get(transportIn.getName()) == null) {
@@ -149,9 +150,10 @@
if (stopped) {
return;
}
- Iterator itr_st = startedTransports.values().iterator();
- while (itr_st.hasNext()) {
- TransportListener transportListener = (TransportListener) itr_st.next();
+
+ for (Iterator iter = startedTransports.values().iterator();
+ iter.hasNext();) {
+ TransportListener transportListener = (TransportListener) iter.next();
transportListener.stop();
}
@@ -181,8 +183,8 @@
}
configctx.cleanupContexts();
/*Shut down the services*/
- Iterator services = configctx.getAxisConfiguration().getServices().values().iterator();
- while (services.hasNext()) {
+ for (Iterator services = configctx.getAxisConfiguration().getServices().values().iterator();
+ services.hasNext();) {
AxisService axisService = (AxisService) services.next();
ServiceLifeCycle serviceLifeCycle = axisService.getServiceLifeCycle();
if (serviceLifeCycle != null) {
@@ -197,8 +199,8 @@
* @param started : whether transport Listener running or not
* @throws AxisFault : will throw AxisFault if something goes wrong
*/
- public synchronized void addListener(TransportInDescription trsIn, boolean started)
- throws AxisFault {
+ public synchronized void addListener(TransportInDescription trsIn,
+ boolean started) throws AxisFault {
configctx.getAxisConfiguration().addTransportIn(trsIn);
TransportListener transportListener = trsIn.getReceiver();
if (transportListener != null) {
@@ -217,6 +219,19 @@
public boolean isStopped() {
return stopped;
+ }
+
+ public void destroy() throws AxisFault {
+ stop();
+ this.configctx.setTransportManager(null);
+ for (Iterator iter = startedTransports.values().iterator();
+ iter.hasNext();) {
+ TransportListener transportListener = (TransportListener) iter.next();
+ transportListener.destroy();
+ }
+ this.startedTransports.clear();
+ this.configctx = null;
+ defaultConfigurationContext = null;
}
static class ListenerManagerShutdownThread extends Thread {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportListener.java Wed Mar 28 03:19:34 2007
@@ -58,4 +58,6 @@
* @return SessionContext
*/
SessionContext getSessionContext(MessageContext messageContext);
+
+ void destroy();
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Wed Mar 28 03:19:34 2007
@@ -373,7 +373,6 @@
if (response != null) {
//TODO : Check for SOAP 1.2!
-
SOAPFaultCode code = faultContext.getEnvelope().getBody().getFault().getCode();
OMElement valueElement = null;
if (code != null) {
@@ -416,8 +415,8 @@
listenerManager.addListener(transportInDescription, true);
listenerManager.start();
ListenerManager.defaultConfigurationContext = configContext;
- agent = new ListingAgent(configContext);
-
+ agent = new ListingAgent(configContext);
+
initParams();
} catch (Exception e) {
@@ -499,6 +498,9 @@
* @param req
*/
public void initContextRoot(HttpServletRequest req) {
+ if(contextRoot != null && contextRoot.trim().length() != 0){
+ return;
+ }
boolean findContext = true;
String findContextParameter = servletConfig.getInitParameter("axis2.find.context");
if (findContextParameter != null) {
@@ -510,7 +512,7 @@
contextRoot = configContext.getContextRoot();
}
}
- if (contextRoot == null || "".equals(contextRoot)) {
+ if (contextRoot == null || contextRoot.trim().length() == 0) {
String[] parts = JavaUtils.split(req.getContextPath(), '/');
if (parts != null) {
for (int i = 0; i < parts.length; i++) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ListingAgent.java Wed Mar 28 03:19:34 2007
@@ -38,7 +38,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
@@ -47,11 +46,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
public class ListingAgent extends AbstractAgent {
@@ -105,7 +100,7 @@
String query = httpServletRequest.getQueryString();
if (query != null) {
if (query.indexOf("?wsdl2") > 0 || query.indexOf("?wsdl") > 0 ||
- query.indexOf("?xsd") > 0) {
+ query.indexOf("?xsd") > 0) {
processListService(httpServletRequest, httpServletResponse);
} else {
super.handle(httpServletRequest, httpServletResponse);
@@ -155,12 +150,12 @@
}
public void processExplicitSchemaAndWSDL(HttpServletRequest req,
- HttpServletResponse res)
+ HttpServletResponse res)
throws IOException, ServletException {
HashMap services = configContext.getAxisConfiguration().getServices();
String filePart = req.getRequestURL().toString();
String schema = filePart.substring(filePart.lastIndexOf("/") + 1,
- filePart.length());
+ filePart.length());
if ((services != null) && !services.isEmpty()) {
Iterator i = services.values().iterator();
while (i.hasNext()) {
@@ -181,7 +176,7 @@
/**
* Copies the input stream to the output stream
*
- * @param stream the <code>InputStream</code>
+ * @param stream the <code>InputStream</code>
* @param ostream the <code>OutputStream</code>
*/
public static void copy(InputStream stream, OutputStream ostream) throws IOException {
@@ -317,7 +312,7 @@
res.setContentType("text/html");
String outStr = "<b>No policy found for id="
- + idParam + "</b>";
+ + idParam + "</b>";
out.write(outStr.getBytes());
}
@@ -351,7 +346,7 @@
res.setContentType("text/html");
String outStr = "<b>No effective policy for "
- + serviceName + " servcie</b>";
+ + serviceName + " servcie</b>";
out.write(outStr.getBytes());
}
}
@@ -448,8 +443,8 @@
public EndpointReference[] getEPRsForService(String serviceName, String ip)
throws AxisFault {
return new EndpointReference[]{new EndpointReference(schema + "://" + ip + ":" + port +
- "/" + axisConf.getServiceContextPath() + "/" +
- serviceName)}; //To change body of implemented methods use File | Settings | File Templates.
+ "/" + axisConf.getServiceContextPath() + "/" +
+ serviceName)}; //To change body of implemented methods use File | Settings | File Templates.
}
public EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault {
@@ -474,6 +469,8 @@
return sessionContext;
}
+ public void destroy() {
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Wed Mar 28 03:19:34 2007
@@ -135,7 +135,7 @@
args = optionsParser.getRemainingArgs();
// first check if we should print usage
if ((optionsParser.isFlagSet('?') > 0) || (optionsParser.isFlagSet('h') > 0) ||
- args == null || args.length == 0 || args.length > 3) {
+ args == null || args.length == 0 || args.length > 3) {
printUsage();
}
String paramPort = optionsParser.isValueSet('p');
@@ -156,7 +156,7 @@
System.out.println("[SimpleHTTPServer] Starting");
System.out.println("[SimpleHTTPServer] Using the Axis2 Repository "
- + new File(repository).getAbsolutePath());
+ + new File(repository).getAbsolutePath());
System.out.println("[SimpleHTTPServer] Listening on port " + port);
try {
ConfigurationContext configctx = ConfigurationContextFactory
@@ -251,7 +251,7 @@
if (hostAddress != null) {
if (embedded != null) {
return new EndpointReference[]{new EndpointReference(hostAddress + "/" +
- configurationContext.getServiceContextPath() + "/" + serviceName)};
+ configurationContext.getServiceContextPath() + "/" + serviceName)};
} else {
throw new AxisFault("Unable to generate EPR for the transport : http");
}
@@ -272,8 +272,8 @@
}
if (embedded != null) {
return new EndpointReference[]{new EndpointReference("http://" + localAddress + ":" +
- (embedded.getPort())
- + "/" + configurationContext.getServiceContextPath() + "/" + serviceName)};
+ (embedded.getPort())
+ + "/" + configurationContext.getServiceContextPath() + "/" + serviceName)};
} else {
throw new AxisFault("Unable to generate EPR for the transport : http");
}
@@ -342,5 +342,9 @@
public SessionContext getSessionContext(MessageContext messageContext) {
String sessionKey = (String) messageContext.getProperty(HTTPConstants.COOKIE_STRING);
return this.sessionManager.getSessionContext(sessionKey);
+ }
+
+ public void destroy() {
+ this.configurationContext = null;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java Wed Mar 28 03:19:34 2007
@@ -25,12 +25,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.SessionContext;
-import org.apache.axis2.description.AxisModule;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisServiceGroup;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterIncludeImpl;
-import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEvent;
import org.apache.axis2.engine.AxisObserver;
@@ -41,11 +36,7 @@
import javax.jms.JMSException;
import javax.naming.Context;
import javax.naming.NamingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
+import java.util.*;
/**
* The JMS Transport listener implementation. A JMS Listner will hold one or
@@ -97,7 +88,7 @@
/**
* The Axis2 Configuration context
*/
- private ConfigurationContext axisConf = null;
+ private ConfigurationContext configCtx = null;
/**
* This is the TransportListener initialization method invoked by Axis2
@@ -109,7 +100,7 @@
TransportInDescription transprtIn) {
// save reference to the configuration context
- this.axisConf = axisConf;
+ this.configCtx = axisConf;
// initialize the defined connection factories
initializeConnectionFactories(transprtIn);
@@ -117,7 +108,7 @@
// if no connection factories are defined, we cannot listen
if (connectionFactories.isEmpty()) {
log.warn("No JMS connection factories are defined." +
- "Will not listen for any JMS messages");
+ "Will not listen for any JMS messages");
return;
}
@@ -149,9 +140,9 @@
JMSConnectionFactory cf = getConnectionFactory(service);
if (cf == null) {
String msg = "Service " + service.getName() + " does not specify" +
- "a JMS connection factory or refers to an invalid factory. " +
- "This service is being marked as faulty and will not be " +
- "available over the JMS transport";
+ "a JMS connection factory or refers to an invalid factory. " +
+ "This service is being marked as faulty and will not be " +
+ "available over the JMS transport";
log.warn(msg);
JMSUtils.markServiceAsFaulty(
service.getName(), msg, service.getAxisConfiguration());
@@ -218,7 +209,7 @@
pi.deserializeParameters((OMElement) param.getValue());
} catch (AxisFault axisFault) {
handleException("Error reading Parameters for JMS connection " +
- "factory" + jmsConFactory.getName(), axisFault);
+ "factory" + jmsConFactory.getName(), axisFault);
}
// read connection facotry properties
@@ -256,7 +247,7 @@
connectionFactories.put(jmsConFactory.getName(), jmsConFactory);
} catch (NamingException e) {
handleException("Error connecting to JMS connection factory : " +
- jmsConFactory.getJndiName(), e);
+ jmsConFactory.getJndiName(), e);
}
}
}
@@ -303,13 +294,13 @@
while (iter.hasNext()) {
JMSConnectionFactory conFac = (JMSConnectionFactory) iter.next();
JMSMessageReceiver msgRcvr =
- new JMSMessageReceiver(conFac, workerPool, axisConf);
+ new JMSMessageReceiver(conFac, workerPool, configCtx);
try {
conFac.listen(msgRcvr);
} catch (JMSException e) {
handleException("Error starting connection factory : " +
- conFac.getName(), e);
+ conFac.getName(), e);
}
}
}
@@ -363,9 +354,9 @@
JMSConnectionFactory cf = getConnectionFactory(service);
if (cf == null) {
String msg = "Service " + service.getName() + " does not specify" +
- "a JMS connection factory or refers to an invalid factory." +
- "This service is being marked as faulty and will not be " +
- "available over the JMS transport";
+ "a JMS connection factory or refers to an invalid factory." +
+ "This service is being marked as faulty and will not be " +
+ "available over the JMS transport";
log.warn(msg);
JMSUtils.markServiceAsFaulty(
service.getName(), msg, service.getAxisConfiguration());
@@ -376,7 +367,7 @@
try {
cf.listenOnDestination(destination);
log.info("Started listening on destination : " + destination +
- " for service " + service.getName());
+ " for service " + service.getName());
} catch (JMSException e) {
handleException(
@@ -396,9 +387,9 @@
JMSConnectionFactory cf = getConnectionFactory(service);
if (cf == null) {
String msg = "Service " + service.getName() + " does not specify" +
- "a JMS connection factory or refers to an invalid factory." +
- "This service is being marked as faulty and will not be " +
- "available over the JMS transport";
+ "a JMS connection factory or refers to an invalid factory." +
+ "This service is being marked as faulty and will not be " +
+ "available over the JMS transport";
log.warn(msg);
JMSUtils.markServiceAsFaulty(
service.getName(), msg, service.getAxisConfiguration());
@@ -482,11 +473,15 @@
}
public ConfigurationContext getConfigurationContext() {
- return this.axisConf;
+ return this.configCtx;
}
public SessionContext getSessionContext(MessageContext messageContext) {
return null;
+ }
+
+ public void destroy() {
+ this.configCtx = null;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/SimpleMailListener.java Wed Mar 28 03:19:34 2007
@@ -27,11 +27,8 @@
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.builder.BuilderUtil;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.context.ContextFactory;
+import org.apache.axis2.context.*;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
@@ -43,12 +40,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.mail.Flags;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
-import javax.mail.URLName;
+import javax.mail.*;
import javax.mail.internet.MimeMessage;
import javax.xml.stream.XMLStreamException;
import java.io.File;
@@ -434,5 +426,9 @@
public SessionContext getSessionContext(MessageContext messageContext) {
return null;
+ }
+
+ public void destroy() {
+ this.configurationContext = null;
}
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPServer.java?view=diff&rev=523260&r1=523259&r2=523260
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPServer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/tcp/TCPServer.java Wed Mar 28 03:19:34 2007
@@ -33,7 +33,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.namespace.QName;
import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
@@ -212,7 +211,7 @@
// todo this has to fix
return new EndpointReference[]{
new EndpointReference("tcp://" + ip + ":" + (serversocket.getLocalPort())
- + "/" + contextPath + "/" + serviceName)};
+ + "/" + contextPath + "/" + serviceName)};
} else {
log.debug("Unable to generate EPR for the transport tcp");
return null;
@@ -221,5 +220,9 @@
public SessionContext getSessionContext(MessageContext messageContext) {
return null;
+ }
+
+ public void destroy() {
+ this.configContext = null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org