You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/05/15 21:20:00 UTC
svn commit: r538282 - in /incubator/cxf/trunk:
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/
rt/transports/http/src/main/java/org/apache/cxf/transport/http/
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/
tools/wsdlto...
Author: dkulp
Date: Tue May 15 12:19:59 2007
New Revision: 538282
URL: http://svn.apache.org/viewvc?view=rev&rev=538282
Log:
Map the ServletContext into the message context. Hopefully fix URI mapping for customizations on windows
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java?view=diff&rev=538282&r1=538281&r2=538282
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java Tue May 15 12:19:59 2007
@@ -67,6 +67,8 @@
MessageContext.SERVLET_REQUEST);
cxf2jaxwsMap.put("HTTP.RESPONSE",
MessageContext.SERVLET_RESPONSE);
+ cxf2jaxwsMap.put("HTTP.CONTEXT",
+ MessageContext.SERVLET_CONTEXT);
jaxws2cxfMap.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
Message.ENDPOINT_ADDRESS);
@@ -86,6 +88,8 @@
"HTTP.REQUEST");
jaxws2cxfMap.put(MessageContext.SERVLET_RESPONSE,
"HTTP.RESPONSE");
+ jaxws2cxfMap.put(MessageContext.SERVLET_CONTEXT,
+ "HTTP.CONTEXT");
}
private ContextPropertiesMapping() {
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?view=diff&rev=538282&r1=538281&r2=538282
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Tue May 15 12:19:59 2007
@@ -68,6 +68,7 @@
public static final String HTTP_REQUEST = "HTTP.REQUEST";
public static final String HTTP_RESPONSE = "HTTP.RESPONSE";
+ public static final String HTTP_CONTEXT = "HTTP.CONTEXT";
public static final String PROTOCOL_HEADERS_CONTENT_TYPE = Message.CONTENT_TYPE.toLowerCase();
private static final Logger LOG = LogUtils.getL7dLogger(AbstractHTTPDestination.class);
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev=538282&r1=538281&r2=538282
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Tue May 15 12:19:59 2007
@@ -243,9 +243,11 @@
* should be handled as such.
*/
private boolean configFinalized;
-
+
+ /**
+ * Variables for holding session state if sessions are supposed to be maintained
+ */
private String sessionId;
-
private boolean maintainSession;
/**
@@ -502,11 +504,7 @@
}
//Do we need to maintain a session?
- if (Boolean.TRUE.equals((Boolean) message.get(Message.MAINTAIN_SESSION))) {
- maintainSession = true;
- } else {
- maintainSession = false;
- }
+ maintainSession = Boolean.TRUE.equals((Boolean)message.get(Message.MAINTAIN_SESSION));
//If we have a sessionId and we are maintaining sessions, then use it
if (maintainSession && sessionId != null) {
Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?view=diff&rev=538282&r1=538281&r2=538282
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Tue May 15 12:19:59 2007
@@ -173,6 +173,7 @@
inMessage.setContent(InputStream.class, request.getInputStream());
inMessage.put(AbstractHTTPDestination.HTTP_REQUEST, request);
inMessage.put(AbstractHTTPDestination.HTTP_RESPONSE, response);
+ inMessage.put(AbstractHTTPDestination.HTTP_CONTEXT, cxfServlet.getServletContext());
inMessage.put(Message.HTTP_REQUEST_METHOD, request.getMethod());
inMessage.put(Message.PATH_INFO, request.getPathInfo());
inMessage.put(Message.QUERY_STRING, request.getQueryString());
Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java?view=diff&rev=538282&r1=538281&r2=538282
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customiztion/CustomizationParser.java Tue May 15 12:19:59 2007
@@ -395,12 +395,12 @@
}
- String normalizedURL = null;
+ URI normalizedURL = null;
if (this.wsdlURL != null) {
- normalizedURL = URI.create(this.wsdlURL).normalize().toString();
+ normalizedURL = URI.create(this.wsdlURL).normalize();
}
-
- if (wsdlURI.toString().equals(normalizedURL)) {
+
+ if (wsdlURI.normalize().equals(normalizedURL)) {
jaxwsBindings.add(root);
} else {
String wsdl = (String)env.get(ToolConstants.CFG_WSDLURL);