[jbossws-commits] JBossWS SVN: r14049 - in stack/cxf/branches/asoldano/modules: testsuite/cxf-tests/scripts and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2011-04-11 06:40:05 -0400 (Mon, 11 Apr 2011) New Revision: 14049 Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: Fixing remaining non-spring testsuite failures Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-04-09 03:25:54 UTC (rev 14048) +++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-04-11 10:40:05 UTC (rev 14049) @@ -71,7 +71,10 @@ String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL); BusHolder holder = null; - //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes + //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes; + //use origClassLoader (which on AS7 is set to ASIL aggregation module's classloader by TCCLDeploymentProcessClassLoader) as + //parent to make sure user provided libs in the deployment do no mess up the WS endpoint's deploy if they duplicates + //libraries already available on the application server modules. SecurityActions.setContextClassLoader(new DelegateClassLoader(dep.getRuntimeClassLoader(), origClassLoader)); if (jbosswsCxfXml != null) // Spring available { Modified: stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-04-09 03:25:54 UTC (rev 14048) +++ stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-04-11 10:40:05 UTC (rev 14049) @@ -84,6 +84,9 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/gzip/HelloWorld*.class"/> </classes> + <manifest> + <attribute name="Dependencies" value="org.apache.cxf"/> + </manifest> </war> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-gzip-client.war" manifest="${tests.output.dir}/test-resources/jaxws/cxf/gzip/META-INF/MANIFEST.MF"