[jbossws-commits] JBossWS SVN: r8338 - in stack/cxf/trunk: modules/management and 4 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-10-06 07:50:27 -0400 (Mon, 06 Oct 2008) New Revision: 8338 Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: enable AS 5 integration layers Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2008-10-06 11:02:20 UTC (rev 8337) +++ stack/cxf/trunk/modules/management/pom.xml 2008-10-06 11:50:27 UTC (rev 8338) @@ -46,7 +46,8 @@ <scope>runtime</scope> </dependency> <!-- [JBWS-2263] --> - <!--dependency> + <!-- START --> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR2</artifactId> <scope>runtime</scope> @@ -67,7 +68,8 @@ <artifactId>jbossws-jboss500x</artifactId> <classifier>container</classifier> <scope>runtime</scope> - </dependency--> + </dependency> + <!-- END --> <dependency> <groupId>jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 11:02:20 UTC (rev 8337) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 11:50:27 UTC (rev 8338) @@ -187,7 +187,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> @@ -306,15 +308,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> @@ -323,7 +329,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"/> @@ -342,7 +349,8 @@ <delete file=&quot;@{targetdir}/jbossws-(a){jbossid}-container.jar&quot;/&gt; <delete dir="@{targetdir}/META-INF"/> </sequential> - </macrodef--> + </macrodef> + <!-- END --> <!-- ================================================================== --> <!-- Deploy JBossWS --> @@ -367,7 +375,9 @@ <macro-deploy-jbossws-cxf50-sar 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 --> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> @@ -430,15 +440,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> + <!-- END --> <!-- delete content of last deployment --> <delete> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2008-10-06 11:02:20 UTC (rev 8337) +++ stack/cxf/trunk/modules/server/pom.xml 2008-10-06 11:50:27 UTC (rev 8338) @@ -190,7 +190,7 @@ <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory> </artifactItem> <!-- JBWS-2263 --> - <!-- + <!-- START --> <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR2</artifactId> @@ -207,7 +207,7 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> </artifactItem> - --> + <!-- END --> </artifactItems> </configuration> </execution> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-10-06 11:02:20 UTC (rev 8337) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-10-06 11:50:27 UTC (rev 8338) @@ -376,11 +376,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.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> @@ -427,11 +434,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.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-10-06 11:02:20 UTC (rev 8337) +++ stack/cxf/trunk/pom.xml 2008-10-06 11:50:27 UTC (rev 8338) @@ -51,10 +51,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 --> <cxf.version>2.1</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <fastinfoset.api.version>1.2.2</fastinfoset.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/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-06 11:02:20 UTC (rev 8337) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-06 11:50:27 UTC (rev 8338) @@ -93,7 +93,8 @@ </includes> </dependencySet> <!-- [JBWS-2263] --> - <!--dependencySet> + <!-- START --> + <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> @@ -132,7 +133,8 @@ <includes> <include>*:jbossws-jboss500x:jar:container</include> </includes> - </dependencySet--> + </dependencySet> + <!-- END --> </dependencySets> </binaries> </moduleSet>