Author: heiko.braun(a)jboss.com Date: 2008-04-17 14:53:32 -0400 (Thu, 17 Apr 2008) New Revision: 6475 Modified: stack/metro/trunk/ant-import/build-prepare-deploy.xml stack/metro/trunk/ant-import/build-setup.xml stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/ant-import/jbossws-deploy-macros.xml stack/metro/trunk/build.xml stack/metro/trunk/metro-trunk.iml stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java stack/metro/trunk/src/main/resources/jbossws-metro-config.xml stack/metro/trunk/version.properties Log: Moving to SPI 3 Milestone 1 Modified: stack/metro/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-04-17 18:53:32 UTC (rev 6475) @@ -30,6 +30,9 @@ <patternset refid="jbossws.server.lib.patternset"/> <patternset refid="jbossws.service.lib.patternset"/> <include name="juddi-service.sar"/> + <include name="jbossws-jboss50-container.jar"/> + <include name="jbossws-jboss42.jar"/> + <include name="jbossws-jboss50.jar"/> </fileset> <fileset dir="${metro.output.lib.dir}"> <patternset refid="jbossws.client.patternset"/> @@ -46,6 +49,7 @@ <include name="jbossws-metro50-beans.xml"/> <include name="jbossws-jboss42.sar/**"/> <include name="jbossws-metro.sar/**"/> + <include name="jbossws-deployer-beans.xml"/> </fileset> </copy> </target> Modified: stack/metro/trunk/ant-import/build-setup.xml =================================================================== --- stack/metro/trunk/ant-import/build-setup.xml 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/ant-import/build-setup.xml 2008-04-17 18:53:32 UTC (rev 6475) @@ -61,7 +61,28 @@ <available property="jboss423.available" file="${jboss423.available.file}"/> <available property="jboss500.available" file="${jboss500.available.file}"/> <available property="jboss501.available" file="${jboss501.available.file}"/> - + + <condition property="jbossws.integration.jboss421" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + </condition> + + <condition property="jbossws.integration.jboss422" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + + <condition property="jbossws.integration.jboss423" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </condition> + + <condition property="jbossws.integration.jboss500" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + + <condition property="jbossws.integration.jboss501" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </condition> + + <condition property="jbossws.integration.jboss42" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-17 18:53:32 UTC (rev 6475) @@ -51,14 +51,37 @@ <!-- thirdpartry-get --> - <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get" description="Gets the thirdparty libraries"> + + <target name="get422-jars" if="jbossws.integration.jboss422"> + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + </target> + + <target name="get423-jars" if="jbossws.integration.jboss423"> + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + </target> + + <target name="get501-jars" if="jbossws.integration.jboss501"> + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-src.zip" dest="${thirdparty.dir}/jbossws-jboss50-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-container.jar" dest="${thirdparty.dir}/jbossws-jboss50-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/> + </target> + + <target name="thirdparty-get" depends="thirdparty-delete, get422-jars, get423-jars, get501-jars" + if="force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-17 18:53:32 UTC (rev 6475) @@ -152,7 +152,48 @@ </copy> </sequential> </macrodef> - + + <!-- ================================================================== --> + <!-- Deploy Deployers --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-jboss50.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-deployer-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deploy --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deploy50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-jboss50-container.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> @@ -186,7 +227,20 @@ </copy> </sequential> </macrodef> - + + <macrodef name="macro-deploy-jbossws-client42"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-jboss42.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Server Lib --> <!-- ================================================================== --> @@ -203,7 +257,21 @@ </copy> </sequential> </macrodef> - + + <macrodef name="macro-deploy-jbossws-server-lib42"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-jboss42.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> @@ -274,16 +342,20 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> </target> <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/build.xml 2008-04-17 18:53:32 UTC (rev 6475) @@ -99,33 +99,44 @@ </target> <!-- Compile resource files --> - <target name="compile-resources" depends="init"> - - <!-- Concat jbossws-metro50-beans.xml --> - <mkdir dir="${metro.output.resources.dir}"/> - <concat destfile="${metro.output.resources.dir}/jbossws-metro50-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; - </header> - <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Concat jboss-beans.xml --> - <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - <concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; - </header> - <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> - <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - + + <!-- Compile resource files --> + <target name="compile42-resources" if="jbossws.integration.jboss42"> + <mkdir dir="${metro.output.resources.dir}"/> + <!-- Concat jboss-beans.xml --> + <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> + <concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; + </header> + <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> + <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + + </target> + + + <target name="compile50-resources" if="jbossws.integration.jboss50"> + <mkdir dir="${metro.output.resources.dir}"/> + <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${metro.output.resources.dir}"/> + + <!-- Concat jbossws-native50-beans.xml --> + <concat destfile="${metro.output.resources.dir}/jbossws-metro50-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; + </header> + <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + </target> + + <target name="compile-resources" depends="init, compile42-resources, compile50-resources"> + <copy todir="${metro.output.resources.dir}"> <fileset dir="${metro.resources.dir}"> <include name="jbossws-metro.jar/**"/> Modified: stack/metro/trunk/metro-trunk.iml =================================================================== --- stack/metro/trunk/metro-trunk.iml 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/metro-trunk.iml 2008-04-17 18:53:32 UTC (rev 6475) @@ -32,15 +32,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-ri-src.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/sjsxp.jar!/" /> </CLASSES> <JAVADOC /> @@ -68,15 +59,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/servlet-api.jar!/" /> </CLASSES> <JAVADOC /> @@ -257,15 +239,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-framework.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/http.jar!/" /> </CLASSES> <JAVADOC /> @@ -275,21 +248,14 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../framework/trunk/thirdparty/dom4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="framework" /> + <orderEntry type="module" module-name="spi" /> <orderEntryProperties /> </component> </module> Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-04-17 18:53:32 UTC (rev 6475) @@ -26,6 +26,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.WSFRuntime; import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint; import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints; import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect; @@ -44,7 +45,7 @@ public class SunJaxwsDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void create(Deployment dep, WSFRuntime runtime) { DDEndpoints dd = dep.getAttachment(DDEndpoints.class); @@ -87,7 +88,7 @@ } @Override - public void destroy(Deployment dep) + public void destroy(Deployment dep, WSFRuntime runtime) { DDEndpoints dd = dep.getAttachment(DDEndpoints.class); if (dd != null) Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-04-17 18:53:32 UTC (rev 6475) @@ -34,6 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.WSFRuntime; import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt; import org.jboss.wsf.stack.metro.DeploymentDescriptorParserJBWS; import org.jboss.wsf.stack.metro.FakeServletContext; @@ -72,7 +73,7 @@ public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url"; - public void create(Deployment deployment) + public void start(Deployment deployment, WSFRuntime runtime) { ClassLoader runtimeLoader = deployment.getRuntimeClassLoader(); if(null == runtimeLoader) Modified: stack/metro/trunk/src/main/resources/jbossws-metro-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-04-17 18:53:32 UTC (rev 6475) @@ -23,11 +23,6 @@ <property name="webServicePort">8080</property> --> </bean> - - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> <!-- Logging redirector --> <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> @@ -46,7 +41,8 @@ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> <property name="recording">false</property> </bean> - + + <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.metro.RequestHandlerFactoryImpl"/> <!-- The stack specific deployment aspects --> @@ -86,44 +82,35 @@ <property name="provides">RuntimeModel</property> </bean> <!-- Deployment aspect installers --> - - <!-- Phase 1 --> - <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + + <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSMetroContextPropertiesDeploymentAspect"/> <inject bean="WSMetroDescriptorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPreJSE</depends> - </bean> - - <!-- Phase 2 --> - <bean name="WSMetroDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <!-- phase 2 --> <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> <inject bean="WSRuntimeModelDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerPostJSE</depends> + <depends>WSDeploymentAspectInstallerJSE</depends> </bean> + <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSMetroContextPropertiesDeploymentAspect"/> - <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> - <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSMetroDescriptorDeploymentAspect"/> - <inject bean="WSRuntimeModelDeploymentAspect"/> + <inject bean="WSMetroDescriptorDeploymentAspect"/> + <!-- phase 2 --> + <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> + <inject bean="WSRuntimeModelDeploymentAspect"/> </set> </property> <depends>WSDeploymentAspectInstallerEJB</depends> Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-04-17 18:12:18 UTC (rev 6474) +++ stack/metro/trunk/version.properties 2008-04-17 18:53:32 UTC (rev 6475) @@ -13,12 +13,15 @@ implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org -# Thirdparty library versions -jbossws-spi=1.0.2.GA +# Dependend integration projects +jbossws-spi=3.0.0-SNAPSHOT jbossws-common=snapshot -jbossws-framework=snapshot -jbossws-jboss42=4.2.1.GA +jbossws-framework=3.0.2-SNAPSHOT +jbossws-jboss422=4.2.2.DEV +jbossws-jboss423=4.2.3.DEV +jbossws-jboss501=5.0.1.DEV + junit=3.8.1 jboss-common-core=2.0.2.GA jboss-common-logging-spi=2.0.2.GA