[jbossws-commits] JBossWS SVN: r9845 - in stack/metro/trunk: modules/management and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Apr 20 07:11:00 EDT 2009
Author: richard.opalka at jboss.com
Date: 2009-04-20 07:11:00 -0400 (Mon, 20 Apr 2009)
New Revision: 9845
Added:
stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
Removed:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.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/Install.txt
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2612] removing AS 4x support
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/build.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/management/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf (rev 0)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as4-default-deploy.conf 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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/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-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -122,19 +122,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"/>
@@ -184,20 +171,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"/>
@@ -215,21 +188,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="**/jbossws-@{jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-client50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -289,21 +247,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="**/jbossws-@{jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-server-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -373,38 +316,6 @@
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-sar42">
- <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="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-metro-management.war"/>
- </fileset>
- </unzip>
- <copy todir="@{targetdir}/jbossws.beans">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws-jboss42.sar/META-INF"/>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-sar50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -574,16 +485,6 @@
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
- <target name="deploy-jbossws-metro42" 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-sar42 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-metro50" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -627,42 +528,6 @@
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws42">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- delete stale container integration jars -->
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
<macrodef name="macro-undeploy-jbossws50">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/server/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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>
-
<!-- Metro dependencies -->
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
@@ -145,14 +137,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>
@@ -204,8 +188,6 @@
</goals>
<configuration>
<tasks>
- <property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}" />
- <property name="jbossws.jboss424.version" value="${jbossws.jboss424.version}" />
<ant antfile="src/main/scripts/antrun-beans-config.xml" />
</tasks>
</configuration>
Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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">
- <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"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -287,51 +287,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</groupId>
- <artifactId>jnpserver</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/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-20 11:11:00 UTC (rev 9845)
@@ -1,65 +0,0 @@
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/jbws2307/**
-
-# Exclude endpoints with AS5 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-1841] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [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-2074] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-
-# [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-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2257] Wrong WebServiceContext injected in EJB3 endpoints
-org/jboss/test/ws/jaxws/jbws2257/**
-
-# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [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-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/**
-
-# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only)
-org/jboss/test/ws/jaxws/jbws2527/**
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/pom.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -47,7 +47,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 -->
@@ -104,18 +103,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>
@@ -443,18 +430,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/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/profiles.xml.example 2009-04-20 11:11:00 UTC (rev 9845)
@@ -11,7 +11,6 @@
</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>
Modified: stack/metro/trunk/src/main/distro/Install.txt
===================================================================
--- stack/metro/trunk/src/main/distro/Install.txt 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/Install.txt 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-04-20 11:11:00 UTC (rev 9845)
@@ -3,13 +3,12 @@
#
# Optional JBoss Home
-jboss423.home=@jboss423.home@
jboss500.home=@jboss500.home@
jboss501.home=@jboss501.home@
jboss510.home=@jboss510.home@
jboss600.home=@jboss600.home@
-# The JBoss server under test. This can be [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/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -12,45 +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-metro42" 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="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target" value="jboss423"/>
- <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-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 -->
<!-- ================================================================== -->
@@ -86,7 +47,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>
<!-- ================================================================== -->
@@ -110,7 +71,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>
<!-- ================================================================== -->
@@ -149,7 +110,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>
<!-- ================================================================== -->
@@ -188,7 +149,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/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -20,12 +20,6 @@
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
- <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}"/>
@@ -54,13 +48,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/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/distro/build.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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.as4.default.deploy.conf" value="${build.dir}/jbossws-as4-default-deploy.conf"/>
- <property name="jbossws.as5.default.deploy.conf" value="${build.dir}/jbossws-as5-default-deploy.conf"/>
+ <property name="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/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -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/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 10:54:33 UTC (rev 9844)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-04-20 11:11:00 UTC (rev 9845)
@@ -79,7 +79,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>
More information about the jbossws-commits
mailing list