Author: richard.opalka(a)jboss.com Date: 2008-12-11 07:38:08 -0500 (Thu, 11 Dec 2008) New Revision: 8864 Added: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt Removed: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf Modified: stack/metro/trunk/build.xml stack/metro/trunk/modules/management/pom.xml stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.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/Install.txt stack/metro/trunk/src/main/distro/ant.properties.example 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-bin-dist.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: adding support for JBossAS 510 Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/build.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -29,7 +29,7 @@ <import file="${stack.distro.dir}/build-deploy.xml"/> <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> - <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/> + <property name="jbossws.as4.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as4-default-deploy.conf"/> <property name="jbossws.as5.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-as5-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> @@ -70,6 +70,9 @@ <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> <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> @@ -78,6 +81,7 @@ <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}"/> <echo/> <echo message="jboss422.home=${jboss422.home}"/> @@ -85,6 +89,7 @@ <echo message="jboss424.home=${jboss424.home}"/> <echo message="jboss500.home=${jboss500.home}"/> <echo message="jboss501.home=${jboss501.home}"/> + <echo message="jboss510.home=${jboss510.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/modules/management/pom.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -45,18 +45,23 @@ <artifactId>jbossws-jboss424x</artifactId> <scope>runtime</scope> </dependency> - <!-- [JBWS-2263] --> - <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <scope>runtime</scope> </dependency> + <!-- [JBWS-2263] --> + <!-- START --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501CR1</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510x</artifactId> + <scope>runtime</scope> + </dependency> <!-- END --> <dependency> <groupId>org.jboss.jaxr</groupId> Added: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf (rev 0) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2008-12-11 12:38:08 UTC (rev 8864) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Deleted: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-12-11 12:38:08 UTC (rev 8864) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -152,6 +152,23 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-lib51"> + <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-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> @@ -206,6 +223,24 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-client51"> + <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 --> <!-- ================================================================== --> @@ -239,6 +274,20 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-server-lib51"> + <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 --> <!-- ================================================================== --> @@ -313,6 +362,21 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-sar51"> + <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-metro-management.war"/> + </fileset> + </unzip> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Deployers --> <!-- ================================================================== --> @@ -355,6 +419,44 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-deployers51"> + <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}" 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 --> <!-- ================================================================== --> @@ -381,6 +483,16 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-metro51" depends="check-parameters,deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! --> + <macro-deploy-jbossws-sar51 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers51 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-endorsed" if="HAVE_JDK_1.6"> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> @@ -470,4 +582,43 @@ </sequential> </macrodef> + <macrodef name="macro-undeploy-jbossws51"> + <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> + <!-- START --> + + <!-- 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/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/modules/server/pom.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -182,8 +182,6 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory> </artifactItem> - <!-- JBWS-2263 --> - <!-- START --> <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> @@ -192,6 +190,8 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> </artifactItem> + <!-- JBWS-2263 --> + <!-- START --> <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501CR1</artifactId> @@ -200,6 +200,14 @@ <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> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss510</outputDirectory> + </artifactItem> <!-- END --> </artifactItems> </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-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -83,6 +83,16 @@ &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"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + </target> </project> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -559,6 +559,75 @@ </build> </profile> + <!-- + Name: jboss510 + Descr: JBoss-5.1.0 specific options + --> + <profile> + <id>jboss510</id> + <properties> + <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-jboss510x</artifactId> + </dependency> + <!--dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-webservices</artifactId> + <version>${jboss.version}</version> + </dependency--> + <!-- END --> + <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.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-jboss510.txt</testExcludeFile> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <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> + <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> + </additionalClasspathElements> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt (rev 0) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2008-12-11 12:38:08 UTC (rev 8864) @@ -0,0 +1,45 @@ +# Exclude endpoints with AS42 @SecurityDomain +org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* + +# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* + +# [JBWS-1949] Metro MTOM ignores content-type on attachment part +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.* +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.* + +# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws2183/** + +# [JBWS-2131] NoSuchElementException during wsdl generation at deploy +org/jboss/test/ws/jaxws/jbws1702/** + +# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2329] Failed to deploy service with multiple bindings +org/jboss/test/ws/jaxws/jbws2278/** + +# [JBWS-2308] faultCode argument for createFault was passed NULL +org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.* + +# [JBWS-2347] Rewrite @WebFault related tests +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/webfault/** + +# [JBWS-2348] Fix jbws1969 testcase +org/jboss/test/ws/jaxws/jbws1969/** + +# [JBWS-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable +org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* + +# [JBWS-2397] Fix jbws1797 testcase +org/jboss/test/ws/jaxws/jbws1797/** + +# [JBWS-2400] Rewrite large attachment testcase +org/jboss/test/ws/jaxws/jbws2000/** Property changes on: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt ___________________________________________________________________ Name: svn:executable + * Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/pom.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -55,6 +55,7 @@ <!-- START --> <jbossws.jboss500.version>3.0.5-SNAPSHOT</jbossws.jboss500.version> <jbossws.jboss501.version>3.0.5-SNAPSHOT</jbossws.jboss501.version> + <jbossws.jboss510.version>3.0.5-SNAPSHOT</jbossws.jboss510.version> <!-- END --> <jboss.common.version>1.2.1.GA</jboss.common.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -163,6 +164,18 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510x</artifactId> + <version>${jbossws.jboss510.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss510x</artifactId> + <version>${jbossws.jboss510.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> <!-- END --> <!-- provided apis --> @@ -480,7 +493,7 @@ <!-- Name: jboss501 - Descr: JBoss-5.0.0 specific options + Descr: JBoss-5.0.1 specific options --> <profile> <id>jboss501</id> @@ -491,6 +504,18 @@ </profile> <!-- + Name: jboss510 + Descr: JBoss-5.1.0 specific options + --> + <profile> + <id>jboss510</id> + <properties> + <jbossws.integration.target>jboss510</jbossws.integration.target> + <jboss.home>${jboss510.home}</jboss.home> + </properties> + </profile> + + <!-- Name: smoketest Descr: Executes the smoke tests --> Modified: stack/metro/trunk/profiles.xml.example =================================================================== --- stack/metro/trunk/profiles.xml.example 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/profiles.xml.example 2008-12-11 12:38:08 UTC (rev 8864) @@ -1,8 +1,8 @@ <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 --> + + <!-- This profile can also be defined in ~/.m2/settings.xml --> <profile> <id>jboss-home-profile</id> <activation> @@ -14,10 +14,11 @@ <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_CR2/build/output/jboss-5.0.0.CR2</jboss500.home> - <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.GA</jboss501.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> </properties> </profile> - + </profiles> </profilesXml> Modified: stack/metro/trunk/src/main/distro/Install.txt =================================================================== --- stack/metro/trunk/src/main/distro/Install.txt 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/src/main/distro/Install.txt 2008-12-11 12:38:08 UTC (rev 8864) @@ -15,6 +15,7 @@ ant deploy-jboss42x ant deploy-jboss50x + ant deploy-jboss51x 4.) Execute the samples to verify your installation Modified: stack/metro/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/metro/trunk/src/main/distro/ant.properties.example 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/src/main/distro/ant.properties.example 2008-12-11 12:38:08 UTC (rev 8864) @@ -8,8 +8,9 @@ jboss424.home=(a)jboss424.home@ jboss500.home=(a)jboss500.home@ jboss501.home=(a)jboss501.home@ +jboss510.home=(a)jboss510.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501] +# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510] jbossws.integration.target=jboss500 # The JBoss settings Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -10,11 +10,11 @@ <!-- ====================================================================== --> <project> - + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-4.2.x --> <!-- ================================================================== --> - + <target name="deploy-structure-jboss42" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <antcall target="deploy-jbossws-metro42" inheritall="false"> @@ -25,7 +25,7 @@ </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> - + <!-- ================================================================== --> <!-- Deployment JBoss422 --> <!-- ================================================================== --> @@ -44,12 +44,12 @@ </copy> <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> </target> - + <target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> </target> - + <!-- ================================================================== --> <!-- Deployment JBoss423 --> <!-- ================================================================== --> @@ -68,12 +68,12 @@ </copy> <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> </target> - + <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> </target> - + <!-- ================================================================== --> <!-- Deployment JBoss424 --> <!-- ================================================================== --> @@ -92,16 +92,16 @@ </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}"/> + <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> </target> - + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> - + <target name="deploy-structure-jboss50" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> <antcall target="deploy-jbossws-metro50" inheritall="false"> @@ -131,12 +131,12 @@ </copy> <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> </target> - + <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}"/> </target> - + <!-- ================================================================== --> <!-- Deployment JBoss501 --> <!-- ================================================================== --> @@ -155,16 +155,55 @@ </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 --> + <!-- ================================================================== --> + + <target name="deploy-structure-jboss51" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-metro51" 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 JBoss510 --> + <!-- ================================================================== --> + + <target name="target-jboss510"> + <property name="jboss.server.instance" value="default"/> + <property name="jbossws.integration.target" value="jboss510"/> + <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-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51" description="Deploy jbossws to jboss510"> + <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> + <copy todir="${jboss510.home}" overwrite="true"> + <fileset dir="${deploy.structure}"/> + </copy> + <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> + <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> + <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + </target> + + <!-- ================================================================== --> <!-- Create jbossws-deploy.conf --> <!-- ================================================================== --> - + <macrodef name="macro-create-deploy-conf"> <attribute name="deploystructure"/> <sequential> @@ -175,5 +214,5 @@ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> </sequential> </macrodef> - + </project> Modified: stack/metro/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-setup.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -10,63 +10,72 @@ <!-- ====================================================================== --> <project> - + <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - + <target name="prepare"> - + <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> - + <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}"/> <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - + <property name="jboss423.lib" value="${jboss423.home}/lib"/> <property name="jboss423.client" value="${jboss423.home}/client"/> <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> <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}"/> <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/> <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}"/> + <property name="jboss510.server.lib" value="${jboss510.home}/common/lib"/> + <property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/> + <property name="jboss510.server.deployers" value="${jboss510.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"/> + <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}"/> + <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> </target> - + </project> \ No newline at end of file Modified: stack/metro/trunk/src/main/distro/build.xml =================================================================== --- stack/metro/trunk/src/main/distro/build.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/src/main/distro/build.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -22,7 +22,7 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/> <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> @@ -59,6 +59,11 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> </or> </condition> + <condition property="jbossws.integration.jboss51" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss510"/> + </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/metro/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -40,7 +40,7 @@ <outputDirectory>build</outputDirectory> <includes> <include>jbossws-as5-default-deploy.conf</include> - <include>jbossws-default-deploy.conf</include> + <include>jbossws-as4-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes> </fileSet> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 12:26:08 UTC (rev 8863) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-12-11 12:38:08 UTC (rev 8864) @@ -109,6 +109,16 @@ <include>org.jboss.ws:jbossws-jboss501CR1:jar</include> </includes> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>runtime</scope> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss510x:jar</include> + </includes> + </dependencySet> <!-- END --> </dependencySets> </binaries>