Author: richard.opalka(a)jboss.com Date: 2009-07-03 05:31:03 -0400 (Fri, 03 Jul 2009) New Revision: 10308 Modified: stack/native/branches/ropalka/modules/core/pom.xml stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml Log: [JBWS-2332][JBWS-2382] refactoring - removing notion of CREATED,DESTROYED states, removing temporary Deployers integration hack (WIP) Modified: stack/native/branches/ropalka/modules/core/pom.xml =================================================================== --- stack/native/branches/ropalka/modules/core/pom.xml 2009-07-03 09:29:49 UTC (rev 10307) +++ stack/native/branches/ropalka/modules/core/pom.xml 2009-07-03 09:31:03 UTC (rev 10308) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss Web Services - Stack Native Core</name> + <name>JBoss Web Services - Native Server</name> <artifactId>jbossws-native-core</artifactId> <packaging>jar</packaging> Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java =================================================================== --- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2009-07-03 09:29:49 UTC (rev 10307) +++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2009-07-03 09:31:03 UTC (rev 10308) @@ -60,7 +60,7 @@ } @Override - public final void destroy(Deployment dep) + public final void stop(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java =================================================================== --- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-07-03 09:29:49 UTC (rev 10307) +++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-07-03 09:31:03 UTC (rev 10308) @@ -70,7 +70,7 @@ } @Override - public void destroy(Deployment dep) + public void stop(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { 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-07-03 09:29:49 UTC (rev 10307) +++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-03 09:31:03 UTC (rev 10308) @@ -28,42 +28,18 @@ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry> </map> </property> - </bean> - - <bean name="WSNativeContextPropertiesDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativeContextPropertiesDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> <property name="provides">InitializedMetaDataModel</property> - </bean> - - <bean name="WSNativeEagerInitializeDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativeEagerInitializeDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">25</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSNativeEndpointHandlerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround --> </bean> @@ -77,94 +53,38 @@ <inject bean="WSLogRecorder"/> </list> </property> - </bean> - - <bean name="WSNativeEndpointRecordProcessorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeEventingDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativeEventingDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">26</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> <property name="provides">PublishedContract</property> - </bean> - - <bean name="WSNativePublishContractDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativePublishContractDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">24</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeServiceEndpointInvokerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeRMDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativeRMDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">27</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> <property name="requires">ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> <property name="provides">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeUnifiedMetaDataDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect"> <property name="provides">JAXBIntros</property> - </bean> - - <bean name="WSJAXBIntroDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSJAXBIntroDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround --> </bean>