[jbossws-commits] JBossWS SVN: r9844 - in stack/cxf/trunk: modules/management and 6 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-04-20 06:54:33 -0400 (Mon, 20 Apr 2009) New Revision: 9844 Added: stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf Removed: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.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/Install.txt 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-bin-dist.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2612] removing AS 4x support Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/build.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -29,8 +29,7 @@ <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="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- ================================================================== --> @@ -55,9 +54,6 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}"> - <isset property="profiles.profile.properties.jboss423.home"/> - </condition> <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}"> <isset property="profiles.profile.properties.jboss500.home"/> </condition> @@ -73,14 +69,12 @@ <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> - <property name="jboss423.home" value="${profiles.profile.properties.jboss423.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="jboss423.home=${jboss423.home}"/> <echo message="jboss500.home=${jboss500.home}"/> <echo message="jboss501.home=${jboss501.home}"/> <echo message="jboss510.home=${jboss510.home}"/> Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/modules/management/pom.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -31,11 +31,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <scope>provided</scope> </dependency> Added: stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar 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-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -118,19 +118,6 @@ <!-- Deploy Lib --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-lib42"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - <macrodef name="macro-deploy-jbossws-lib50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -180,20 +167,6 @@ <!-- Deploy Lib Endorsed --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-endorsed42"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.endorsed.patternset"/> - <include name="**/stax-api.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - <macrodef name="macro-deploy-jbossws-endorsed"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -211,21 +184,6 @@ <!-- Deploy Client --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-client42"> - <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=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - </sequential> - </macrodef> - <macrodef name="macro-deploy-jbossws-client50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -285,21 +243,6 @@ <!-- Deploy Server Lib --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-server-lib42"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - </sequential> - </macrodef> - <macrodef name="macro-deploy-jbossws-server-lib50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -369,41 +312,6 @@ <!-- Deploy JBossWS Service --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-cxf42-sar"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; - </copy> - </sequential> - </macrodef> - <macrodef name="macro-deploy-jbossws-cxf50-sar"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> @@ -573,16 +481,6 @@ <!-- Deploy JBossWS --> <!-- ================================================================== --> - <target name="deploy-jbossws-cxf42" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed42 targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" 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}"/> @@ -626,42 +524,6 @@ <!-- Undeploy JBossWS --> <!-- ================================================================== --> - <macrodef name="macro-undeploy-jbossws42"> - <attribute name="defaultconf"/> - <attribute name="targetdir"/> - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - - <!-- delete stale container integration jars --> - <delete> - <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/client"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - - <!-- delete content of last deployment --> - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - - <!-- delete jbossws.sar --> - <delete dir="@{targetdir}"/> - - <!-- delete juddi-service.sar --> - <delete dir="@{targetdir}/../juddi-service.sar"/> - - </sequential> - </macrodef> - <macrodef name="macro-undeploy-jbossws50"> <attribute name="defaultconf"/> <attribute name="targetdir"/> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/modules/server/pom.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -25,14 +25,6 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - <version>${jbossws.jboss423.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <!-- CXF dependencies --> <dependency> <groupId>org.apache.cxf</groupId> @@ -204,14 +196,6 @@ <artifactItems> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - <version>${jbossws.jboss423.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> @@ -263,7 +247,6 @@ </goals> <configuration> <tasks> - <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}" /> <ant antfile="src/main/scripts/antrun-beans-config.xml" /> </tasks> </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-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -27,18 +27,6 @@ <!-- Compile resource files --> <target name="main" depends="init"> - <!-- Concat jbossws-jboss423/jbossws.beans --> - <echo message="Concat jbossws-jboss423/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" - xmlns="urn:jboss:bean-deployer"&gt; </header> - <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - <!-- Concat jbossws-jboss500/jbossws.beans --> <echo message="Concat jbossws-jboss500/jbossws.beans"/> <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml"> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -276,46 +276,6 @@ </profile> <!-- - Name: jboss423 - Descr: JBoss-4.2.3 specific options - --> - <profile> - <id>jboss423</id> - <properties> - <jboss.version>4.2.3.GA</jboss.version> - <jbossws.integration.target>jboss423</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jbossall-client</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss423.txt</testExcludeFile> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss423.home}/lib/endorsed</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss500 Descr: JBoss-5.0.0 specific options --> Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 10:54:33 UTC (rev 9844) @@ -1,94 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [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-1514][JBWS-2247] 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/bare -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-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-2006] RespectBinding feature and not understood required extensibility elements -org/jboss/test/ws/jaxws/jbws2449/** - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-1655] Add support for endpoint address rewriting -org/jboss/test/ws/jaxws/jbws2150/** - -# [JBWS-2074] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2571] Mode.INOUT parameter not generated -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed -org/jboss/test/ws/jaxws/jbws2241/** - -# [JBWS-2307] Stub properties not propagated through service-ref (fixed in AS 5.x and above) -org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.* - -# [JBWS-2330] Failed to deploy service with multiple bindings -org/jboss/test/ws/jaxws/jbws2278/** - -# [JBWS-2480] Soap attachments are dropped on server response -org/jboss/test/ws/jaxws/jbws1283/** - -# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods -org/jboss/test/ws/jaxws/jbws2257/** - -# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only) -org/jboss/test/ws/jaxws/jbws2527/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be -# used when wsdl contains mutiple schemas -org/jboss/test/ws/jaxws/complex/** - -# [JBWS-2584] Provider endpoint causes NPE in AbstractPolicyInterceptor -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl -org/jboss/test/ws/jaxws/jbws2591/** - -# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI -org/jboss/test/ws/jaxws/jbws2593/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/pom.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -46,7 +46,6 @@ <jbossws.common.version>1.0.11-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>3.2.0-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>1.1.1.GA</jbossws.spi.version> - <jbossws.jboss423.version>3.1.1.GA</jbossws.jboss423.version> <jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version> <jbossws.jboss501.version>3.1.1.GA</jbossws.jboss501.version> <!-- JBWS-2505 --> @@ -107,18 +106,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - <version>${jbossws.jboss423.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss423</artifactId> - <version>${jbossws.jboss423.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <version>${jbossws.jboss500.version}</version> </dependency> @@ -531,18 +518,6 @@ </profile> <!-- - Name: jboss423 - Descr: JBoss-4.2.2 specific options - --> - <profile> - <id>jboss423</id> - <properties> - <jbossws.integration.target>jboss423</jbossws.integration.target> - <jboss.home>${jboss423.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss500 Descr: JBoss-5.0.0 specific options --> Modified: stack/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/profiles.xml.example 2009-04-20 10:54:33 UTC (rev 9844) @@ -11,10 +11,9 @@ </property> </activation> <properties> - <jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.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> + <jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.CR1</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/Install.txt =================================================================== --- stack/cxf/trunk/src/main/distro/Install.txt 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/src/main/distro/Install.txt 2009-04-20 10:54:33 UTC (rev 9844) @@ -13,7 +13,6 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss42x ant deploy-jboss50x ant deploy-jboss51x ant deploy-jboss60x Modified: stack/cxf/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-04-20 10:54:33 UTC (rev 9844) @@ -3,13 +3,12 @@ # # Optional JBoss Home -jboss423.home=(a)jboss423.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 [jboss423|jboss500|jboss501|jboss510|jboss600] +# The JBoss server under test. This can be [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-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -12,43 +12,6 @@ <project> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-4.2.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss42" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf42" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss423 --> - <!-- ================================================================== --> - - <target name="target-jboss423"> - <property name="jbossws.integration.target" value="jboss423"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423"> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <copy todir="${jboss423.home}" overwrite="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423"> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> - </target> - - <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> @@ -82,7 +45,7 @@ <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-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> <!-- ================================================================== --> @@ -104,7 +67,7 @@ <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}"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> <!-- ================================================================== --> @@ -141,7 +104,7 @@ <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> <!-- ================================================================== --> @@ -178,7 +141,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-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/> + <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -21,12 +21,6 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - <property name="jboss500.lib" value="${jboss500.home}/lib"/> <property name="jboss500.client" value="${jboss500.home}/client"/> <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> @@ -55,13 +49,11 @@ <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/> <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/> - <property name="jboss423.available.file" value="${jboss423.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"/> - <available property="jboss423.available" file="${jboss423.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}"/> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/src/main/distro/build.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -22,8 +22,7 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/> - <property name="jbossws.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- Check if ant.properties is available --> @@ -46,11 +45,6 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> <condition property="jbossws.integration.jboss50" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -39,8 +39,7 @@ <directory>modules/resources/src/main/resources/resources</directory> <outputDirectory>build</outputDirectory> <includes> - <include>jbossws-as5-default-deploy.conf</include> - <include>jbossws-as4-default-deploy.conf</include> + <include>default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes> </fileSet> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 09:56:06 UTC (rev 9843) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 10:54:33 UTC (rev 9844) @@ -92,7 +92,6 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-framework:jar</include> - <include>org.jboss.ws:jbossws-jboss423:jar</include> <include>org.jboss.ws:jbossws-jboss500:jar</include> <include>org.jboss.jaxr:juddi-service:sar</include> <include>apache-scout:scout:jar</include>