Author: asoldano Date: 2014-06-12 12:05:44 -0400 (Thu, 12 Jun 2014) New Revision: 18731 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java Log: [JBWS-3793] More cleanup Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-06-12 16:04:16 UTC (rev 18730) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2014-06-12 16:05:44 UTC (rev 18731) @@ -147,7 +147,7 @@ AnnotationsInfo ai = dep.getAttachment(AnnotationsInfo.class); if (ai == null || ai.hasAnnotatedClasses(PolicySets.class.getName())) { - policySetsListener = new PolicySetsAnnotationListener(dep.getRuntimeClassLoader()); + policySetsListener = new PolicySetsAnnotationListener(dep.getClassLoader()); bus.getExtension(FactoryBeanListenerManager.class).addListener(policySetsListener); } } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-06-12 16:04:16 UTC (rev 18730) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2014-06-12 16:05:44 UTC (rev 18731) @@ -102,7 +102,7 @@ //use origClassLoader (which on AS7 is set to ASIL aggregation module's classloader by TCCLDeploymentProcessor) 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)); + SecurityActions.setContextClassLoader(new DelegateClassLoader(dep.getClassLoader(), origClassLoader)); if (jbosswsCxfXml != null) { // Spring available and jbossws-cxf.xml provided Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-06-12 16:04:16 UTC (rev 18730) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2014-06-12 16:05:44 UTC (rev 18731) @@ -230,7 +230,7 @@ if (anWebService != null && anWebService.endpointInterface().length() > 0) { seiName = anWebService.endpointInterface(); - ClassLoader runtimeClassLoader = dep.getRuntimeClassLoader(); + ClassLoader runtimeClassLoader = dep.getClassLoader(); if(null == runtimeClassLoader) throw MESSAGES.runtimeLoaderCannotBeNull(dep); Modified: stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java =================================================================== --- stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2014-06-12 16:04:16 UTC (rev 18730) +++ stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2014-06-12 16:05:44 UTC (rev 18731) @@ -69,7 +69,7 @@ } BusHolder holder = new NonSpringBusHolder(new DDBeans()); try { - holder.configure(null, null, wsmd, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null)); + holder.configure(null, null, wsmd, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null, null)); return holder.getBus().getExtension(PolicyEngine.class).getAlternativeSelector().getClass().getName(); } finally { holder.close(); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-06-12 16:04:16 UTC (rev 18730) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-06-12 16:05:44 UTC (rev 18731) @@ -64,7 +64,7 @@ Bus bus = holder.getBus(); TestLifeCycleListener listener = new TestLifeCycleListener(); bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener); - holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null)); + holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null, null)); holder.close(); assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: " + listener.getCount(), 1, listener.getCount()); @@ -75,7 +75,7 @@ Bus bus = holder.getBus(); TestLifeCycleListener listener = new TestLifeCycleListener(); bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener); - holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null)); + holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null, null)); bus.shutdown(true); holder.close(); assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: " @@ -87,7 +87,7 @@ Bus bus = holder.getBus(); TestLifeCycleListener listener = new TestLifeCycleListener(); bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener); - holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null)); + holder.configure(null, null, null, new DefaultDeploymentModelFactory().newDeployment("testDeployment", null, null)); assertEquals("preShutdown method on listener shouldn't be called before holder is closed: number of actual calls: " + listener.getCount(), 0, listener.getCount()); holder.close();