[jbossws-commits] JBossWS SVN: r9292 - in stack/metro/trunk: modules/management and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Feb 13 08:12:57 EST 2009
Author: richard.opalka at jboss.com
Date: 2009-02-13 08:12:57 -0500 (Fri, 13 Feb 2009)
New Revision: 9292
Added:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
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/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-deploy-artifacts.xml
Log:
[JBWS-2505] don't deploy AS integration layer
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/build.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -67,6 +67,9 @@
<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>
@@ -80,6 +83,7 @@
<property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
<property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
+ <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
@@ -88,6 +92,7 @@
<echo message="jboss423.home=${jboss423.home}"/>
<echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
+ <echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
</target>
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/modules/management/pom.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -50,10 +50,16 @@
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- [JBWS-2263] -->
+ <!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<scope>runtime</scope>
</dependency>
@@ -62,6 +68,7 @@
<artifactId>jbossws-jboss600x</artifactId>
<scope>runtime</scope>
</dependency>
+ -->
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
Modified: stack/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 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -226,6 +226,21 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-client500">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-client50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -235,9 +250,11 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
@@ -253,9 +270,11 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
@@ -271,9 +290,11 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
@@ -449,6 +470,38 @@
<!-- Deploy Deployers -->
<!-- ================================================================== -->
+ <macrodef name="macro-deploy-jbossws-deployers500">
+ <attribute name="thirdpartydir"/>
+ <attribute name="artifactsdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
+ <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"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-deployers50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -470,19 +523,23 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ -->
<!-- END -->
</sequential>
</macrodef>
@@ -508,19 +565,23 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ -->
<!-- END -->
</sequential>
</macrodef>
@@ -546,19 +607,23 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ -->
<!-- END -->
</sequential>
</macrodef>
@@ -577,6 +642,17 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+ <target name="deploy-jbossws-metro500" depends="check-parameters">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
+ <macro-deploy-jbossws-client500 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
+ <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers500 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
<target name="deploy-jbossws-metro50" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -656,6 +732,42 @@
</sequential>
</macrodef>
+ <macrodef name="macro-undeploy-jbossws500">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- delete stale container integration jars -->
+ <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ <!-- delete juddi-service.sar -->
+ <delete dir="@{targetdir}/../juddi-service.sar"/>
+
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-undeploy-jbossws50">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
@@ -668,9 +780,10 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
+ <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -679,7 +792,8 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- <!-- START -->
+ -->
+ <!-- END -->
<!-- delete content of last deployment -->
<delete>
@@ -707,9 +821,10 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
+ <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -718,7 +833,8 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- <!-- START -->
+ -->
+ <!-- END -->
<!-- delete content of last deployment -->
<delete>
@@ -746,9 +862,10 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
+ <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -757,7 +874,8 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- <!-- START -->
+ -->
+ <!-- END -->
<!-- delete content of last deployment -->
<delete>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/modules/server/pom.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -190,10 +190,19 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
</artifactItem>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<version>${jbossws.jboss510.version}</version>
<classifier>resources</classifier>
@@ -208,6 +217,7 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</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 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -73,6 +73,16 @@
</deployment> </footer>
</concat>
+ <!-- Concat jbossws-jboss501/jbossws.beans -->
+ <echo message="Concat jbossws-jboss501/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </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">
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -432,17 +432,78 @@
<jbossws.integration.target>jboss500</jbossws.integration.target>
</properties>
<dependencies>
- <!-- JBWS-2263 -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-javaee</artifactId>
+ <version>${jboss.javaee.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
+ <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <!-- TODO: replace with maven dependencies -->
+ <additionalClasspathElements>
+ <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <properties>
+ <jboss.version>5.0.1-SNAPSHOT</jboss.version>
+ <jbossws.integration.target>jboss501</jbossws.integration.target>
+ </properties>
+ <dependencies>
+ <!-- JBWS-2505 -->
+ <!-- START -->
<!--dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ </dependency-->
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
- </dependency-->
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -472,13 +533,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
@@ -501,17 +562,17 @@
<jbossws.integration.target>jboss510</jbossws.integration.target>
</properties>
<dependencies>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
- <dependency>
+ <!--dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
- </dependency>
- <!--dependency>
+ </dependency-->
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
- </dependency-->
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -560,8 +621,8 @@
</profile>
<!--
- Name: jboss510
- Descr: JBoss-5.1.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
<id>jboss600</id>
@@ -570,17 +631,17 @@
<jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
- <dependency>
+ <!--dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- </dependency>
- <!--dependency>
+ </dependency-->
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
- </dependency-->
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-02-13 13:12:57 UTC (rev 9292)
@@ -0,0 +1,50 @@
+# 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*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
+
+# [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/**
+
+# [JBWS-2462] Address rewrite test fails in Metro integration
+org/jboss/test/ws/jaxws/jbws2150/**
+
Property changes on: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/pom.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -52,10 +52,13 @@
<jbossws.jboss423.version>3.1.0-SNAPSHOT</jbossws.jboss423.version>
<jbossws.jboss424.version>3.1.0-SNAPSHOT</jbossws.jboss424.version>
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
+ <jbossws.jboss501.version>3.1.0-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
+ -->
<!-- END -->
<jboss.common.version>1.2.1.GA</jboss.common.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -150,10 +153,23 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501x</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
<version>${jbossws.jboss510.version}</version>
</dependency>
@@ -176,6 +192,7 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ -->
<!-- END -->
<!-- provided apis -->
@@ -492,6 +509,18 @@
</profile>
<!--
+ Name: jboss501
+ Descr: JBoss-5.0.1 specific options
+ -->
+ <profile>
+ <id>jboss501</id>
+ <properties>
+ <jbossws.integration.target>jboss501</jbossws.integration.target>
+ <jboss.home>${jboss501.home}</jboss.home>
+ </properties>
+ </profile>
+
+ <!--
Name: jboss510
Descr: JBoss-5.1.0 specific options
-->
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/profiles.xml.example 2009-02-13 13:12:57 UTC (rev 9292)
@@ -11,12 +11,13 @@
</property>
</activation>
<properties>
- <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
- <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
- <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
- <jboss510.home>/home/tdiesler/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
- <jboss600.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
+ <jboss422.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
+ <jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
+ <jboss424.home>/home/opalka/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
+ <jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
+ <jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
+ <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
+ <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0.Alpha1</jboss600.home>
</properties>
</profile>
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-02-13 13:12:57 UTC (rev 9292)
@@ -7,10 +7,11 @@
jboss423.home=@jboss423.home@
jboss424.home=@jboss424.home@
jboss500.home=@jboss500.home@
+jboss501.home=@jboss501.home@
jboss510.home=@jboss510.home@
jboss600.home=@jboss600.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -102,6 +102,17 @@
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
+ <target name="deploy-structure-jboss500" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-metro500" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
<target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-metro50" inheritall="false">
@@ -124,7 +135,7 @@
<echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
@@ -134,10 +145,34 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws500 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss501">
+ <property name="jboss.server.instance" value="default"/>
+ <property name="jbossws.integration.target" value="jboss501"/>
+ <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-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 -->
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -45,13 +45,20 @@
<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="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}"/>
@@ -63,6 +70,7 @@
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
<property name="jboss424.available.file" value="${jboss424.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
+ <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
@@ -70,6 +78,7 @@
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss424.available" file="${jboss424.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/src/main/distro/build.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -56,6 +56,7 @@
<condition property="jbossws.integration.jboss50" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
</or>
</condition>
<condition property="jbossws.integration.jboss51" value="true">
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 11:33:19 UTC (rev 9291)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 13:12:57 UTC (rev 9292)
@@ -97,10 +97,21 @@
<include>org.jboss.ws:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
- <!-- JBWS-2263 -->
+ <!-- JBWS-2505 -->
<!-- START -->
+ <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>runtime</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss501x:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
@@ -119,6 +130,7 @@
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
+ -->
<!-- END -->
</dependencySets>
</binaries>
More information about the jbossws-commits
mailing list