[jbossws-commits] JBossWS SVN: r10257 - in stack/native/branches/ropalka/modules/core/src/main: resources and 1 other directory.

Author: richard.opalka(a)jboss.com Date: 2009-06-30 05:26:39 -0400 (Tue, 30 Jun 2009) New Revision: 10257 Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml Log: [JBWS-2332][JBWS-2382] refactoring - removing the notion of two phase deployers (WIP) Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-06-30 09:21:16 UTC (rev 10256) +++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-06-30 09:26:39 UTC (rev 10257) @@ -415,7 +415,6 @@ throw new IllegalStateException("Cannot obtain endpoint meta data"); long beginProcessing = 0; - ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); try { EndpointState state = ep.getState(); @@ -461,10 +460,6 @@ // debug the incomming message MessageTrace.traceMessage("Incoming Request Message", reqMessage); - // Set the thread context class loader - ClassLoader classLoader = sepMetaData.getClassLoader(); - Thread.currentThread().setContextClassLoader(classLoader); - // Get the Invoker ServiceEndpointInvoker epInvoker = ep.getAttachment(ServiceEndpointInvoker.class); if (epInvoker == null) @@ -523,8 +518,6 @@ log.error("Cannot process metrics", ex); } - // Reset the thread context class loader - Thread.currentThread().setContextClassLoader(ctxClassLoader); log.debug("END handleRequest: " + ep.getName()); } } Modified: stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-30 09:21:16 UTC (rev 10256) +++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-30 09:26:39 UTC (rev 10257) @@ -78,22 +78,12 @@ <!-- Deployment aspect installers --> <!-- Phase 1 --> - <bean name="WSNativePhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property> + <bean name="WSNativeDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManager"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeContextPropertiesDeploymentAspect"/> - </set> - </property> - <depends>WSPhaseOneDeploymentAspectInstaller</depends> - </bean> - <!-- Phase 2 --> - <bean name="WSNativePhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> <inject bean="WSNativeEventingDeploymentAspect"/> @@ -105,6 +95,5 @@ <inject bean="WSJAXBIntroDeploymentAspect"/> </set> </property> - <depends>WSPhaseTwoDeploymentAspectInstaller</depends> + <depends>WSDeploymentAspectInstaller</depends> </bean> -