Author: richard.opalka(a)jboss.com Date: 2008-10-06 07:02:20 -0400 (Mon, 06 Oct 2008) New Revision: 8337 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/scripts/assembly-deploy-artifacts.xml Log: enable AS 5 integration layers Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2008-10-06 10:01:44 UTC (rev 8336) +++ stack/metro/trunk/modules/management/pom.xml 2008-10-06 11:02:20 UTC (rev 8337) @@ -45,7 +45,8 @@ <artifactId>jbossws-jboss424x</artifactId> <scope>runtime</scope> </dependency> - <!-- [JBWS-2263] + <!-- [JBWS-2263] --> + <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR2</artifactId> @@ -67,7 +68,8 @@ <artifactId>jbossws-jboss500x</artifactId> <classifier>container</classifier> <scope>runtime</scope> - </dependency> --> + </dependency> + <!-- END --> <dependency> <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> 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-10-06 10:01:44 UTC (rev 8336) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 11:02:20 UTC (rev 8337) @@ -197,7 +197,9 @@ <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> <!-- JBWS-2263 --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; --> + <!-- START --> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + <!-- END --> </fileset> </copy> </sequential> @@ -330,15 +332,19 @@ <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <!-- JBWS-2263 --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; --> + <!-- START --> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + <!-- END --> </fileset> </copy> <!-- JBWS-2263 --> - <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <!-- START --> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> <include name="**/jbossws-deployer-beans.xml"/> </fileset> - </copy> --> + </copy> + <!-- END --> </sequential> </macrodef> @@ -347,7 +353,8 @@ <!-- ================================================================== --> <!-- JBWS-2263 --> - <!-- <macrodef name="macro-deploy-jbossws-deploy50"> + <!-- START --> + <macrodef name="macro-deploy-jbossws-deploy50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> @@ -366,7 +373,8 @@ <delete file=&quot;@{targetdir}/jbossws-(a){jbossid}-container.jar&quot;/&gt; <delete dir="@{targetdir}/META-INF"/> </sequential> - </macrodef> --> + </macrodef> + <!-- END --> <!-- ================================================================== --> <!-- Deploy JBossWS --> @@ -392,7 +400,9 @@ <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}"/> <!-- JBWS-2263 --> - <!-- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> --> + <!-- START --> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <!-- END --> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> @@ -459,15 +469,17 @@ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> <!-- JBWS-2263 --> + <!-- START --> <!-- delete stale container integration jars --> - <!-- <delete> + <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> </fileset> <fileset dir="${jboss.home}/client"> <include name="jbossws-jboss*.jar"/> </fileset> - </delete> --> + </delete> + <!-- START --> <!-- delete content of last deployment --> <delete> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2008-10-06 10:01:44 UTC (rev 8336) +++ stack/metro/trunk/modules/server/pom.xml 2008-10-06 11:02:20 UTC (rev 8337) @@ -183,7 +183,7 @@ <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory> </artifactItem> <!-- JBWS-2263 --> - <!-- + <!-- START --> <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR2</artifactId> @@ -200,7 +200,7 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> </artifactItem> - --> + <!-- END --> </artifactItems> </configuration> </execution> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-10-06 10:01:44 UTC (rev 8336) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-10-06 11:02:20 UTC (rev 8337) @@ -431,11 +431,18 @@ <jbossws.integration.target>jboss500</jbossws.integration.target> </properties> <dependencies> + <!-- JBWS-2263 --> + <!-- START --> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500CR2</artifactId> + </dependency> + <!--dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency> + </dependency--> + <!-- END --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> @@ -487,11 +494,18 @@ <jbossws.integration.target>jboss501</jbossws.integration.target> </properties> <dependencies> + <!-- JBWS-2263 --> + <!-- START --> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500x</artifactId> + </dependency> + <!--dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency> + </dependency--> + <!-- END --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-10-06 10:01:44 UTC (rev 8336) +++ stack/metro/trunk/pom.xml 2008-10-06 11:02:20 UTC (rev 8337) @@ -52,10 +52,10 @@ <jbossws.jboss423.version>3.0.4-SNAPSHOT</jbossws.jboss423.version> <jbossws.jboss424.version>3.0.4-SNAPSHOT</jbossws.jboss424.version> <!-- JBWS-2263 --> - <!-- + <!-- START --> <jbossws.jboss500.version>3.0.4-SNAPSHOT</jbossws.jboss500.version> <jbossws.jboss501.version>3.0.4-SNAPSHOT</jbossws.jboss501.version> - --> + <!-- END --> <jboss.common.version>1.2.1.GA</jboss.common.version> <commons.logging.version>1.1.1</commons.logging.version> <jaxb.api.version>2.1</jaxb.api.version> @@ -133,7 +133,7 @@ <type>zip</type> </dependency> <!-- JBWS-2263 --> - <!-- + <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR2</artifactId> @@ -170,7 +170,7 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - --> + <!-- END --> <!-- provided apis --> <dependency> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-06 10:01:44 UTC (rev 8336) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-06 11:02:20 UTC (rev 8337) @@ -97,7 +97,8 @@ </includes> </dependencySet> <!-- JBWS-2263 --> - <!-- <dependencySet> + <!-- START --> + <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> @@ -137,7 +138,7 @@ <include>*:jbossws-jboss500x:jar:container</include> </includes> </dependencySet> - --> + <!-- END --> </dependencySets> </binaries> </moduleSet>