7:47 a.m.
Author: heiko.braun(a)jboss.com
Date: 2007-11-08 08:47:12 -0500 (Thu, 08 Nov 2007)
New Revision: 5015
Modified:
stack/native/trunk/jbossws-native-2.0.2.iml
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/version.properties
Log:
svn merge -r5011:5014
https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws-native-...
Modified: stack/native/trunk/jbossws-native-2.0.2.iml
===================================================================
--- stack/native/trunk/jbossws-native-2.0.2.iml 2007-11-08 13:36:51 UTC (rev 5014)
+++ stack/native/trunk/jbossws-native-2.0.2.iml 2007-11-08 13:47:12 UTC (rev 5015)
@@ -229,15 +229,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/"
/>
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$MODULE_DIR$/thirdparty/commons-logging.jar!/"
/>
</CLASSES>
<JAVADOC />
@@ -640,6 +631,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="common" />
<orderEntryProperties />
</component>
</module>
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java
===================================================================
---
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2007-11-08
13:36:51 UTC (rev 5014)
+++
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2007-11-08
13:47:12 UTC (rev 5015)
@@ -39,6 +39,7 @@
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import org.jboss.util.NotImplementedException;
+import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Element;
/**
@@ -60,6 +61,7 @@
public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName,
Class serviceClass)
{
ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName,
serviceClass);
+ DOMUtils.clearThreadLocals();
return delegate;
}
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
---
stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-11-08
13:36:51 UTC (rev 5014)
+++
stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-11-08
13:47:12 UTC (rev 5015)
@@ -136,6 +136,8 @@
if (resPath != null && resPath.indexOf("/") >
0)
{
String resParent = resPath.substring(0,
resPath.lastIndexOf("/"));
+
+ // replace parent traversal, results in resParent == null when
successfully executed
while (orgLocation.startsWith("../") &&
resParent != null)
{
if (resParent.indexOf("/") > 0)
@@ -151,6 +153,10 @@
resParent = null;
}
}
+
+ // no parent traversal happend
+ if(resParent!=null)
+ newResourcePath = resParent +"/"+ orgLocation;
}
String reqPath = reqURL.getPath();
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java
===================================================================
---
stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-11-08
13:36:51 UTC (rev 5014)
+++
stack/native/trunk/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2007-11-08
13:47:12 UTC (rev 5015)
@@ -60,7 +60,7 @@
public static void clear()
{
- msgContextAssoc.set(null);
- strTransformAssoc.set(null);
+ msgContextAssoc.remove();
+ strTransformAssoc.remove();
}
}
Modified:
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
---
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-11-08
13:36:51 UTC (rev 5014)
+++
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-11-08
13:47:12 UTC (rev 5015)
@@ -91,6 +91,7 @@
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.common.DOMWriter;
+import org.jboss.wsf.common.DOMUtils;
import org.w3c.dom.Document;
/**
@@ -320,6 +321,7 @@
// clear thread local storage
ThreadLocalAssociation.clear();
+ DOMUtils.clearThreadLocals();
}
}
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-11-08 13:36:51 UTC (rev 5014)
+++ stack/native/trunk/version.properties 2007-11-08 13:47:12 UTC (rev 5015)
@@ -25,7 +25,7 @@
# Dependend integration projects
jbossws-spi=1.0.0.GA
-jbossws-common=1.0.1.GA
+jbossws-common=snapshot
jbossws-framework=2.0.2.GA
jbossws-jboss40=2.0.2.GA
jbossws-jboss42=2.0.1.GA