Author: richard.opalka(a)jboss.com Date: 2009-07-03 05:29:49 -0400 (Fri, 03 Jul 2009) New Revision: 10307 Modified: stack/metro/branches/ropalka/modules/server/pom.xml stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml Log: [JBWS-2332][JBWS-2382] refactoring - removing notion of CREATED,DESTROYED states, removing temporary Deployers integration hack (WIP) Modified: stack/metro/branches/ropalka/modules/server/pom.xml =================================================================== --- stack/metro/branches/ropalka/modules/server/pom.xml 2009-07-03 09:29:00 UTC (rev 10306) +++ stack/metro/branches/ropalka/modules/server/pom.xml 2009-07-03 09:29:49 UTC (rev 10307) @@ -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 Metro Runtime Server</name> + <name>JBoss Web Services - Metro Server</name> <artifactId>jbossws-metro-server</artifactId> <packaging>jar</packaging> Modified: stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java =================================================================== --- stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2009-07-03 09:29:00 UTC (rev 10306) +++ stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2009-07-03 09:29:49 UTC (rev 10307) @@ -45,7 +45,7 @@ { @Override @SuppressWarnings("unchecked") - public void create(Deployment dep) + public void start(Deployment dep) { DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class); if (ddEndpoints == null) @@ -78,7 +78,7 @@ } @Override - public void destroy(Deployment dep) + public void stop(Deployment dep) { DDEndpoints dd = dep.getAttachment(DDEndpoints.class); if (dd != null) Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml =================================================================== --- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-03 09:29:00 UTC (rev 10306) +++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-03 09:29:49 UTC (rev 10307) @@ -33,28 +33,12 @@ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry> </map> </property> - </bean> - - <bean name="WSMetroContextPropertiesDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSMetroContextPropertiesDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSMetroEndpointHandlerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround --> </bean> @@ -68,42 +52,18 @@ <inject bean="WSLogRecorder"/> </list> </property> - </bean> - - <bean name="WSMetroEndpointRecordProcessorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">StackDescriptor</property> - </bean> - - <bean name="WSMetroDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect"> <property name="requires">StackDescriptor</property> <property name="provides">RuntimeModel</property> - </bean> - - <bean name="WSRuntimeModelDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSRuntimeModelDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround --> </bean>