You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/04/26 14:03:33 UTC
svn commit: r397187 - in
/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2:
context/AbstractContext.java context/SessionContext.java
deployment/WarBasedAxisConfigurator.java transport/http/AbstractAgent.java
transport/http/AxisServlet.java
Author: deepal
Date: Wed Apr 26 05:03:30 2006
New Revision: 397187
URL: http://svn.apache.org/viewcvs?rev=397187&view=rev
Log:
- fixing small war deployment problem
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java?rev=397187&r1=397186&r2=397187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/AbstractContext.java Wed Apr 26 05:03:30 2006
@@ -31,8 +31,8 @@
protected long lastTouchedTime;
- protected AbstractContext parent;
- protected Map properties;
+ protected transient AbstractContext parent;
+ protected transient Map properties;
protected AbstractContext(AbstractContext parent) {
this.properties = new HashMap();
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java?rev=397187&r1=397186&r2=397187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/SessionContext.java Wed Apr 26 05:03:30 2006
@@ -36,11 +36,11 @@
private transient HashMap serviceContextMap = new HashMap();
private transient HashMap serviceGroupContextMap = new HashMap();
- private String cookieID;
- protected Log log = LogFactory.getLog(getClass());
+ private transient String cookieID;
+ protected transient Log log = LogFactory.getLog(getClass());
// current time out interval is 30 secs. Need to make this configurable
- public long sessionContextTimeoutInterval = 30 * 1000;
+ public transient long sessionContextTimeoutInterval = 30 * 1000;
/**
* @param parent
@@ -127,4 +127,6 @@
}
}
}
+
+
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=397187&r1=397186&r2=397187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Wed Apr 26 05:03:30 2006
@@ -135,6 +135,14 @@
String axis2repourl = config.getInitParameter("axis2.repository.url");
if (axis2repourl != null) {
deploymentEngine.loadServicesFromUrl(new URL(axis2repourl));
+ } else {
+ try {
+ //is it unpack
+ config.getServletContext().getRealPath("/WEB-INF");
+ deploymentEngine.loadServices();
+ } catch (Exception e) {
+ log.info(e.getMessage());
+ }
}
}
} catch (MalformedURLException e) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java?rev=397187&r1=397186&r2=397187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AbstractAgent.java Wed Apr 26 05:03:30 2006
@@ -43,8 +43,8 @@
private static final String METHOD_PREFIX = "process";
private static final Log log = LogFactory.getLog(AbstractAgent.class);
- protected Map operationCache = new HashMap();
- protected ConfigurationContext configContext;
+ protected transient Map operationCache = new HashMap();
+ protected transient ConfigurationContext configContext;
public AbstractAgent(ConfigurationContext aConfigContext) {
configContext = aConfigContext;
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=397187&r1=397186&r2=397187&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Wed Apr 26 05:03:30 2006
@@ -52,7 +52,7 @@
*/
public class AxisServlet extends HttpServlet implements TransportListener {
- private Log log = LogFactory.getLog(getClass());
+ private transient Log log = LogFactory.getLog(getClass());
private static final long serialVersionUID = -2085869393709833372L;
public static final String CONFIGURATION_CONTEXT = "CONFIGURATION_CONTEXT";
public static final String SESSION_ID = "SessionId";
@@ -61,7 +61,7 @@
protected transient ServletConfig servletConfig;
- private ListingAgent agent;
+ private transient ListingAgent agent;
protected MessageContext createAndSetInitialParamsToMsgCtxt(Object sessionContext,
@@ -89,6 +89,13 @@
public void destroy() {
super.destroy();
+ //stoping listern manager
+ try {
+ configContext.getListenerManager().stop();
+ } catch (AxisFault axisFault) {
+ log.info(axisFault.getMessage());
+ }
+
}
/*
@@ -229,13 +236,11 @@
protected Object getSessionContext(HttpServletRequest httpServletRequest) {
Object sessionContext =
httpServletRequest.getSession(true).getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
-
if (sessionContext == null) {
sessionContext = new SessionContext(null);
httpServletRequest.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY,
sessionContext);
}
-
return sessionContext;
}
@@ -323,12 +328,5 @@
headerMap.put(field, request.getAttribute(field));
}
return headerMap;
- }
-
- protected void finalize() throws Throwable {
- super.finalize();
- //stoping listern manager
- configContext.getListenerManager().stop();
-
}
}