11:20 p.m.
Author: asoldano
Date: 2014-02-17 09:20:33 -0500 (Mon, 17 Feb 2014)
New Revision: 18381
Added:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3670/
stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml
Log:
Merged revisions 18274,18324 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r18274 | jim.ma | 2014-01-23 10:58:50 +0100 (Thu, 23 Jan 2014) | 1 line
[JBWS-3670]:Add test case
.......
r18324 | jim.ma | 2014-02-08 00:17:11 +0100 (Sat, 08 Feb 2014) | 1 line
[JBWS-3670]:Add the endpoint a flag to demonstrate spring integraiton; Remove the
duplicate code to preDestroy code, the preDestory is called in ee's interceptors
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.2.x
___________________________________________________________________
Modified: svnmerge-integrated
-
/stack/cxf/trunk:1-18082,18093,18095-18103,18105-18116,18118-18156,18158-18163,18165,18167-18196,18198-18224,18227-18228,18230-18238,18242-18248,18251-18253,18255-18267,18269,18272-18273,18276,18282-18284,18287-18289,18293-18294,18297,18300-18303,18307-18308,18310,18313-18323,18325,18378-18379
+
/stack/cxf/trunk:1-18082,18093,18095-18103,18105-18116,18118-18156,18158-18163,18165,18167-18196,18198-18224,18227-18228,18230-18238,18242-18248,18251-18253,18255-18267,18269,18272-18274,18276,18282-18284,18287-18289,18293-18294,18297,18300-18303,18307-18308,18310,18313-18325,18378-18379
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:18093,18095-18096,18154,18177-18185,18269,18272,18289,18325,18378-18379
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:18093,18095-18096,18154,18177-18185,18269,18272,18274,18289,18324-18325,18378-18379
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-02-17
13:50:15 UTC (rev 18380)
+++
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-02-17
14:20:33 UTC (rev 18381)
@@ -27,6 +27,7 @@
import javax.xml.ws.spi.Provider;
+import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.configuration.Configurer;
import org.jboss.ws.api.binding.BindingCustomization;
@@ -35,6 +36,7 @@
import org.jboss.ws.common.utils.DelegateClassLoader;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ResourceResolver;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
@@ -134,6 +136,13 @@
new WSDLFilePublisher(aDep), dep.getService().getEndpoints(),
aDep.getRootFile(), epConfigName, epConfigFile);
holder.configure(resolver, configurer, wsmd, dep.getRuntimeClassLoader());
dep.addAttachment(BusHolder.class, holder);
+ if (holder instanceof SpringBusHolder)
+ {
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ endpoint.setProperty("SpringBus", true);
+ }
+ }
}
finally
{
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2014-02-17
13:50:15 UTC (rev 18380)
+++
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2014-02-17
14:20:33 UTC (rev 18381)
@@ -115,16 +115,6 @@
public static void callPreDestroy(Endpoint endpoint)
{
- ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class);
- if (factory != null)
- {
- if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() != null)
- {
- final Reference epReference =
endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName());
- final Object epInstance = epReference.getValue();
- InjectionHelper.callPreDestroyMethod(epInstance);
- }
- }
}
public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res,
ServletContext ctx, Bus bus,
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2014-02-17
13:50:15 UTC (rev 18380)
+++
stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2014-02-17
14:20:33 UTC (rev 18381)
@@ -152,6 +152,16 @@
<attribute name="Dependencies"
value="org.apache.cxf,org.jboss.ws.cxf.jbossws-cxf-server"/>
</manifest>
</war>
+ <!-- jaxws-cxf-jbws-3670-->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3670.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3670/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include
name="org/jboss/test/ws/jaxws/cxf/jbws3670/HelloWorldService*.class"/>
+ <include
name="org/jboss/test/ws/jaxws/cxf/jbws3670/TestBean.class"/>
+ </classes>
+ <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/jbws3670/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ </war>
<!-- jaxws-cxf-jms-api -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api.war"
Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml 2014-02-17 13:50:15 UTC
(rev 18380)
+++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml 2014-02-17 14:20:33 UTC
(rev 18381)
@@ -763,6 +763,9 @@
<!-- Manually setup KDC before run this test-->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
+
+ <!-- # [JBWS-3620]:Enable it after the fix merged to upstream-->
+
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3670/*TestCase*</exclude>
</excludes>
</configuration>
</plugin>