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

Author: richard.opalka(a)jboss.com Date: 2008-07-21 10:25:22 -0400 (Mon, 21 Jul 2008) New Revision: 7873 Added: stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt Removed: stack/native/trunk/modules/testsuite/test-excludes-jboss421.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/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/profiles.xml.example stack/native/trunk/src/main/distro/ant.properties 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: we support last three official releases, thus removing AS 421 tag and adding AS 424 branch Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/build.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -42,15 +42,15 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss421.home" value="${profiles.profile.properties.jboss421.home}"> - <isset property="profiles.profile.properties.jboss421.home"/> - </condition> <condition property="jboss422.home" value="${profiles.profile.properties.jboss422.home}"> <isset property="profiles.profile.properties.jboss422.home"/> </condition> <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}"> <isset property="profiles.profile.properties.jboss423.home"/> </condition> + <condition property="jboss424.home" value="${profiles.profile.properties.jboss424.home}"> + <isset property="profiles.profile.properties.jboss424.home"/> + </condition> <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}"> <isset property="profiles.profile.properties.jboss500.home"/> </condition> @@ -60,16 +60,16 @@ <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> - <property name="jboss421.home" value="${profiles.profile.properties.jboss421.home}"/> <property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/> <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}"/> <echo/> - <echo message="jboss421.home=${jboss421.home}"/> <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}"/> </target> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/modules/core/pom.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -183,14 +183,6 @@ <artifactItems> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss421</artifactId> - <version>${jbossws.jboss421.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss421</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <version>${jbossws.jboss422.version}</version> <classifier>resources</classifier> @@ -199,7 +191,7 @@ </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> + <artifactId>jbossws-jboss423</artifactId> <version>${jbossws.jboss423.version}</version> <classifier>resources</classifier> <type>zip</type> @@ -207,6 +199,14 @@ </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss424x</artifactId> + <version>${jbossws.jboss424.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR1</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> 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 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -29,19 +29,7 @@ <!-- Compile resource files --> <target name="main" depends="init"> - <!-- Concat jbossws-jboss422/jbossws.beans --> - <echo message="Concat jbossws-jboss421/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss421/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" - xmlns="urn:jboss:bean-deployer"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> - <fileset file="${project.build.resources.directory}/jbossws-jboss421/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - - <!-- Concat jbossws-jboss422/jbossws.beans --> + <!-- Concat jbossws-jboss422/jbossws.beans --> <echo message="Concat jbossws-jboss422/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss422/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> @@ -65,6 +53,18 @@ &lt;/deployment&gt; </footer> </concat> + <!-- Concat jbossws-jboss424/jbossws.beans --> + <echo message="Concat jbossws-jboss424/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss424/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-native-config.xml"/> + <fileset file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + <!-- Concat jbossws-jboss500/jbossws.beans --> <echo message="Concat jbossws-jboss500/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml"> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/modules/management/pom.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -32,17 +32,17 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss421</artifactId> + <artifactId>jbossws-jboss422</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> + <artifactId>jbossws-jboss423</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> + <artifactId>jbossws-jboss424x</artifactId> <scope>runtime</scope> </dependency> <dependency> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -275,15 +275,15 @@ </build> </profile> - <!-- - Name: jboss421 - Descr: JBoss-4.2.2 specific options + <!-- + Name: jboss422 + Descr: JBoss-4.2.2 specific options --> <profile> - <id>jboss421</id> + <id>jboss422</id> <properties> - <jboss.version>4.2.1.GA</jboss.version> - <jbossws.integration.target>jboss421</jbossws.integration.target> + <jboss.version>4.2.2.GA</jboss.version> + <jbossws.integration.target>jboss422</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -293,7 +293,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss421</artifactId> + <artifactId>jbossws-jboss422</artifactId> </dependency> </dependencies> <build> @@ -302,28 +302,28 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss421.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss421.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> </build> </profile> - + <!-- - Name: jboss422 - Descr: JBoss-4.2.2 specific options + Name: jboss423 + Descr: JBoss-4.2.3 specific options --> <profile> - <id>jboss422</id> + <id>jboss423</id> <properties> - <jboss.version>4.2.2.GA</jboss.version> - <jbossws.integration.target>jboss422</jbossws.integration.target> + <jboss.version>4.2.3.GA</jboss.version> + <jbossws.integration.target>jboss423</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -333,7 +333,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> + <artifactId>jbossws-jboss423</artifactId> </dependency> </dependencies> <build> @@ -342,13 +342,13 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> @@ -356,14 +356,14 @@ </profile> <!-- - Name: jboss423 - Descr: JBoss-4.2.3 specific options + Name: jboss424 + Descr: JBoss-4.2.4 specific options --> <profile> - <id>jboss423</id> + <id>jboss424</id> <properties> - <jboss.version>4.2.3-SNAPSHOT</jboss.version> - <jbossws.integration.target>jboss423</jbossws.integration.target> + <jboss.version>4.2.4-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss424</jbossws.integration.target> </properties> <dependencies> <dependency> @@ -373,7 +373,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> + <artifactId>jbossws-jboss424x</artifactId> </dependency> </dependencies> <build> @@ -382,13 +382,13 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> + <testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss424.home}/lib/endorsed</argLine> </configuration> </plugin> </plugins> Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-07-21 14:25:22 UTC (rev 7873) @@ -1,38 +0,0 @@ -# -# $Id$ -# - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** -org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.* - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.* - -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* - -# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-1813] context-root from jboss.xml -org/jboss/test/ws/jaxws/jbws1813/** - -# [JBWS-1841] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [JBWS-1911] Support the JMS transport with JAX-WS -org/jboss/test/ws/jaxws/samples/jmstransport/** -org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.* - -# [JBWS-2170] Fix embedded for maven build -org/jboss/test/ws/embedded/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* Added: stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt (rev 0) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-07-21 14:25:22 UTC (rev 7873) @@ -0,0 +1,22 @@ +# +# $Id: test-excludes-jboss423.txt 7835 2008-07-16 17:20:43Z darran.lofthouse(a)jboss.com $ +# + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** +org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.* + +# Exclude endpoints with AS5 @SecurityDomain +org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* +org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.* +org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.* + +# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* + +# [JBWS-2170] Fix embedded for maven build +org/jboss/test/ws/embedded/** + +# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 +org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* \ No newline at end of file Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/pom.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -54,9 +54,9 @@ <jbossws.common.version>1.0.5.GA</jbossws.common.version> <jbossws.framework.version>3.0.3-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>1.0.5-SNAPSHOT</jbossws.spi.version> - <jbossws.jboss421.version>3.0.2.GA</jbossws.jboss421.version> <jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version> <jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version> + <jbossws.jboss424.version>3.0.2.GA</jbossws.jboss424.version> <jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version> <jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> @@ -111,37 +111,37 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss421</artifactId> - <version>${jbossws.jboss421.version}</version> + <artifactId>jbossws-jboss422</artifactId> + <version>${jbossws.jboss422.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss421</artifactId> - <version>${jbossws.jboss421.version}</version> + <artifactId>jbossws-jboss422</artifactId> + <version>${jbossws.jboss422.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - <version>${jbossws.jboss422.version}</version> + <artifactId>jbossws-jboss423</artifactId> + <version>${jbossws.jboss423.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - <version>${jbossws.jboss422.version}</version> + <artifactId>jbossws-jboss423</artifactId> + <version>${jbossws.jboss423.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> - <version>${jbossws.jboss423.version}</version> + <artifactId>jbossws-jboss424x</artifactId> + <version>${jbossws.jboss424.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> - <version>${jbossws.jboss423.version}</version> + <artifactId>jbossws-jboss424x</artifactId> + <version>${jbossws.jboss424.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> @@ -446,18 +446,6 @@ </build> </profile> - <!-- - Name: jboss421 - Descr: JBoss-4.2.1 specific options - --> - <profile> - <id>jboss421</id> - <properties> - <jbossws.integration.target>jboss421</jbossws.integration.target> - <jboss.home>${jboss421.home}</jboss.home> - </properties> - </profile> - <!-- Name: jboss422 Descr: JBoss-4.2.2 specific options @@ -472,7 +460,7 @@ <!-- Name: jboss423 - Descr: JBoss-4.2.2 specific options + Descr: JBoss-4.2.3 specific options --> <profile> <id>jboss423</id> @@ -482,6 +470,18 @@ </properties> </profile> + <!-- + Name: jboss424 + Descr: JBoss-4.2.4 specific options + --> + <profile> + <id>jboss424</id> + <properties> + <jbossws.integration.target>jboss424</jbossws.integration.target> + <jboss.home>${jboss424.home}</jboss.home> + </properties> + </profile> + <!-- Name: jboss500 Descr: JBoss-5.0.0 specific options Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/profiles.xml.example 2008-07-21 14:25:22 UTC (rev 7873) @@ -12,13 +12,13 @@ </activation> <properties> <java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home> - <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.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</jboss421.home> <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home> <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home> </properties> </profile> </profiles> -</profilesXml> \ No newline at end of file +</profilesXml> Modified: stack/native/trunk/src/main/distro/ant.properties =================================================================== --- stack/native/trunk/src/main/distro/ant.properties 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/src/main/distro/ant.properties 2008-07-21 14:25:22 UTC (rev 7873) @@ -4,9 +4,9 @@ # $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ # Optional JBoss Home -jboss421.home=(a)jboss421.home@ jboss422.home=(a)jboss422.home@ jboss423.home=(a)jboss423.home@ +jboss424.home=(a)jboss424.home@ jboss500.home=(a)jboss500.home@ jboss501.home=(a)jboss501.home@ Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -29,41 +29,6 @@ </target> <!-- ================================================================== --> - <!-- Deployment JBoss421 --> - <!-- ================================================================== --> - - <target name="target-jboss421"> - <property name="jbossws.integration.target" value="jboss421"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss421" depends="undeploy-jboss421,deploy-structure-jboss42" description="Deploy jbossws to jboss421"> - <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> - <copy todir="${jboss421.home}" overwrite="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/> - - <!-- Extras for jboss-4.2.1 --> - <copy todir="${jboss421.home}/client" overwrite="true"> - <fileset dir="${deploy.artifacts.dir}/lib"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - <copy todir="${jboss421.home}/lib" overwrite="true"> - <fileset dir="${deploy.artifacts.dir}/lib"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - </target> - - <target name="undeploy-jboss421" depends="target-jboss421,init" description="Remove jbossws from jboss421"> - <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> - <macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> - <delete file="${jboss421.server.lib}/jbossws-integration.jar"/> - </target> - - <!-- ================================================================== --> <!-- Deployment JBoss422 --> <!-- ================================================================== --> @@ -108,6 +73,28 @@ </target> <!-- ================================================================== --> + <!-- Deployment JBoss424 --> + <!-- ================================================================== --> + + <target name="target-jboss424"> + <property name="jbossws.integration.target" value="jboss424"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss424" depends="undeploy-jboss424,deploy-structure-jboss42" description="Deploy jbossws to jboss424"> + <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/> + <copy todir="${jboss424.home}" overwrite="true"> + <fileset dir="${deploy.structure}"/> + </copy> + <chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424"> + <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/> + <macro-undeploy-jbossws targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/src/main/distro/build-setup.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -23,12 +23,6 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss421.lib" value="${jboss421.home}/lib"/> - <property name="jboss421.client" value="${jboss421.home}/client"/> - <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/> - <property name="jboss421.server.lib" value="${jboss421.server}/lib"/> - <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/> - <property name="jboss422.lib" value="${jboss422.home}/lib"/> <property name="jboss422.client" value="${jboss422.home}/client"/> <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> @@ -41,6 +35,12 @@ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + <property name="jboss424.lib" value="${jboss424.home}/lib"/> + <property name="jboss424.client" value="${jboss424.home}/client"/> + <property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/> + <property name="jboss424.server.lib" value="${jboss424.server}/lib"/> + <property name="jboss424.server.deploy" value="${jboss424.server}/deploy"/> + <property name="jboss500.lib" value="${jboss500.home}/lib"/> <property name="jboss500.client" value="${jboss500.home}/client"/> <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> @@ -55,15 +55,15 @@ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/> <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"/> - <available property="jboss421.available" file="${jboss421.available.file}"/> <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}"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/src/main/distro/build.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -49,9 +49,9 @@ <condition property="jbossws.integration.jboss42" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss424"/> </or> </condition> <condition property="jbossws.integration.jboss50" value="true"> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-21 11:37:59 UTC (rev 7872) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-21 14:25:22 UTC (rev 7873) @@ -91,19 +91,19 @@ <unpack>false</unpack> <includes> <include>*:jbossws-framework:jar</include> - <include>*:jbossws-jboss421:jar</include> <include>*:jbossws-jboss422:jar</include> + <include>*:jbossws-jboss423:jar</include> <include>*:juddi-service:sar</include> </includes> </dependencySet> <dependencySet> <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss423.${module.extension}</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss423x:jar</include> + <include>*:jbossws-jboss424x:jar</include> </includes> </dependencySet> <dependencySet>