Author: richard.opalka(a)jboss.com Date: 2008-07-24 06:23:23 -0400 (Thu, 24 Jul 2008) New Revision: 7902 Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt Modified: stack/metro/trunk/build.xml stack/metro/trunk/modules/management/pom.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/pom.xml stack/metro/trunk/profiles.xml.example stack/metro/trunk/src/main/distro/ant.properties stack/metro/trunk/src/main/distro/build-deploy.xml stack/metro/trunk/src/main/distro/build-setup.xml stack/metro/trunk/src/main/distro/build.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: adding support for AS 4.2.4 branch too Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/build.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -46,15 +46,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> @@ -64,16 +64,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/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/modules/management/pom.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -37,12 +37,17 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> + <artifactId>jbossws-jboss423</artifactId> <scope>runtime</scope> </dependency> - <!-- JBWS-2263 <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss424x</artifactId> + <scope>runtime</scope> + </dependency> + <!-- [JBWS-2263] + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR1</artifactId> <scope>runtime</scope> </dependency> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/modules/server/pom.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -39,11 +39,18 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> + <artifactId>jbossws-jboss423</artifactId> <version>${jbossws.jboss423.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss424x</artifactId> + <version>${jbossws.jboss424.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> <!-- Metro dependencies --> <dependency> @@ -161,7 +168,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> @@ -169,6 +176,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> @@ -201,6 +216,7 @@ <tasks> <property name="jbossws.jboss422.version" value="${jbossws.jboss422.version}"/> <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/> + <property name="jbossws.jboss424.version" value="${jbossws.jboss424.version}"/> <ant antfile="src/main/scripts/antrun-beans-config.xml"/> </tasks> </configuration> Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -53,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-metro-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/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -333,7 +333,7 @@ <profile> <id>jboss423</id> <properties> - <jboss.version>4.2.3-SNAPSHOT</jboss.version> + <jboss.version>4.2.3.GA</jboss.version> <jbossws.integration.target>jboss423</jbossws.integration.target> </properties> <dependencies> @@ -349,7 +349,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> + <artifactId>jbossws-jboss423</artifactId> </dependency> </dependencies> <build> @@ -372,6 +372,51 @@ </profile> <!-- + Name: jboss424 + Descr: JBoss-4.2.4 specific options + --> + <profile> + <id>jboss424</id> + <properties> + <jboss.version>4.2.4-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss424</jbossws.integration.target> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jbossall-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jnpserver</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss424x</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> + <testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss424.home}/lib/endorsed</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Name: jboss500 Descr: JBoss-5.0.0 specific options --> Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt (rev 0) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-07-24 10:23:23 UTC (rev 7902) @@ -0,0 +1,62 @@ +# +# $Id: test-excludes-jboss424.txt 7836 2008-07-16 17:21:11Z darran.lofthouse(a)jboss.com $ +# + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** + +# Exclude endpoints with AS5 @SecurityDomain +org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* + +# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* + +# [JBWS-1841] WebServiceRef injection from DD doesn't work +org/jboss/test/ws/jaxws/jbws1841/** + +# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" +org/jboss/test/ws/jaxws/binding/** + +# [JBWS-2128] DefaultHttpContext is not a supported context. +org/jboss/test/ws/jaxws/endpoint/** + +# [JBWS-2129] Wrapper class is not found +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/holder/** +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1357/** +org/jboss/test/ws/jaxws/jbws1422/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1566/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1733/** +org/jboss/test/ws/jaxws/jbws1762/** +org/jboss/test/ws/jaxws/jbws1797/** +org/jboss/test/ws/jaxws/jbws1799/** +org/jboss/test/ws/jaxws/jbws1822/** +org/jboss/test/ws/jaxws/jbws1845/** +org/jboss/test/ws/jaxws/jbws1872/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws2000/** +org/jboss/test/ws/jaxws/jbws2250/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/webfault/** + +# [JBWS-2131] NoSuchElementException during wsdl generation at deploy +org/jboss/test/ws/jaxws/jbws1702/** + +# [JBWS-2132] IllegalArgumentException: protocol = http host = null +org/jboss/test/ws/jaxws/jbws1798/** +org/jboss/test/ws/jaxws/jbws1843/** +org/jboss/test/ws/jaxws/jbws2009/** + +# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2249] NPE while creating endpoint +org/jboss/test/ws/jaxws/jbws1807/** + +# [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 Property changes on: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt ___________________________________________________________________ Name: svn:executable + * Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/pom.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -52,6 +52,7 @@ <jbossws.spi.version>1.0.5-SNAPSHOT</jbossws.spi.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.3-SNAPSHOT</jbossws.jboss424.version> <jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version> <jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version> <jboss.common.version>1.2.1.GA</jboss.common.version> @@ -108,18 +109,30 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> + <artifactId>jbossws-jboss423</artifactId> <version>${jbossws.jboss423.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423x</artifactId> + <artifactId>jbossws-jboss423</artifactId> <version>${jbossws.jboss423.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss424x</artifactId> + <version>${jbossws.jboss424.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss424x</artifactId> + <version>${jbossws.jboss424.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR1</artifactId> <version>${jbossws.jboss500.version}</version> </dependency> @@ -396,6 +409,18 @@ </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/metro/trunk/profiles.xml.example =================================================================== --- stack/metro/trunk/profiles.xml.example 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/profiles.xml.example 2008-07-24 10:23:23 UTC (rev 7902) @@ -11,13 +11,13 @@ </property> </activation> <properties> - <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</jboss424.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/metro/trunk/src/main/distro/ant.properties =================================================================== --- stack/metro/trunk/src/main/distro/ant.properties 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/src/main/distro/ant.properties 2008-07-24 10:23:23 UTC (rev 7902) @@ -6,6 +6,7 @@ # Optional JBoss 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/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -77,6 +77,30 @@ </target> <!-- ================================================================== --> + <!-- Deployment JBoss424 --> + <!-- ================================================================== --> + + <target name="target-jboss424"> + <property name="jboss.server.instance" value="default"/> + <property name="jbossws.integration.target" value="jboss424"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}${line.separator}" file="${target.properties.file}"/> + <echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/> + </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-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> Modified: stack/metro/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-setup.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -34,6 +34,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}"/> @@ -50,11 +56,13 @@ <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="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/metro/trunk/src/main/distro/build.xml =================================================================== --- stack/metro/trunk/src/main/distro/build.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/src/main/distro/build.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -51,6 +51,7 @@ <or> <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/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-24 09:35:30 UTC (rev 7901) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-24 10:23:23 UTC (rev 7902) @@ -82,17 +82,18 @@ <includes> <include>*:jbossws-framework: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> <!-- JBWS-2263 -->