[jbossws-commits] JBossWS SVN: r18888 - in stack/cxf/branches/jbossws-cxf-5.0.0.Beta1: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 2 other directories.
Author: asoldano
Date: 2014-08-29 12:00:46 -0400 (Fri, 29 Aug 2014)
New Revision: 18888
Removed:
stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/
stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/session/
Modified:
stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/pom.xml
Log:
[JBWS-3514] svn merge -r 18825:18824 .
Modified:
stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2014-08-29
15:40:29 UTC (rev 18887)
+++
stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2014-08-29
16:00:46 UTC (rev 18888)
@@ -126,13 +126,9 @@
} else if (o != null) {
params = new MessageContentsList(o);
}
- if (factory != null)
- {
- targetBean = this.getServiceObject(exchange);
- }
return invoke(exchange, targetBean, adjustMethodAndParams(md.getMethod(bop),
exchange, params, targetBean.getClass()), params);
}
-
+
/**
* This overrides org.apache.cxf.jaxws.AbstractInvoker in order for using the JBossWS
integration logic
* to invoke the JBoss AS target bean.
@@ -143,10 +139,8 @@
{
Endpoint ep = exchange.get(Endpoint.class);
final InvocationHandler invHandler = ep.getInvocationHandler();
- final Invocation inv = createInvocation(invHandler, serviceObject, ep, m,
paramArray);
- if (factory != null) {
- inv.getInvocationContext().setProperty("forceTargetBean", true);
- }
+ final Invocation inv = createInvocation(invHandler, ep, m, paramArray);
+
Bus threadBus = BusFactory.getThreadDefaultBus(false);
BusFactory.setThreadDefaultBus(null);
setNamespaceContextSelector(exchange);
@@ -161,12 +155,12 @@
}
}
- private Invocation createInvocation(InvocationHandler invHandler, Object
serviceObject, Endpoint ep, Method m, Object[] paramArray) {
+ private Invocation createInvocation(InvocationHandler invHandler, Endpoint ep, Method
m, Object[] paramArray) {
Invocation inv = invHandler.createInvocation();
InvocationContext invContext = inv.getInvocationContext();
WebServiceContext wsCtx = new WebServiceContextImpl(null);
invContext.addAttachment(WebServiceContext.class, wsCtx);
- invContext.setTargetBean(serviceObject);
+ invContext.setTargetBean(targetBean);
inv.setJavaMethod(m);
inv.setArgs(paramArray);
return inv;
Modified: stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/pom.xml 2014-08-29 15:40:29 UTC (rev
18887)
+++ stack/cxf/branches/jbossws-cxf-5.0.0.Beta1/pom.xml 2014-08-29 16:00:46 UTC (rev
18888)
@@ -71,7 +71,7 @@
<wildfly810.version>8.1.0.Final</wildfly810.version>
<wildfly900.version>9.0.0.Alpha1-SNAPSHOT</wildfly900.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
- <cxf.version>3.0.2-SNAPSHOT</cxf.version>
+ <cxf.version>3.0.1</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.7.0</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
@@ -102,7 +102,7 @@
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>2.0.1</xmlsec.version>
- <wss4j.version>2.0.2-SNAPSHOT</wss4j.version>
+ <wss4j.version>2.0.1</wss4j.version>
<wstx.version>4.2.0</wstx.version>
<spring.version>3.2.8.RELEASE</spring.version>
<shrinkwrap.version>1.1.3</shrinkwrap.version>