JBossWS SVN: r9647 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-20 18:29:03 -0400 (Fri, 20 Mar 2009)
New Revision: 9647
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
Log:
[JBWS-2577] sync with CXF 2.2 code base
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-03-20 22:04:20 UTC (rev 9646)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-03-20 22:29:03 UTC (rev 9647)
@@ -98,14 +98,21 @@
WebServiceContextImpl.setMessageContext(ctx);
- Object retObj = _invokeInternal(exchange, o, ctx);
+ Object retObj = null;
+ try
+ {
+ retObj = _invokeInternal(exchange, o, ctx);
- addHandlerProperties(ctx, handlerScopedStuff);
+ addHandlerProperties(ctx, handlerScopedStuff);
- //update the webservice response context
- updateWebServiceContext(exchange, ctx);
- //clear the WebServiceContextImpl's ThreadLocal variable
- WebServiceContextImpl.clear();
+ //update the webservice response context
+ updateWebServiceContext(exchange, ctx);
+ }
+ finally
+ {
+ //clear the WebServiceContextImpl's ThreadLocal variable
+ WebServiceContextImpl.clear();
+ }
return new MessageContentsList(retObj);
}
17 years, 1 month
JBossWS SVN: r9646 - in stack/cxf/trunk: modules/client and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-20 18:04:20 -0400 (Fri, 20 Mar 2009)
New Revision: 9646
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2577] fixing WS-RM and WS-Security tests
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2009-03-20 18:53:13 UTC (rev 9645)
+++ stack/cxf/trunk/modules/client/pom.xml 2009-03-20 22:04:20 UTC (rev 9646)
@@ -135,6 +135,10 @@
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
<!--
useStrictFiltering requires dependency in all included modules
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-03-20 18:53:13 UTC (rev 9645)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-03-20 22:04:20 UTC (rev 9646)
@@ -45,7 +45,7 @@
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
<include name="**/stax-api.jar"/>
- <include name="**/velocity.jar"/>
+ <include name="**/velocity.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/wss4j.jar"/>
<include name="**/wstx.jar"/>
@@ -89,6 +89,7 @@
<include name="**/wss4j.jar"/>
<include name="**/xml-resolver.jar"/>
<include name="**/xmlsec.jar"/>
+ <include name="**/asm.jar"/>
<include name="**/XmlSchema.jar"/>
<include name="**/FastInfoset.jar"/>
</patternset>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-03-20 18:53:13 UTC (rev 9645)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-03-20 22:04:20 UTC (rev 9646)
@@ -147,6 +147,10 @@
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
<!-- jboss provided -->
<dependency>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2009-03-20 18:53:13 UTC (rev 9645)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2009-03-20 22:04:20 UTC (rev 9646)
@@ -19,7 +19,7 @@
<bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/>
</jaxws:invoker>
<jaxws:features>
- <p:policies namespace="http://www.w3.org/2006/07/ws-policy">
+ <p:policies>
<wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/>
</p:policies>
</jaxws:features>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2009-03-20 18:53:13 UTC (rev 9645)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2009-03-20 22:04:20 UTC (rev 9646)
@@ -19,7 +19,7 @@
<bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/>
</jaxws:invoker>
<jaxws:features>
- <p:policies namespace="http://www.w3.org/2006/07/ws-policy">
+ <p:policies>
<wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/>
</p:policies>
</jaxws:features>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2009-03-20 18:53:13 UTC (rev 9645)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2009-03-20 22:04:20 UTC (rev 9646)
@@ -27,7 +27,7 @@
<bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/>
</jaxws:invoker>
<jaxws:features>
- <p:policies namespace="http://www.w3.org/2006/07/ws-policy">
+ <p:policies>
<wsp:PolicyReference URI="#wsrm10policy" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/>
</p:policies>
</jaxws:features>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-03-20 18:53:13 UTC (rev 9645)
+++ stack/cxf/trunk/pom.xml 2009-03-20 22:04:20 UTC (rev 9646)
@@ -60,6 +60,7 @@
<cxf.version>2.2</cxf.version>
<cxf.anttasks.version>2.1.4</cxf.anttasks.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
+ <cxf.asm.version>2.2.3</cxf.asm.version>
<fastinfoset.api.version>1.2.2</fastinfoset.api.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jaxb.api.version>2.1</jaxb.api.version>
@@ -347,6 +348,11 @@
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
</dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${cxf.asm.version}</version>
+ </dependency>
<!-- jboss provided -->
<dependency>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-20 18:53:13 UTC (rev 9645)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-20 22:04:20 UTC (rev 9646)
@@ -44,6 +44,7 @@
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
<include>org.apache.santuario:xmlsec:jar</include>
+ <include>asm:asm:jar</include>
<include>apache-velocity:velocity:jar</include>
<include>commons-collections:commons-collections:jar</include>
<include>commons-lang:commons-lang:jar</include>
17 years, 1 month
JBossWS SVN: r9645 - spi/trunk/src/main/java/org/jboss/wsf/spi/invocation.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-20 14:53:13 -0400 (Fri, 20 Mar 2009)
New Revision: 9645
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
Log:
[JBWS-2577] Using InheritableThreadLocal for EndpointAssociation as CXF now spans new thread when serving @OneWay requests
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java 2009-03-20 18:51:51 UTC (rev 9644)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/EndpointAssociation.java 2009-03-20 18:53:13 UTC (rev 9645)
@@ -31,7 +31,7 @@
*/
public final class EndpointAssociation
{
- private static final ThreadLocal<Endpoint> endpoint = new ThreadLocal<Endpoint>();
+ private static final ThreadLocal<Endpoint> endpoint = new InheritableThreadLocal<Endpoint>();
public static void setEndpoint(Endpoint ep)
{
17 years, 1 month
JBossWS SVN: r9644 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-20 14:51:51 -0400 (Fri, 20 Mar 2009)
New Revision: 9644
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.java
Log:
Changing test a bit to still return something if the oneway method is not called before the other one
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2009-03-20 18:49:06 UTC (rev 9643)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway/OneWayTestCase.java 2009-03-20 18:51:51 UTC (rev 9644)
@@ -33,10 +33,10 @@
import junit.framework.Test;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.common.DOMWriter;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.DOMWriter;
import org.w3c.dom.Element;
/**
@@ -71,6 +71,6 @@
Element docElement = DOMUtils.sourceToElement(retObj);
Element retElement = DOMUtils.getFirstChildElement(docElement);
String retPayload = DOMWriter.printNode(retElement, false);
- assertEquals("<return>ok</return>", retPayload);
+ assertEquals("<return>result: ok</return>", retPayload);
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.java 2009-03-20 18:49:06 UTC (rev 9643)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.java 2009-03-20 18:51:51 UTC (rev 9644)
@@ -55,6 +55,6 @@
public String feedback()
{
log.info("feedback");
- return feedback;
+ return "result: " + feedback;
}
}
17 years, 1 month