Author: richard.opalka(a)jboss.com Date: 2009-02-13 15:14:18 -0500 (Fri, 13 Feb 2009) New Revision: 9297 Modified: stack/native/trunk/build.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.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/profiles.xml.example stack/native/trunk/src/main/distro/ant.properties.example stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/build-setup.xml stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2505] don't deploy AS integration layer Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/build.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -59,10 +59,13 @@ </condition> <condition property="jboss424.home" value="${profiles.profile.properties.jboss424.home}"> <isset property="profiles.profile.properties.jboss424.home"/> - </condition> + </condition> <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}"> <isset property="profiles.profile.properties.jboss500.home"/> </condition> + <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}"> + <isset property="profiles.profile.properties.jboss501.home"/> + </condition> <condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}"> <isset property="profiles.profile.properties.jboss510.home"/> </condition> @@ -76,6 +79,7 @@ <property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/> <property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/> <property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/> + <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/> <property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/> <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/> @@ -84,6 +88,7 @@ <echo message="jboss423.home=${jboss423.home}"/> <echo message="jboss424.home=${jboss424.home}"/> <echo message="jboss500.home=${jboss500.home}"/> + <echo message="jboss501.home=${jboss501.home}"/> <echo message="jboss510.home=${jboss510.home}"/> <echo message="jboss600.home=${jboss600.home}"/> </target> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/core/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -223,10 +223,19 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> </artifactItem> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <artifactItem> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501x</artifactId> + <version>${jbossws.jboss501.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510x</artifactId> <version>${jbossws.jboss510.version}</version> <classifier>resources</classifier> @@ -241,6 +250,7 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> </artifactItem> + --> <!-- END --> </artifactItems> </configuration> Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -73,6 +73,16 @@ &lt;/deployment&gt; </footer> </concat> + <!-- Concat jbossws-jboss501/jbossws.beans --> + <echo message="Concat jbossws-jboss501/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + <!-- Concat jbossws-jboss510/jbossws.beans --> <echo message="Concat jbossws-jboss510/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml"> @@ -82,7 +92,7 @@ <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> - + <!-- Concat jbossws-jboss600/jbossws.beans --> <echo message="Concat jbossws-jboss600/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml"> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/management/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -50,10 +50,16 @@ <artifactId>jbossws-jboss500</artifactId> <scope>runtime</scope> </dependency> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501x</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510x</artifactId> <scope>runtime</scope> </dependency> @@ -62,6 +68,7 @@ <artifactId>jbossws-jboss600x</artifactId> <scope>runtime</scope> </dependency> + --> <!-- END --> <dependency> <groupId>org.jboss.jaxr</groupId> 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 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -199,6 +199,21 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-client500"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + </sequential> + </macrodef> + <macrodef name="macro-deploy-jbossws-client50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -208,9 +223,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> - <!-- JBWS-2263 --> + <!-- JBWS-2505 --> <!-- START --> + <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> <!-- END --> </fileset> </copy> @@ -226,9 +243,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> - <!-- JBWS-2263 --> + <!-- JBWS-2505 --> <!-- START --> + <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> <!-- END --> </fileset> </copy> @@ -244,9 +263,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> - <!-- JBWS-2263 --> + <!-- JBWS-2505 --> <!-- START --> + <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> <!-- END --> </fileset> </copy> @@ -425,6 +446,43 @@ <!-- Deploy Deployers --> <!-- ================================================================== --> + <macrodef name="macro-deploy-jbossws-deployers500"> + <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + </fileset> + </copy> + <copy todir="@{targetdir}"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{artifactsdir}/resources"> + <include name="standard-*-config.xml"/> + </fileset> + </copy> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <include name="**/jbossws-deployer-jboss-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + <macrodef name="macro-deploy-jbossws-deployers50"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -451,19 +509,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> <!-- END --> </fileset> </copy> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> <include name="**/jbossws-deployer-jboss-beans.xml"/> </fileset> </copy> + --> <!-- END --> </sequential> </macrodef> @@ -494,19 +556,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> <!-- END --> </fileset> </copy> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> <include name="**/jbossws-deployer-jboss-beans.xml"/> </fileset> </copy> + --> <!-- END --> </sequential> </macrodef> @@ -537,19 +603,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + --> <!-- END --> </fileset> </copy> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> <include name="**/jbossws-deployer-jboss-beans.xml"/> </fileset> </copy> + --> <!-- END --> </sequential> </macrodef> @@ -569,6 +639,17 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-native500" depends="check-parameters"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client500 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" 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-deployers500 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-native50" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -652,6 +733,42 @@ </sequential> </macrodef> + <macrodef name="macro-undeploy-jbossws500"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + + <!-- delete stale container integration jars --> + <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 content of last deployment --> + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + + <!-- delete jbossws.sar --> + <delete dir="@{targetdir}"/> + + <!-- delete juddi-service.sar --> + <delete dir="@{targetdir}/../juddi-service.sar"/> + + </sequential> + </macrodef> + <macrodef name="macro-undeploy-jbossws50"> <attribute name="defaultconf"/> <attribute name="targetdir"/> @@ -664,9 +781,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> + <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -675,6 +793,7 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> + --> <!-- END --> <!-- delete content of last deployment --> @@ -703,9 +822,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> + <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -714,6 +834,7 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> + --> <!-- END --> <!-- delete content of last deployment --> @@ -742,9 +863,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> + <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -753,6 +875,7 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> + --> <!-- END --> <!-- delete content of last deployment --> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -406,8 +406,6 @@ <jbossws.integration.target>jboss500</jbossws.integration.target> </properties> <dependencies> - <!-- [JBWS-2263] --> - <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> @@ -418,11 +416,97 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <version>${hibernate.version}</version> + </dependency> + <dependency> + <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.jbossas</groupId> + <artifactId>jboss-as-security</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>${jboss.javaee.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> + <!-- TODO: replace with maven dependencies --> + <additionalClasspathElements> + <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> + </additionalClasspathElements> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: jboss501 + Descr: JBoss-5.0.1 specific options + --> + <profile> + <id>jboss501</id> + <properties> + <jboss.version>5.0.1-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss501</jbossws.integration.target> + </properties> + <dependencies> + <!-- [JBWS-2505] --> + <!-- START --> <!--dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501x</artifactId> + <exclusions> + <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + </exclusions> + </dependency--> + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + <exclusions> + <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + </exclusions> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- END --> <dependency> <groupId>org.hibernate</groupId> @@ -457,13 +541,13 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> <!-- TODO: replace with maven dependencies --> <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> @@ -486,23 +570,35 @@ <jbossws.integration.target>jboss510</jbossws.integration.target> </properties> <dependencies> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> - <dependency> + <!--dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510x</artifactId> <exclusions> - <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> + <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> </exclusions> - </dependency> - <!--dependency> + </dependency--> + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + <exclusions> + <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + </exclusions> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- END --> <dependency> <groupId>org.hibernate</groupId> @@ -566,23 +662,35 @@ <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> - <dependency> + <!--dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> <exclusions> - <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> + <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> </exclusions> - </dependency> - <!--dependency> + </dependency--> + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + <exclusions> + <exclusion> <!-- Exclude old jaxws impl transitive dependency brought in by jboss-metadata --> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + </exclusions> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- END --> <dependency> <groupId>org.hibernate</groupId> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -55,10 +55,13 @@ <jbossws.jboss423.version>3.1.0-SNAPSHOT</jbossws.jboss423.version> <jbossws.jboss424.version>3.1.0-SNAPSHOT</jbossws.jboss424.version> <jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- + <jbossws.jboss501.version>3.1.0-SNAPSHOT</jbossws.jboss501.version> <jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version> <jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version> + --> <!-- END --> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -156,10 +159,23 @@ <classifier>resources</classifier> <type>zip</type> </dependency> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501x</artifactId> + <version>${jbossws.jboss501.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501x</artifactId> + <version>${jbossws.jboss501.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510x</artifactId> <version>${jbossws.jboss510.version}</version> </dependency> @@ -182,6 +198,7 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + --> <!-- END --> <!-- provided apis --> <dependency> @@ -515,6 +532,18 @@ </profile> <!-- + Name: jboss501 + Descr: JBoss-5.0.1 specific options + --> + <profile> + <id>jboss501</id> + <properties> + <jbossws.integration.target>jboss501</jbossws.integration.target> + <jboss.home>${jboss501.home}</jboss.home> + </properties> + </profile> + + <!-- Name: jboss510 Descr: JBoss-5.1.0 specific options --> Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/profiles.xml.example 2009-02-13 20:14:18 UTC (rev 9297) @@ -1,7 +1,7 @@ <profilesXml xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> <profiles> - + <!-- This profile can also be defined in ~/.m2/settings.xml --> <profile> <id>jboss-home-profile</id> @@ -12,14 +12,15 @@ </activation> <properties> <java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home> - <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> - <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> - <jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> - <jboss510.home>/home/tdiesler/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home> - <jboss600.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home> + <jboss422.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss424.home>/home/opalka/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home> + <jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> + <jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home> + <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home> + <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home> </properties> </profile> - + </profiles> </profilesXml> Modified: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/distro/ant.properties.example 2009-02-13 20:14:18 UTC (rev 9297) @@ -7,10 +7,11 @@ jboss423.home=(a)jboss423.home@ jboss424.home=(a)jboss424.home@ jboss500.home=(a)jboss500.home@ +jboss501.home=(a)jboss501.home@ jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss510|jboss600] +# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510|jboss600] jbossws.integration.target=jboss500 # The JBoss settings Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -96,6 +96,17 @@ <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> + <target name="deploy-structure-jboss500" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-native500" 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> + <target name="deploy-structure-jboss50" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <antcall target="deploy-jbossws-native50" inheritall="false"> @@ -116,7 +127,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" 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}"/> @@ -126,10 +137,32 @@ <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.as5.default.deploy.conf}"/> + <macro-undeploy-jbossws500 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> </target> <!-- ================================================================== --> + <!-- Deployment JBoss501 --> + <!-- ================================================================== --> + + <target name="target-jboss501"> + <property name="jbossws.integration.target" value="jboss501"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <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}"/> + </copy> + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <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}"/> + </target> + + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-5.1.x --> <!-- ================================================================== --> @@ -172,7 +205,7 @@ <target name="deploy-structure-jboss60" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native51" inheritall="false"> + <antcall target="deploy-jbossws-native60" 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}"/> @@ -200,7 +233,7 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws51 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> </target> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/distro/build-setup.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -46,6 +46,13 @@ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + <property name="jboss510.lib" value="${jboss510.home}/lib"/> <property name="jboss510.client" value="${jboss510.home}/client"/> <property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/> @@ -64,6 +71,7 @@ <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> <property name="jboss424.available.file" value="${jboss424.client}/jboss-client.jar"/> <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> <property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/> <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> @@ -71,6 +79,7 @@ <available property="jboss423.available" file="${jboss423.available.file}"/> <available property="jboss424.available" file="${jboss424.available.file}"/> <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> <available property="jboss510.available" file="${jboss510.available.file}"/> <available property="jboss600.available" file="${jboss600.available.file}"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/distro/build.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -56,6 +56,7 @@ <condition property="jbossws.integration.jboss50" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> </or> </condition> <condition property="jbossws.integration.jboss51" value="true"> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -100,10 +100,21 @@ <include>org.jboss.ws:jbossws-jboss424x:jar</include> </includes> </dependencySet> - <!-- [JBWS-2263] --> + <!-- [JBWS-2505] --> <!-- START --> + <!-- <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-jboss501x:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -122,6 +133,7 @@ <include>org.jboss.ws:jbossws-jboss600x:jar</include> </includes> </dependencySet> + --> <!-- END --> </dependencySets> </binaries>