[jbossws-commits] JBossWS SVN: r8344 - in stack/native/trunk: modules/core and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Oct 6 09:34:35 EDT 2008
Author: richard.opalka at jboss.com
Date: 2008-10-06 09:34:35 -0400 (Mon, 06 Oct 2008)
New Revision: 8344
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
enable AS 5 integration layers
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/modules/core/pom.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -210,8 +210,8 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
</artifactItem>
- <!-- JBWS-2263 -->
- <!--
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR2</artifactId>
@@ -228,7 +228,7 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
</artifactItem>
- -->
+ <!-- END -->
</artifactItems>
</configuration>
</execution>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/modules/management/pom.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -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>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -181,7 +181,9 @@
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2263 -->
- <!-- <include name="**/jbossws-@{jbossid}.jar"/> -->
+ <!-- START -->
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ <!-- END -->
</fileset>
</copy>
</sequential>
@@ -322,15 +324,19 @@
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2263] -->
- <!--include name="**/jbossws-@{jbossid}.jar"/--> <!-- see #1 below -->
+ <!-- START -->
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ <!-- 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"/>
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
- </copy-->
+ </copy>
+ <!-- END -->
</sequential>
</macrodef>
@@ -339,7 +345,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"/>
@@ -351,14 +358,15 @@
</copy>
<unzip dest="@{targetdir}" src="@{targetdir}/jbossws-@{jbossid}-container.jar">
<patternset>
- <include name="META-INF/jbossws-container-beans.xml"/>
+ <include name="META-INF/jbossws-container-jboss-beans.xml"/>
</patternset>
</unzip>
- <move file="@{targetdir}/META-INF/jbossws-container-beans.xml" tofile="@{targetdir}/jbossws-container-beans.xml"/>
+ <move file="@{targetdir}/META-INF/jbossws-container-jboss-beans.xml" tofile="@{targetdir}/jbossws-container-jboss-beans.xml"/>
<delete file="@{targetdir}/jbossws-@{jbossid}-container.jar"/>
<delete dir="@{targetdir}/META-INF"/>
</sequential>
- </macrodef-->
+ </macrodef>
+ <!-- END -->
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
@@ -384,7 +392,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>
@@ -451,15 +461,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/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -410,11 +410,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>
@@ -471,11 +478,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/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/pom.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -55,11 +55,11 @@
<jbossws.jboss422.version>3.0.4-SNAPSHOT</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.4-SNAPSHOT</jbossws.jboss423.version>
<jbossws.jboss424.version>3.0.4-SNAPSHOT</jbossws.jboss424.version>
- <!-- JBWS-2263 -->
- <!--
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<jbossws.jboss500.version>3.0.4-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.4-SNAPSHOT</jbossws.jboss501.version>
- -->
+ <!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.6.0.GA</javassist.version>
@@ -144,8 +144,8 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2263 -->
- <!--
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR2</artifactId>
@@ -182,7 +182,7 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
+ <!-- END -->
<!-- provided apis -->
<dependency>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -106,7 +106,9 @@
<include>*:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
- <!--dependencySet>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
+ <dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
@@ -145,7 +147,8 @@
<includes>
<include>*:jbossws-jboss500x:jar:container</include>
</includes>
- </dependencySet-->
+ </dependencySet>
+ <!-- END -->
</dependencySets>
</binaries>
</moduleSet>
More information about the jbossws-commits
mailing list