Author: richard.opalka(a)jboss.com Date: 2008-12-08 05:56:15 -0500 (Mon, 08 Dec 2008) New Revision: 8835 Modified: stack/metro/trunk/modules/management/pom.xml stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/pom.xml stack/metro/trunk/src/main/distro/build-deploy.xml stack/metro/trunk/src/main/distro/build-setup.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: switch Metro to new AS container integrations Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2008-12-05 19:09:21 UTC (rev 8834) +++ stack/metro/trunk/modules/management/pom.xml 2008-12-08 10:56:15 UTC (rev 8835) @@ -49,12 +49,12 @@ <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR2</artifactId> + <artifactId>jbossws-jboss500</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500x</artifactId> + <artifactId>jbossws-jboss501CR1</artifactId> <scope>runtime</scope> </dependency> <!-- END --> Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-05 19:09:21 UTC (rev 8834) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-08 10:56:15 UTC (rev 8835) @@ -372,20 +372,10 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - <target name="deploy-jbossws-metro500" depends="check-parameters,deploy-jbossws-endorsed"> + <target name="deploy-jbossws-metro50" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> - </target> - - <target name="deploy-jbossws-metro501" depends="check-parameters,deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! --> <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2008-12-05 19:09:21 UTC (rev 8834) +++ stack/metro/trunk/modules/server/pom.xml 2008-12-08 10:56:15 UTC (rev 8835) @@ -186,7 +186,7 @@ <!-- START --> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR2</artifactId> + <artifactId>jbossws-jboss500</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> <type>zip</type> @@ -194,7 +194,7 @@ </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500x</artifactId> + <artifactId>jbossws-jboss501CR1</artifactId> <version>${jbossws.jboss501.version}</version> <classifier>resources</classifier> <type>zip</type> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-12-05 19:09:21 UTC (rev 8834) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-12-08 10:56:15 UTC (rev 8835) @@ -25,6 +25,7 @@ <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> <endpoint.servlet>org.jboss.wsf.stack.metro.EndpointServlet</endpoint.servlet> + <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> </properties> <!-- Modules --> @@ -433,7 +434,7 @@ <profile> <id>jboss500</id> <properties> - <jboss.version>5.0.0.CR2</jboss.version> + <jboss.version>5.0.0.GA</jboss.version> <jbossws.integration.target>jboss500</jbossws.integration.target> </properties> <dependencies> @@ -441,7 +442,7 @@ <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR2</artifactId> + <artifactId>jbossws-jboss500</artifactId> </dependency> <!--dependency> <groupId>org.jboss.jbossas</groupId> @@ -458,11 +459,17 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.javaee</groupId> <artifactId>jboss-javaee</artifactId> - <version>${jboss.version}</version> + <version>${jboss.javaee.version}</version> </dependency> </dependencies> <build> @@ -481,7 +488,7 @@ <!-- TODO: replace with maven dependencies --> <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/server/default/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> @@ -496,7 +503,7 @@ <profile> <id>jboss501</id> <properties> - <jboss.version>5.0.0-SNAPSHOT</jboss.version> + <jboss.version>5.0.1-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss501</jbossws.integration.target> </properties> <dependencies> @@ -504,7 +511,7 @@ <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500x</artifactId> + <artifactId>jbossws-jboss501CR1</artifactId> </dependency> <!--dependency> <groupId>org.jboss.jbossas</groupId> @@ -521,11 +528,17 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.javaee</groupId> <artifactId>jboss-javaee</artifactId> - <version>${jboss.version}</version> + <version>${jboss.javaee.version}</version> </dependency> </dependencies> <build> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-12-05 19:09:21 UTC (rev 8834) +++ stack/metro/trunk/pom.xml 2008-12-08 10:56:15 UTC (rev 8835) @@ -138,28 +138,28 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - <!-- JBWS-2263 --> - <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR2</artifactId> + <artifactId>jbossws-jboss500</artifactId> <version>${jbossws.jboss500.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR2</artifactId> + <artifactId>jbossws-jboss500</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> + <!-- JBWS-2263 --> + <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500x</artifactId> + <artifactId>jbossws-jboss501CR1</artifactId> <version>${jbossws.jboss501.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500x</artifactId> + <artifactId>jbossws-jboss501CR1</artifactId> <version>${jbossws.jboss501.version}</version> <classifier>resources</classifier> <type>zip</type> Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-12-05 19:09:21 UTC (rev 8834) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-12-08 10:56:15 UTC (rev 8835) @@ -102,9 +102,9 @@ <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss500" depends="prepare-deploy"> + <target name="deploy-structure-jboss50" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-metro500" inheritall="false"> + <antcall target="deploy-jbossws-metro50" inheritall="false"> <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> @@ -113,17 +113,6 @@ <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> - <target name="deploy-structure-jboss501" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-metro501" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - </target> - <!-- ================================================================== --> <!-- Deployment JBoss500 --> <!-- ================================================================== --> @@ -135,7 +124,7 @@ <echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/> </target> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500"> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <copy todir="${jboss500.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -145,7 +134,7 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> </target> <!-- ================================================================== --> @@ -159,7 +148,7 @@ <echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/> </target> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss501" description="Deploy jbossws to jboss501"> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <copy todir="${jboss501.home}" overwrite="true"> <fileset dir="${deploy.structure}"/> @@ -169,7 +158,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> <!-- Using AS5 default deploy.conf --> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> </target> <!-- ================================================================== --> Modified: stack/metro/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-setup.xml 2008-12-05 19:09:21 UTC (rev 8834) +++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-12-08 10:56:15 UTC (rev 8835) @@ -41,7 +41,7 @@ <property name="jboss500.lib" value="${jboss500.home}/lib"/> <property name="jboss500.client" value="${jboss500.home}/client"/> <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/> <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-05 19:09:21 UTC (rev 8834) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-08 10:56:15 UTC (rev 8835) @@ -81,6 +81,7 @@ <include>org.jboss.ws:jbossws-framework:jar</include> <include>org.jboss.ws:jbossws-jboss422:jar</include> <include>org.jboss.ws:jbossws-jboss423:jar</include> + <include>org.jboss.ws:jbossws-jboss500:jar</include> <include>org.jboss.jaxr:juddi-service:sar</include> <include>apache-scout:scout:jar</include> <include>apache-xmlbeans:xmlbeans:jar</include> @@ -101,22 +102,12 @@ <!-- START --> <dependencySet> <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss500CR2:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss500x:jar</include> + <include>org.jboss.ws:jbossws-jboss501CR1:jar</include> </includes> </dependencySet> <!-- END -->