February 2009 - jbossws-commits - Jboss List Archives

JBossWS SVN: r9298 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-02-13 15:19:52 -0500 (Fri, 13 Feb 2009) New Revision: 9298 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-2505] fix pom Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 20:19:52 UTC (rev 9298) @@ -499,8 +499,6 @@ <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> - </exclusions> - <exclusions> <exclusion> <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId> @@ -591,8 +589,6 @@ <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> - </exclusions> - <exclusions> <exclusion> <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId> @@ -683,8 +679,6 @@ <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> - </exclusions> - <exclusions> <exclusion> <groupId>org.jboss.security</groupId> <artifactId>jbosssx</artifactId>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9297 - in stack/native/trunk: modules/core and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-02-13 15:14:18 -0500 (Fri, 13 Feb 2009) New Revision: 9297 Modified: stack/native/trunk/build.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/profiles.xml.example stack/native/trunk/src/main/distro/ant.properties.example stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/build-setup.xml stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2505] don't deploy AS integration layer Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/build.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -59,10 +59,13 @@ </condition> <condition property="jboss424.home" value="${profiles.profile.properties.jboss424.home}"> <isset property="profiles.profile.properties.jboss424.home"/> - </condition> + </condition> <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> @@ -76,6 +79,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}"/> @@ -84,6 +88,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/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/core/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -223,10 +223,19 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> </artifactItem> -  +   +   </artifactItems> </configuration> Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -73,6 +73,16 @@ </deployment> </footer> </concat> +  + <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-native-config.xml"/> + <footer trimleading="yes"> + </deployment> </footer> + </concat> +  <echo message="Concat jbossws-jboss510/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml"> @@ -82,7 +92,7 @@ <footer trimleading="yes"> </deployment> </footer> </concat> - +  <echo message="Concat jbossws-jboss600/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml"> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/management/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -50,10 +50,16 @@ <artifactId>jbossws-jboss500</artifactId> <scope>runtime</scope> </dependency> -  +   +   <dependency> <groupId>org.jboss.jaxr</groupId> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -199,6 +199,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-(a){jbossid}.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <macrodef name="macro-deploy-jbossws-client50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -208,9 +223,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> -  +   +   </fileset> </copy> @@ -226,9 +243,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> -  +   +   </fileset> </copy> @@ -244,9 +263,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> -  +   +   </fileset> </copy> @@ -425,6 +446,43 @@   + <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-(a){jbossid}/jbossws.beans"> + <include name="META-INF/**"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{artifactsdir}/resources"> + <include name="standard-*-config.xml"/> + </fileset> + </copy> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-(a){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"/> @@ -451,19 +509,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> -  +   +   </fileset> </copy> -  +   +   </sequential> </macrodef> @@ -494,19 +556,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> -  +   +   </fileset> </copy> -  +   +   </sequential> </macrodef> @@ -537,19 +603,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> -  +   +   </fileset> </copy> -  +   +   </sequential> </macrodef> @@ -569,6 +639,17 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-native500" 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}"/>  + <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-native50" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -652,6 +733,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> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + +  + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + +  + <delete dir="@{targetdir}"/> + +  + <delete dir="@{targetdir}/../juddi-service.sar"/> + + </sequential> + </macrodef> + <macrodef name="macro-undeploy-jbossws50"> <attribute name="defaultconf"/> <attribute name="targetdir"/> @@ -664,9 +781,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> -  +    +    @@ -703,9 +822,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> -  +    +    @@ -742,9 +863,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> -  +    +    Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -406,8 +406,6 @@ <jbossws.integration.target>jboss500</jbossws.integration.target> </properties> <dependencies> -  -  <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> @@ -418,11 +416,97 @@ </exclusion> </exclusions> </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.jbossas</groupId> + <artifactId>jboss-as-security</artifactId> + <version>${jboss.version}</version> + </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> +  + <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> +  + <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> + +  + <profile> + <id>jboss501</id> + <properties> + <jboss.version>5.0.1-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss501</jbossws.integration.target> + </properties> + <dependencies> +  +   + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + <exclusions> + <exclusion>  + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + </exclusions> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> + </dependency>  <dependency> <groupId>org.hibernate</groupId> @@ -457,13 +541,13 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration>  - <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>  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> @@ -486,23 +570,35 @@ <jbossws.integration.target>jboss510</jbossws.integration.target> </properties> <dependencies> -  +   - <dependency> +  + <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> </exclusions> - </dependency> -  + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + <exclusions> + <exclusion>  + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + </exclusions> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> + </dependency>  <dependency> <groupId>org.hibernate</groupId> @@ -566,23 +662,35 @@ <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> -  +   - <dependency> +  + <exclusion> Exclude old jaxws impl transitive dependency brought in by jboss-metadata <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> </exclusion> </exclusions> - </dependency> -  + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + <exclusions> + <exclusion>  + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + </exclusion> + </exclusions> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> + </dependency>  <dependency> <groupId>org.hibernate</groupId> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/pom.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -55,10 +55,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> -  +   +   <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -156,10 +159,23 @@ <classifier>resources</classifier> <type>zip</type> </dependency> -  +   +    <dependency> @@ -515,6 +532,18 @@ </profile>  + <profile> + <id>jboss501</id> + <properties> + <jbossws.integration.target>jboss501</jbossws.integration.target> + <jboss.home>${jboss501.home}</jboss.home> + </properties> + </profile> + +  Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/profiles.xml.example 2009-02-13 20:14:18 UTC (rev 9297) @@ -1,7 +1,7 @@ <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> - +  <profile> <id>jboss-home-profile</id> @@ -12,14 +12,15 @@ </activation> <properties> <java.jdk15.home>/usr/java/jdk1.5</java.jdk15.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_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> - + </profiles> </profilesXml> Modified: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/distro/ant.properties.example 2009-02-13 20:14:18 UTC (rev 9297) @@ -7,10 +7,11 @@ jboss423.home=(a)jboss423.home@ jboss424.home=(a)jboss424.home@ jboss500.home=(a)jboss500.home@ +jboss501.home=(a)jboss501.home@ jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|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/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -96,6 +96,17 @@   + <target name="deploy-structure-jboss500" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-native500" 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-native50" inheritall="false"> @@ -116,7 +127,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </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}"/> @@ -126,10 +137,32 @@ <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>  +  +  + + <target name="target-jboss501"> + <property name="jbossws.integration.target" value="jboss501"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <copy todir="${jboss501.home}" overwrite="true"> + <fileset dir="${deploy.structure}"/> + </copy> + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + </target> + +    @@ -172,7 +205,7 @@ <target name="deploy-structure-jboss60" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native51" inheritall="false"> + <antcall target="deploy-jbossws-native60" 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}"/> @@ -200,7 +233,7 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws51 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> </target>  Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/distro/build-setup.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -46,6 +46,13 @@ <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}"/> @@ -64,6 +71,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"/> @@ -71,6 +79,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/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/distro/build.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -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/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 20:03:59 UTC (rev 9296) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 20:14:18 UTC (rev 9297) @@ -100,10 +100,21 @@ <include>org.jboss.ws:jbossws-jboss424x:jar</include> </includes> </dependencySet> -  +   +   </dependencySets> </binaries>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9296 - stack/metro/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-02-13 15:03:59 -0500 (Fri, 13 Feb 2009) New Revision: 9296 Modified: stack/metro/trunk/src/main/distro/build-deploy.xml Log: [JBWS-2505] fix wrong macro reference Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-02-13 18:28:32 UTC (rev 9295) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-02-13 20:03:59 UTC (rev 9296) @@ -247,7 +247,7 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws51 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> </target>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9295 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-02-13 13:28:32 -0500 (Fri, 13 Feb 2009) New Revision: 9295 Modified: stack/cxf/trunk/pom.xml Log: [JBWS-2501] Updating to jaxb 2.1.9 to solve issue with jaxb customizations Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2009-02-13 15:10:28 UTC (rev 9294) +++ stack/cxf/trunk/pom.xml 2009-02-13 18:28:32 UTC (rev 9295) @@ -64,7 +64,7 @@ <fastinfoset.api.version>1.2.2</fastinfoset.api.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jaxb.api.version>2.1</jaxb.api.version> - <jaxb.impl.version>2.1.6</jaxb.impl.version> + <jaxb.impl.version>2.1.9</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> <jaxws.api.version>2.1-1</jaxws.api.version> <juddi.version>0.9RC4</juddi.version>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9294 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-02-13 10:10:28 -0500 (Fri, 13 Feb 2009) New Revision: 9294 Modified: stack/metro/trunk/modules/testsuite/pom.xml Log: [JBWS-2505] fix hudson regression Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2009-02-13 15:09:06 UTC (rev 9293) +++ stack/metro/trunk/modules/testsuite/pom.xml 2009-02-13 15:10:28 UTC (rev 9294) @@ -503,6 +503,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> </dependency>  <dependency> @@ -572,6 +578,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> </dependency>  <dependency> @@ -641,6 +653,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> </dependency>  <dependency>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9293 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-02-13 10:09:06 -0500 (Fri, 13 Feb 2009) New Revision: 9293 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-2505] fix hudson regression Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 13:12:57 UTC (rev 9292) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 15:09:06 UTC (rev 9293) @@ -472,6 +472,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> </dependency>  <dependency> @@ -536,6 +542,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> </dependency>  <dependency> @@ -600,6 +612,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </exclusion> + </exclusions> </dependency>  <dependency>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9292 - in stack/metro/trunk: modules/management and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)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> -  +   +   <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-(a){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"/> -  +   +   </fileset> </copy> @@ -253,9 +270,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> -  +   +   </fileset> </copy> @@ -271,9 +290,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> -  +   +   </fileset> </copy> @@ -449,6 +470,38 @@   + <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-(a){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-(a){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"/> -  +   +   </fileset> </copy> -  +   +   </sequential> </macrodef> @@ -508,19 +565,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> -  +   +   </fileset> </copy> -  +   +   </sequential> </macrodef> @@ -546,19 +607,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> -  +   +   </fileset> </copy> -  +   +   </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}"/>  + <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> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + +  + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + +  + <delete dir="@{targetdir}"/> + +  + <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"/> -  +    +  + --> +   <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"/> -  +    +  + --> +   <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"/> -  +    +  + --> +   <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> -  +   +   </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> +  + <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> +  <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> -  -  <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> +  + <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> +  + <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> + +  + <profile> + <id>jboss501</id> + <properties> + <jboss.version>5.0.1-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss501</jbossws.integration.target> + </properties> + <dependencies> +  +   + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + </dependency>  <dependency> <groupId>org.hibernate</groupId> @@ -472,13 +533,13 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration>  - <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>  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> @@ -501,17 +562,17 @@ <jbossws.integration.target>jboss510</jbossws.integration.target> </properties> <dependencies> -  +   - <dependency> +  + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + </dependency>  <dependency> <groupId>org.hibernate</groupId> @@ -560,8 +621,8 @@ </profile>  <profile> <id>jboss600</id> @@ -570,17 +631,17 @@ <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> -  +   - <dependency> +  + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + </dependency>  <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> -  +   +   <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> -  +   +    @@ -492,6 +509,18 @@ </profile>  + <profile> + <id>jboss501</id> + <properties> + <jbossws.integration.target>jboss501</jbossws.integration.target> + <jboss.home>${jboss501.home}</jboss.home> + </properties> + </profile> + +  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=(a)jboss423.home@ jboss424.home=(a)jboss424.home@ jboss500.home=(a)jboss500.home@ +jboss501.home=(a)jboss501.home@ jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|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 @@   + <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>  +  +  + + <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> + +    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> -  +   +   </dependencySets> </binaries>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9291 - in stack/cxf/trunk: modules/management and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-02-13 06:33:19 -0500 (Fri, 13 Feb 2009) New Revision: 9291 Added: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/profiles.xml.example stack/cxf/trunk/src/main/distro/ant.properties.example stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build-setup.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2505] don't deploy AS integration layer Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/build.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -10,7 +10,7 @@  <project basedir="." name="JBossWS-CXF"> - +    @@ -24,19 +24,19 @@ <property name="stack.server.dir" value="${stack.modules.dir}/server"/> <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/> <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> - + <import file="${stack.distro.dir}/build-setup.xml"/> <import file="${stack.distro.dir}/build-deploy.xml"/> <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> - + <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"/> - +    - + <target name="os-init"> <condition property="ext" value=".bat"> <not> @@ -67,46 +67,51 @@ <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}"> <isset property="profiles.profile.properties.jboss500.home"/> </condition> + <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}"> + <isset property="profiles.profile.properties.jboss501.home"/> + </condition> <condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}"> <isset property="profiles.profile.properties.jboss510.home"/> </condition> <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}"> <isset property="profiles.profile.properties.jboss600.home"/> </condition> - +  <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> <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}"/> <property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/> <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/> - + <echo/> <echo message="jboss422.home=${jboss422.home}"/> <echo message="jboss423.home=${jboss423.home}"/> <echo message="jboss424.home=${jboss424.home}"/> <echo message="jboss500.home=${jboss500.home}"/> + <echo message="jboss501.home=${jboss501.home}"/> <echo message="jboss510.home=${jboss510.home}"/> <echo message="jboss600.home=${jboss600.home}"/> </target> - + <target name="init" depends="mvn-settings,prepare,os-init"> <xmlproperty file="${stack.dir}/pom.xml"/> <property name="version.id" value="${project.version}"/> - + <echo message="version.id=${version.id}"/> <echo message="integration.target=${jbossws.integration.target}"/> - + <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/> </target> - +    - + <target name="prepare-deploy" depends="prepare,os-init">  Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/modules/management/pom.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -50,10 +50,16 @@ <artifactId>jbossws-jboss500</artifactId> <scope>runtime</scope> </dependency> -  +   +   <dependency> <groupId>org.jboss.jaxr</groupId> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -141,7 +141,7 @@ </copy> </sequential> </macrodef> - + <macrodef name="macro-deploy-jbossws-lib51"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -222,6 +222,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-(a){jbossid}.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + <macrodef name="macro-deploy-jbossws-client50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -231,9 +246,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> -  +   +   </fileset> </copy> @@ -249,9 +266,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> -  +   +   </fileset> </copy> @@ -267,9 +286,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> -  +   +   </fileset> </copy> @@ -448,6 +469,38 @@   + <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-(a){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-(a){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"/> @@ -469,19 +522,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> -  +   +   </fileset> </copy> -  +   +   </sequential> </macrodef> @@ -507,19 +564,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> -  +   +   </fileset> </copy> -  +   +   </sequential> </macrodef> @@ -545,19 +606,23 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> -  +   +   </fileset> </copy> -  +   +   </sequential> </macrodef> @@ -576,6 +641,17 @@ <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> + <target name="deploy-jbossws-cxf500" 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}"/>  + <macro-deploy-jbossws-cxf50-sar 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-cxf50" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -655,6 +731,41 @@ </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> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + +  + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + +  + <delete dir="@{targetdir}"/> + +  + <delete dir="@{targetdir}/../juddi-service.sar"/> + + </sequential> + </macrodef> + <macrodef name="macro-undeploy-jbossws50"> <attribute name="defaultconf"/> <attribute name="targetdir"/> @@ -667,9 +778,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> -  +    +    @@ -706,9 +819,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> -  +    +    @@ -745,9 +860,10 @@ <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> -  +    +    Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/modules/server/pom.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -241,10 +241,19 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> </artifactItem> -  +   +   </artifactItems> </configuration> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -73,6 +73,16 @@ </deployment> </footer> </concat> +  + <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-cxf-config.xml"/> + <footer trimleading="yes"> + </deployment> </footer> + </concat> +  <echo message="Concat jbossws-jboss510/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml"> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -1,11 +1,11 @@ <project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBoss Web Services - Stack CXF Testsuite</name> <artifactId>jbossws-cxf-testsuite</artifactId> <packaging>pom</packaging> - +  <parent> <groupId>org.jboss.ws.cxf</groupId> @@ -13,7 +13,7 @@ <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - +  <properties> <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args> @@ -25,15 +25,16 @@ <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <hibernate.version>3.2.4.sp1</hibernate.version> <asm.version>2.2.3</asm.version> + <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> </properties> - +  <modules> <module>cxf-tests</module> <module>framework-tests</module> </modules> - +  <dependencies> <dependency> @@ -92,7 +93,7 @@ <artifactId>commons-logging</artifactId> </dependency> </dependencies> - +  <build> <testResources> @@ -225,13 +226,13 @@ </plugin> </plugins> </build> - +  <profiles> - -  <profile> <id>debug</id> @@ -255,8 +256,8 @@ <surefire.jvm.args>${surefire.security.args} ${surefire.memory.args}</surefire.jvm.args> </properties> </profile> - -  @@ -273,17 +274,16 @@ </plugins> </build> </profile> - -  <profile> <id>jboss422</id> <properties> <jboss.version>4.2.2.GA</jboss.version> <jbossws.integration.target>jboss422</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet> </properties> <dependencies> <dependency> @@ -314,17 +314,16 @@ </plugins> </build> </profile> - -  <profile> <id>jboss423</id> <properties> <jboss.version>4.2.3.GA</jboss.version> <jbossws.integration.target>jboss423</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet> </properties> <dependencies> <dependency> @@ -355,17 +354,16 @@ </plugins> </build> </profile> - -  <profile> <id>jboss424</id> <properties> <jboss.version>4.2.4-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss424</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet> </properties> <dependencies> <dependency> @@ -396,30 +394,85 @@ </plugins> </build> </profile> - -  <profile> <id>jboss500</id> <properties> <jboss.version>5.0.0.GA</jboss.version> <jbossws.integration.target>jboss500</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet> </properties> <dependencies> -  -  <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> </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> +  + <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> +  + <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> + +  + <profile> + <id>jboss501</id> + <properties> + <jboss.version>5.0.1-SNAPSHOT</jboss.version> + <jbossws.integration.target>jboss501</jbossws.integration.target> + </properties> + <dependencies> +  +   + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + </dependency>  <dependency> <groupId>org.jboss.jbossas</groupId> @@ -444,13 +497,13 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration>  - <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>  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> @@ -461,30 +514,29 @@ </plugins> </build> </profile> - -  <profile> <id>jboss510</id> <properties> <jboss.version>5.1.0-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss510</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet> </properties> <dependencies> -  +   - <dependency> +  + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + </dependency>  <dependency> <groupId>org.jboss.jbossas</groupId> @@ -527,29 +579,28 @@ </build> </profile> -  <profile> <id>jboss600</id> <properties> <jboss.version>6.0.0-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> - <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet> </properties> <dependencies> -  +   - <dependency> +  + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> - </dependency--> + </dependency>  <dependency> <groupId>org.jboss.jbossas</groupId> @@ -630,5 +681,5 @@ </properties> </profile> </profiles> - + </project> Added: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-02-13 11:33:19 UTC (rev 9291) @@ -0,0 +1,77 @@ +# Exclude endpoints with AS42 @SecurityDomain +org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointImpl.* + +# TODO: Fix classpath to ClientLauncher +org/jboss/test/ws/jaxws/samples/webserviceref/** + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1253] CXF does not respect @HandlerChain on client SEI +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.* + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** + +# [CXF-1513] NPE in JaxWsServiceConfiguration +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1797/** + +# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [CXF-1516] Type inheritance with document/literal/wrapped +org/jboss/test/ws/jaxws/jbws1702/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1520] MTOM chunked encoding transfer +org/jboss/test/ws/jaxws/jbws2000/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-1624] XmlSchemaException: Schema name conflict in collection +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.* + +# [CXF-2006] RespectBinding feature and not understood required extensibility elements +org/jboss/test/ws/jaxws/jbws2449/** + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* + +# [JBWS-1655] Add support for endpoint address rewriting +org/jboss/test/ws/jaxws/jbws2150/** + +# [JBWS-2115] EJB client vehicle not sufficiently isolated +org/jboss/test/ws/jaxws/jbws1581/** + +# [JBWS-2165] Fix xop tests with maven build +org/jboss/test/ws/jaxws/samples/xop/** + +# [JBWS-2223] wsconsume for cxf build +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-2330] Failed to deploy service with multiple bindings +org/jboss/test/ws/jaxws/jbws2278/** + +# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-2478] Investigate why WS-Security CXF tests are failing +org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.* + +# [JBWS-2480] Soap attachments are dropped on server response +org/jboss/test/ws/jaxws/jbws1283/** Property changes on: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt ___________________________________________________________________ Name: svn:executable + * Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/pom.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -51,10 +51,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> -  +   +   <cxf.version>2.1.4</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> @@ -151,10 +154,23 @@ <classifier>resources</classifier> <type>zip</type> </dependency> -  +   +   - +  <dependency> <groupId>javax.ejb</groupId> @@ -525,10 +542,10 @@ </plugins> </build> </profile> - -  <profile> <id>jboss422</id> @@ -537,10 +554,10 @@ <jboss.home>${jboss422.home}</jboss.home> </properties> </profile> - -  <profile> <id>jboss423</id> @@ -549,10 +566,10 @@ <jboss.home>${jboss423.home}</jboss.home> </properties> </profile> - -  <profile> <id>jboss424</id> @@ -561,10 +578,10 @@ <jboss.home>${jboss424.home}</jboss.home> </properties> </profile> - -  <profile> <id>jboss500</id> @@ -573,10 +590,22 @@ <jboss.home>${jboss500.home}</jboss.home> </properties> </profile> - -  + <profile> + <id>jboss501</id> + <properties> + <jbossws.integration.target>jboss501</jbossws.integration.target> + <jboss.home>${jboss501.home}</jboss.home> + </properties> + </profile> + +  <profile> <id>jboss510</id> @@ -585,10 +614,10 @@ <jboss.home>${jboss510.home}</jboss.home> </properties> </profile> - -  <profile> <id>jboss600</id> @@ -597,10 +626,10 @@ <jboss.home>${jboss600.home}</jboss.home> </properties> </profile> - -  <profile> <id>smoketest</id> Modified: stack/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/profiles.xml.example 2009-02-13 11:33:19 UTC (rev 9291) @@ -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/cxf/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-02-13 11:33:19 UTC (rev 9291) @@ -7,10 +7,11 @@ jboss423.home=(a)jboss423.home@ jboss424.home=(a)jboss424.home@ jboss500.home=(a)jboss500.home@ +jboss501.home=(a)jboss501.home@ jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|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/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -96,6 +96,17 @@   + <target name="deploy-structure-jboss500" depends="prepare-deploy"> + <delete dir="${deploy.structure}"/> + <antcall target="deploy-jbossws-cxf500" 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-cxf50" inheritall="false"> @@ -116,7 +127,7 @@ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </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}"/> @@ -126,10 +137,32 @@ <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>  +  +  + + <target name="target-jboss501"> + <property name="jbossws.integration.target" value="jboss501"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <copy todir="${jboss501.home}" overwrite="true"> + <fileset dir="${deploy.structure}"/> + </copy> + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + </target> + +    Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -46,14 +46,21 @@ <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.lib" value="${jboss600.home}/lib"/> <property name="jboss600.client" value="${jboss600.home}/client"/> <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/> <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/> @@ -64,6 +71,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"/> @@ -71,6 +79,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/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/src/main/distro/build.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -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/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 06:32:11 UTC (rev 9290) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 11:33:19 UTC (rev 9291) @@ -109,10 +109,21 @@ <include>org.jboss.ws:jbossws-jboss424x:jar</include> </includes> </dependencySet> -  +   +   </dependencySets> </binaries>

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9290 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-02-13 01:32:11 -0500 (Fri, 13 Feb 2009) New Revision: 9290 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt Log: excluding dar jms test case as well Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-12 12:07:36 UTC (rev 9289) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-13 06:32:11 UTC (rev 9290) @@ -15,4 +15,4 @@ # [JBAOP-703] NPE in ScopedVFSClassLoaderDomain org/jboss/test/ws/jaxrpc/samples/jmstransport/*TestCase.* org/jboss/test/ws/jaxws/samples/jmstransport/*TestCase.* - +org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-12 12:07:36 UTC (rev 9289) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-13 06:32:11 UTC (rev 9290) @@ -15,4 +15,4 @@ # [JBAOP-703] NPE in ScopedVFSClassLoaderDomain org/jboss/test/ws/jaxrpc/samples/jmstransport/*TestCase.* org/jboss/test/ws/jaxws/samples/jmstransport/*TestCase.* - +org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*

15 years, 10 months

1
0
0 / 0

JBossWS SVN: r9289 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-02-12 07:07:36 -0500 (Thu, 12 Feb 2009) New Revision: 9289 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt Log: [JBWS-2433] only jmstransport related tests are failing Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-12 09:47:37 UTC (rev 9288) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-02-12 12:07:36 UTC (rev 9289) @@ -15,5 +15,4 @@ # [JBAOP-703] NPE in ScopedVFSClassLoaderDomain org/jboss/test/ws/jaxrpc/samples/jmstransport/*TestCase.* org/jboss/test/ws/jaxws/samples/jmstransport/*TestCase.* -org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-12 09:47:37 UTC (rev 9288) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-02-12 12:07:36 UTC (rev 9289) @@ -15,5 +15,4 @@ # [JBAOP-703] NPE in ScopedVFSClassLoaderDomain org/jboss/test/ws/jaxrpc/samples/jmstransport/*TestCase.* org/jboss/test/ws/jaxws/samples/jmstransport/*TestCase.* -org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.*

15 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2009