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 di...@apache.org on 2006/07/30 14:22:00 UTC
svn commit: r426884 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/ core/src/org/apache/axis2/engine/
core/src/org/apache/axis2/transport/http/
spring/src/org/apache/axis2/extensions/spring/receivers/
Author: dims
Date: Sun Jul 30 05:21:59 2006
New Revision: 426884
URL: http://svn.apache.org/viewvc?rev=426884&view=rev
Log:
Missed a couple of constants from last round of cleanup. deprecated the ones on Constants.java
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java
webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java?rev=426884&r1=426883&r2=426884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/Constants.java Sun Jul 30 05:21:59 2006
@@ -135,8 +135,12 @@
* Field SINGLE_SERVICE
*/
public static final String SINGLE_SERVICE = "singleservice";
- public static final String SERVLET_CONTEXT = "servletContext";
- public static final String HTTP_SERVLET_REQUEST = "HttpServletRequest";
+
+ /** @deprecated Please use org.apache.axis2.transport.http.HTTPConstants.MC_HTTP_SERVLETCONTEXT */
+ public static final String SERVLET_CONTEXT = "transport.http.servletContext";
+ /** @deprecated Please use org.apache.axis2.transport.http.HTTPConstants.MC_HTTP_SERVLETREQUEST */
+ public static final String HTTP_SERVLET_REQUEST = "transport.http.servletRequest";
+
public static final String SERVICE_MAP = "servicemap";
public static final String SERVICE_HANDLERS = "serviceHandlers";
public static final String SERVICE_GROUP_MAP = "serviceGroupmap";
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java?rev=426884&r1=426883&r2=426884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/InstanceDispatcher.java Sun Jul 30 05:21:59 2006
@@ -21,6 +21,7 @@
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.context.*;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
@@ -115,7 +116,7 @@
String scope = service.getScope();
if (Constants.SCOPE_TRANSPORT_SESSION.equals(scope)) {
if (sessionContext == null) {
- Object obj = msgContext.getProperty(Constants.HTTP_SERVLET_REQUEST);
+ Object obj = msgContext.getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST);
if (obj != null) {
sessionContext = (SessionContext) getSessionContext((HttpServletRequest) obj);
msgContext.setSessionContext(sessionContext);
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=426884&r1=426883&r2=426884&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 Sun Jul 30 05:21:59 2006
@@ -89,8 +89,8 @@
msgContext.setProperty(SESSION_ID, httpServletRequest.getSession().getId());
msgContext.setProperty(Constants.Configuration.TRANSPORT_IN_URL, httpServletRequest.getRequestURL().toString());
msgContext.setIncomingTransportName(Constants.TRANSPORT_HTTP);
- msgContext.setProperty(Constants.HTTP_SERVLET_REQUEST, httpServletRequest);
- msgContext.setProperty(Constants.SERVLET_CONTEXT, servletConfig.getServletContext());
+ msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST, httpServletRequest);
+ msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT, servletConfig.getServletContext());
return msgContext;
}
@@ -344,8 +344,8 @@
// set the transport Headers
msgContext.setProperty(MessageContext.TRANSPORT_HEADERS, getHeaders(req));
msgContext.setServiceGroupContextId(UUIDGenerator.getUUID());
- msgContext.setProperty(Constants.HTTP_SERVLET_REQUEST, req);
- msgContext.setProperty(Constants.SERVLET_CONTEXT, servletConfig.getServletContext());
+ msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST, req);
+ msgContext.setProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT, servletConfig.getServletContext());
return msgContext;
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java?rev=426884&r1=426883&r2=426884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPConstants.java Sun Jul 30 05:21:59 2006
@@ -154,6 +154,11 @@
public static String MC_HTTP_SERVLET = "transport.http.servlet";
/**
+ * Field MC_HTTP_SERVLETCONTEXT
+ */
+ public static String MC_HTTP_SERVLETCONTEXT = "transport.http.servletContext";
+
+ /**
* Field HEADER_USER_AGENT
*/
public static final String HEADER_USER_AGENT = "User-Agent";
Modified: webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java?rev=426884&r1=426883&r2=426884&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java (original)
+++ webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java Sun Jul 30 05:21:59 2006
@@ -22,6 +22,7 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.Constants;
+import org.apache.axis2.transport.http.HTTPConstants;
import javax.servlet.ServletContext;
@@ -50,7 +51,7 @@
String beanName = ((String) implBeanParam.getValue()).trim();
if (beanName != null) {
ServletContext servletContext = (ServletContext) msgContext.getOptions().
- getProperty(Constants.SERVLET_CONTEXT);
+ getProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT);
if (servletContext == null) {
throw new Exception("Axis2 Can't find ServletContext");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org