Author: richard.opalka(a)jboss.com Date: 2009-07-03 05:29:00 -0400 (Fri, 03 Jul 2009) New Revision: 10306 Modified: stack/cxf/branches/ropalka/modules/server/pom.xml stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml Log: [JBWS-2332][JBWS-2382] refactoring - removing notion of CREATED,STARTED states, removing temporary Deployers integration hack (WIP) Modified: stack/cxf/branches/ropalka/modules/server/pom.xml =================================================================== --- stack/cxf/branches/ropalka/modules/server/pom.xml 2009-07-03 09:26:59 UTC (rev 10305) +++ stack/cxf/branches/ropalka/modules/server/pom.xml 2009-07-03 09:29:00 UTC (rev 10306) @@ -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 CXF Runtime Server</name> + <name>JBoss Web Services - CXF Server</name> <artifactId>jbossws-cxf-server</artifactId> <packaging>jar</packaging> Modified: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2009-07-03 09:26:59 UTC (rev 10305) +++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2009-07-03 09:29:00 UTC (rev 10306) @@ -64,7 +64,7 @@ } @Override - public void create(Deployment dep) + public void start(Deployment dep) { URL cxfURL = getCXFConfigFromClassLoader(dep); if (cxfURL == null) @@ -79,7 +79,7 @@ } @Override - public void destroy(Deployment dep) + public void stop(Deployment dep) { DDBeans dd = dep.getAttachment(DDBeans.class); if (dd != null) Modified: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml =================================================================== --- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-03 09:26:59 UTC (rev 10305) +++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-03 09:29:00 UTC (rev 10306) @@ -24,7 +24,7 @@ <property name="recording">false</property> </bean> - <!-- The stack specific deployment aspects wrapped in deployers --> + <!-- The stack specific deployment aspects --> <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> <property name="provides">ContextProperties</property> <property name="contextProperties"> @@ -32,14 +32,6 @@ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry> </map> </property> - </bean> - - <bean name="WSCXFContextPropertiesDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSCXFContextPropertiesDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround --> </bean> @@ -48,28 +40,12 @@ <property name="provides">StackDescriptor</property> <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> - </bean> - - <bean name="WSCXFDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSCXFDescriptorDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround --> </bean> <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSCXFEndpointHandlerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> - </parameter> - </constructor> <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround --> </bean> @@ -77,6 +53,7 @@ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> <property name="requires">RegisteredEndpoint</property> <property name="provides">EndpointRecordProcessors</property> + <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround --> <property name="processors"> <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> <inject bean="WSMemoryBufferRecorder"/> @@ -85,13 +62,4 @@ </property> </bean> - <bean name="WSCXFEndpointRecordProcessorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer"> - <constructor> - <parameter> - <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/> - </parameter> - </constructor> - <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround --> - </bean> - </deployment>