[jbossws-commits] JBossWS SVN: r8996 - in stack/native/trunk: modules/core and 7 other directories.

Author: alessio.soldano(a)jboss.com Date: 2009-01-08 12:47:12 -0500 (Thu, 08 Jan 2009) New Revision: 8996 Removed: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 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/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/profiles.xml.example stack/native/trunk/src/main/distro/Install.txt 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: [JJBWS-2444] Updating for AS 6 Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/build.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -63,12 +63,12 @@ <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> + <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}"> + <isset property="profiles.profile.properties.jboss600.home"/> + </condition> <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> @@ -76,16 +76,16 @@ <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}"/> <echo/> <echo message="jboss422.home=${jboss422.home}"/> <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="jboss501.home=${jboss510.home}"/> + <echo message="jboss510.home=${jboss510.home}"/> + <echo message="jboss600.home=${jboss600.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/modules/core/pom.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -221,19 +221,19 @@ <!-- START --> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501CR1</artifactId> - <version>${jbossws.jboss501.version}</version> + <artifactId>jbossws-jboss510x</artifactId> + <version>${jbossws.jboss510.version}</version> <classifier>resources</classifier> <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> - <version>${jbossws.jboss510.version}</version> + <artifactId>jbossws-jboss600x</artifactId> + <version>${jbossws.jboss600.version}</version> <classifier>resources</classifier> <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> </artifactItem> <!-- END --> </artifactItems> 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-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -73,19 +73,19 @@ &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"> + <!-- 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"> <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"> + + <!-- 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"> <header trimleading="yes"> &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/modules/management/pom.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -54,12 +54,12 @@ <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501CR1</artifactId> + <artifactId>jbossws-jboss510x</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> + <artifactId>jbossws-jboss600x</artifactId> <scope>runtime</scope> </dependency> <!-- END --> 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-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -148,6 +148,21 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-lib60"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> @@ -220,6 +235,24 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-client60"> + <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"/> + <!-- JBWS-2263 --> + <!-- START --> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + <!-- END --> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Server Lib --> <!-- ================================================================== --> @@ -267,6 +300,20 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-server-lib60"> + <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.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy JUDDI Service --> <!-- ================================================================== --> @@ -359,6 +406,21 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-sar60"> + <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-native-management.war"/> + </fileset> + </unzip> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Deployers --> <!-- ================================================================== --> @@ -449,6 +511,49 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-deployers60"> + <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"/> + <!-- [JBWS-2263] --> + <!-- START --> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + <!-- END --> + </fileset> + </copy> + <!-- [JBWS-2263] --> + <!-- 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> + <!-- ================================================================== --> <!-- Deploy JBossWS --> <!-- ================================================================== --> @@ -485,6 +590,17 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-native60" depends="check-parameters"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib60 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib60 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! --> + <macro-deploy-jbossws-sar60 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers60 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="check-parameters"> <fail message="artifactsdir must be specified" unless="artifactsdir"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> @@ -609,4 +725,43 @@ </sequential> </macrodef> + <macrodef name="macro-undeploy-jbossws60"> + <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"/> + + <!-- [JBWS-2263] --> + <!-- START --> + <!-- 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> + <!-- END --> + + <!-- 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> + </project> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2009-01-08 17:47:12 UTC (rev 8996) @@ -39,7 +39,7 @@ { public static Test suite() { - String newspaperJar = new JBossWSTestHelper().isTargetJBoss5() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar"; + String newspaperJar = new JBossWSTestHelper().isTargetJBoss5OrGreater() ? "jaxws-samples-news-step2-newspaper-as5.jar" : "jaxws-samples-news-step2-newspaper.jar"; return new JBossWSTestSetup ( SecureNewsTestCase.class, Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -470,21 +470,21 @@ </profile> <!-- - Name: jboss501 - Descr: JBoss-5.0.1 specific options + Name: jboss510 + Descr: JBoss-5.1.0 specific options --> <profile> - <id>jboss501</id> + <id>jboss510</id> <properties> - <jboss.version>5.0.1-SNAPSHOT</jboss.version> - <jbossws.integration.target>jboss501</jbossws.integration.target> + <jboss.version>5.1.0-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss510</jbossws.integration.target> </properties> <dependencies> <!-- [JBWS-2263] --> <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501CR1</artifactId> + <artifactId>jbossws-jboss510x</artifactId> </dependency> <!--dependency> <groupId>org.jboss.jbossas</groupId> @@ -525,13 +525,13 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine> <!-- TODO: replace with maven dependencies --> <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> @@ -544,21 +544,21 @@ </profile> <!-- - Name: jboss510 - Descr: JBoss-5.1.0 specific options + Name: jboss600 + Descr: JBoss-6.0.0 specific options --> <profile> - <id>jboss510</id> + <id>jboss600</id> <properties> - <jboss.version>5.1.0-SNAPSHOT</jboss.version> - <jbossws.integration.target>jboss510</jbossws.integration.target> + <jboss.version>6.0.0-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> <!-- [JBWS-2263] --> <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> + <artifactId>jbossws-jboss600x</artifactId> </dependency> <!--dependency> <groupId>org.jboss.jbossas</groupId> @@ -599,7 +599,7 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile> </configuration> </plugin> <plugin> Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-01-08 17:47:12 UTC (rev 8996) @@ -1,20 +0,0 @@ -# Exclude endpoints with AS42 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.* - -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2433] Investigate why MessageDriven EJB3 tests are failing -org/jboss/test/ws/jaxws/samples/jmstransport/** -org/jboss/test/ws/jaxws/samples/dar/** - -# [JBAS-5257] Cannot deploy through jax-ws endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [JBWS-2217] Fix BPEL jaxrpc samples -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/pom.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -48,7 +48,7 @@ <!-- Properties --> <properties> - <jbossws.common.version>1.0.8.GA</jbossws.common.version> + <jbossws.common.version>1.0.9-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>3.0.6-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>1.0.7.GA</jbossws.spi.version> <jbossws.jboss422.version>3.0.5.GA</jbossws.jboss422.version> @@ -57,8 +57,8 @@ <jbossws.jboss500.version>3.0.5.GA</jbossws.jboss500.version> <!-- [JBWS-2263] --> <!-- START --> - <jbossws.jboss501.version>3.0.5.GA</jbossws.jboss501.version> <jbossws.jboss510.version>3.0.5.GA</jbossws.jboss510.version> + <jbossws.jboss600.version>3.0.6-SNAPSHOT</jbossws.jboss600.version> <!-- END --> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -160,25 +160,25 @@ <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501CR1</artifactId> - <version>${jbossws.jboss501.version}</version> + <artifactId>jbossws-jboss510x</artifactId> + <version>${jbossws.jboss510.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501CR1</artifactId> - <version>${jbossws.jboss501.version}</version> + <artifactId>jbossws-jboss510x</artifactId> + <version>${jbossws.jboss510.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> - <version>${jbossws.jboss510.version}</version> + <artifactId>jbossws-jboss600x</artifactId> + <version>${jbossws.jboss600.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510x</artifactId> - <version>${jbossws.jboss510.version}</version> + <artifactId>jbossws-jboss600x</artifactId> + <version>${jbossws.jboss600.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> @@ -515,26 +515,26 @@ </profile> <!-- - Name: jboss501 - Descr: JBoss-5.0.1 specific options + Name: jboss510 + Descr: JBoss-5.1.0 specific options --> <profile> - <id>jboss501</id> + <id>jboss510</id> <properties> - <jbossws.integration.target>jboss501</jbossws.integration.target> - <jboss.home>${jboss501.home}</jboss.home> + <jbossws.integration.target>jboss510</jbossws.integration.target> + <jboss.home>${jboss510.home}</jboss.home> </properties> </profile> <!-- - Name: jboss510 - Descr: JBoss-5.1.0 specific options + Name: jboss600 + Descr: JBoss-6.0.0 specific options --> <profile> - <id>jboss510</id> + <id>jboss600</id> <properties> - <jbossws.integration.target>jboss510</jbossws.integration.target> - <jboss.home>${jboss510.home}</jboss.home> + <jbossws.integration.target>jboss600</jbossws.integration.target> + <jboss.home>${jboss600.home}</jboss.home> </properties> </profile> Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/profiles.xml.example 2009-01-08 17:47:12 UTC (rev 8996) @@ -16,8 +16,8 @@ <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> - <jboss501.home>/home/tdiesler/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.CR1</jboss501.home> - <jboss510.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.1.0.Beta1</jboss510.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> </properties> </profile> Modified: stack/native/trunk/src/main/distro/Install.txt =================================================================== --- stack/native/trunk/src/main/distro/Install.txt 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/src/main/distro/Install.txt 2009-01-08 17:47:12 UTC (rev 8996) @@ -16,6 +16,7 @@ ant deploy-jboss42x ant deploy-jboss50x ant deploy-jboss51x + ant deploy-jboss60x 4.) Execute the samples to verify your installation Modified: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/src/main/distro/ant.properties.example 2009-01-08 17:47:12 UTC (rev 8996) @@ -7,10 +7,10 @@ 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|jboss501|jboss510] +# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|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-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -130,28 +130,6 @@ </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 --> <!-- ================================================================== --> @@ -189,6 +167,43 @@ </target> <!-- ================================================================== --> + <!-- Prepare Deployment Structure JBoss-6.0.x --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss60" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-native51" 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 JBoss600 --> + <!-- ================================================================== --> + + <target name="target-jboss600"> + <property name="jbossws.integration.target" value="jboss600"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss60" description="Deploy jbossws to jboss600"> + <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> + <copy todir="${jboss600.home}" overwrite="true"> + <fileset dir="${deploy.structure}"/> + </copy> + <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <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}"/> + </target> + + <!-- ================================================================== --> <!-- Create jbossws-deploy.conf --> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/src/main/distro/build-setup.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -46,13 +46,6 @@ <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}"/> @@ -60,19 +53,26 @@ <property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/> <property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/> + <property name="jboss600.lib" value="${jboss600.home}/lib"/> + <property name="jboss600.client" value="${jboss600.home}/client"/> + <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/> + <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/> + <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/> + <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> <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"/> <available property="jboss422.available" file="${jboss422.available.file}"/> <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}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/src/main/distro/build.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -56,7 +56,6 @@ <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"> @@ -64,6 +63,11 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss510"/> </or> </condition> + <condition property="jbossws.integration.jboss60" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> + </or> + </condition> <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-01-08 16:37:42 UTC (rev 8995) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-01-08 17:47:12 UTC (rev 8996) @@ -104,22 +104,22 @@ <!-- START --> <dependencySet> <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss501CR1:jar</include> + <include>org.jboss.ws:jbossws-jboss510x:jar</include> </includes> </dependencySet> <dependencySet> <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss510x:jar</include> + <include>org.jboss.ws:jbossws-jboss600x:jar</include> </includes> </dependencySet> <!-- END -->