Author: alessio.soldano(a)jboss.com Date: 2009-03-04 07:52:02 -0500 (Wed, 04 Mar 2009) New Revision: 9481 Removed: stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt 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/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-2568] Removing 4.2.4 support Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/build.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -54,9 +54,6 @@ <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}"> <isset property="profiles.profile.properties.jboss423.home"/> </condition> - <condition property="jboss424.home" value="${profiles.profile.properties.jboss424.home}"> - <isset property="profiles.profile.properties.jboss424.home"/> - </condition> <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}"> <isset property="profiles.profile.properties.jboss500.home"/> </condition> @@ -73,7 +70,6 @@ <!-- 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="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}"/> @@ -81,7 +77,6 @@ <echo/> <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}"/> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/modules/core/pom.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -201,14 +201,6 @@ </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss424x</artifactId> - <version>${jbossws.jboss424.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <version>${jbossws.jboss500.version}</version> <classifier>resources</classifier> 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-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -39,18 +39,6 @@ &lt;/deployment&gt; </footer> </concat> - <!-- Concat jbossws-jboss424/jbossws.beans --> - <echo message="Concat jbossws-jboss424/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss424/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-native-config.xml"/> - <fileset file="${project.build.resources.directory}/jbossws-jboss424/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/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/modules/management/pom.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -37,11 +37,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss424x</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <scope>runtime</scope> </dependency> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -320,46 +320,6 @@ </profile> <!-- - Name: jboss424 - Descr: JBoss-4.2.4 specific options - --> - <profile> - <id>jboss424</id> - <properties> - <jboss.version>4.2.4-SNAPSHOT</jboss.version> - <jbossws.integration.target>jboss424</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-jboss424x</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss424.home}/lib/endorsed</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss500 Descr: JBoss-5.0.0 specific options --> Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-03-04 12:52:02 UTC (rev 9481) @@ -1,30 +0,0 @@ -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** -org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.* - -# Exclude endpoints with AS5 @SecurityDomain -org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAAS5Endpoint.* -org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMAS5Endpoint.* - -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* - -# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5 -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk) -org/jboss/test/ws/tools/enums/EnumTestCase.* - -# [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-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 and above) -org/jboss/test/ws/jaxws/jbws2527/** Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/pom.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -52,7 +52,6 @@ <jbossws.framework.version>3.1.1-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>1.1.1-SNAPSHOT</jbossws.spi.version> <jbossws.jboss423.version>3.1.0.GA</jbossws.jboss423.version> - <jbossws.jboss424.version>3.1.0.GA</jbossws.jboss424.version> <jbossws.jboss500.version>3.1.0.GA</jbossws.jboss500.version> <jbossws.jboss501.version>3.1.0.GA</jbossws.jboss501.version> <!-- [JBWS-2505] --> @@ -124,18 +123,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss424x</artifactId> - <version>${jbossws.jboss424.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss424x</artifactId> - <version>${jbossws.jboss424.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> @@ -483,18 +470,6 @@ </profile> <!-- - Name: jboss424 - Descr: JBoss-4.2.4 specific options - --> - <profile> - <id>jboss424</id> - <properties> - <jbossws.integration.target>jboss424</jbossws.integration.target> - <jboss.home>${jboss424.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss500 Descr: JBoss-5.0.0 specific options --> Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/profiles.xml.example 2009-03-04 12:52:02 UTC (rev 9481) @@ -13,7 +13,6 @@ <properties> <java.jdk15.home>/usr/java/jdk1.5</java.jdk15.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> Modified: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/src/main/distro/ant.properties.example 2009-03-04 12:52:02 UTC (rev 9481) @@ -4,13 +4,12 @@ # Optional JBoss Home 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 [jboss423|jboss424|jboss500|jboss501|jboss510|jboss600] +# The JBoss server under test. This can be [jboss423|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-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -49,28 +49,6 @@ </target> <!-- ================================================================== --> - <!-- Deployment JBoss424 --> - <!-- ================================================================== --> - - <target name="target-jboss424"> - <property name="jbossws.integration.target" value="jboss424"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss424" depends="undeploy-jboss424,deploy-structure-jboss42" description="Deploy jbossws to jboss424"> - <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/> - <copy todir="${jboss424.home}" overwrite="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424"> - <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/> - <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> - </target> - - <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/src/main/distro/build-setup.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -27,12 +27,6 @@ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - <property name="jboss424.lib" value="${jboss424.home}/lib"/> - <property name="jboss424.client" value="${jboss424.home}/client"/> - <property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/> - <property name="jboss424.server.lib" value="${jboss424.server}/lib"/> - <property name="jboss424.server.deploy" value="${jboss424.server}/deploy"/> - <property name="jboss500.lib" value="${jboss500.home}/lib"/> <property name="jboss500.client" value="${jboss500.home}/client"/> <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> @@ -62,14 +56,12 @@ <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/> <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"/> <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}"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/src/main/distro/build.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -49,7 +49,6 @@ <condition property="jbossws.integration.jboss42" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss424"/> </or> </condition> <condition property="jbossws.integration.jboss50" value="true"> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-04 12:00:54 UTC (rev 9480) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-04 12:52:02 UTC (rev 9481) @@ -91,16 +91,6 @@ </dependencySet> <dependencySet> <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss424x:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope>