Author: richard.opalka(a)jboss.com Date: 2009-02-23 09:24:20 -0500 (Mon, 23 Feb 2009) New Revision: 9348 Removed: stack/native/trunk/modules/testsuite/test-excludes-jboss422.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: removing AS 422 support Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/build.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -51,9 +51,6 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss422.home" value="${profiles.profile.properties.jboss422.home}"> - <isset property="profiles.profile.properties.jboss422.home"/> - </condition> <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}"> <isset property="profiles.profile.properties.jboss423.home"/> </condition> @@ -75,7 +72,6 @@ <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> - <property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/> <property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/> <property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/> <property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/> @@ -84,7 +80,6 @@ <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/> <echo/> - <echo message="jboss422.home=${jboss422.home}"/> <echo message="jboss423.home=${jboss423.home}"/> <echo message="jboss424.home=${jboss424.home}"/> <echo message="jboss500.home=${jboss500.home}"/> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/modules/core/pom.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -193,14 +193,6 @@ <artifactItems> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - <version>${jbossws.jboss422.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss422</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> <version>${jbossws.jboss423.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-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -27,18 +27,6 @@ <!-- Compile resource files --> <target name="main" depends="init"> - <!-- Concat jbossws-jboss422/jbossws.beans --> - <echo message="Concat jbossws-jboss422/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss422/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-jboss422/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; </footer> - </concat> - <!-- 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"> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/modules/management/pom.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -32,11 +32,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> <scope>runtime</scope> </dependency> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -280,46 +280,6 @@ </profile> <!-- - Name: jboss422 - Descr: JBoss-4.2.2 specific options - --> - <profile> - <id>jboss422</id> - <properties> - <jboss.version>4.2.2.GA</jboss.version> - <jbossws.integration.target>jboss422</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-jboss422</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss423 Descr: JBoss-4.2.3 specific options --> Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-23 14:24:20 UTC (rev 9348) @@ -1,46 +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 endpoint 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-1762] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [JBWS-1797] Setting .NET friendly Endpoint in web.xml -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-1813] context-root from jboss.xml -org/jboss/test/ws/jaxws/jbws1813/** - -# [JBWS-1841] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [JBWS-1911] Support the JMS transport with JAX-WS -org/jboss/test/ws/jaxws/samples/jmstransport/** -org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.* - -# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed -org/jboss/test/ws/jaxws/jbws2241/** - -# [JBWS-2258] Fix EnumTestCase (fixed in AS trunk) -org/jboss/test/ws/tools/enums/EnumTestCase.* - -# [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-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/pom.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -51,7 +51,6 @@ <jbossws.common.version>1.0.9-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>3.1.0-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>1.1.0-SNAPSHOT</jbossws.spi.version> - <jbossws.jboss422.version>3.1.0-SNAPSHOT</jbossws.jboss422.version> <jbossws.jboss423.version>3.1.0-SNAPSHOT</jbossws.jboss423.version> <jbossws.jboss424.version>3.1.0-SNAPSHOT</jbossws.jboss424.version> <jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version> @@ -113,18 +112,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - <version>${jbossws.jboss422.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss422</artifactId> - <version>${jbossws.jboss422.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> <version>${jbossws.jboss423.version}</version> </dependency> @@ -484,18 +471,6 @@ </profile> <!-- - Name: jboss422 - Descr: JBoss-4.2.2 specific options - --> - <profile> - <id>jboss422</id> - <properties> - <jbossws.integration.target>jboss422</jbossws.integration.target> - <jboss.home>${jboss422.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss423 Descr: JBoss-4.2.3 specific options --> Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/profiles.xml.example 2009-02-23 14:24:20 UTC (rev 9348) @@ -12,7 +12,6 @@ </activation> <properties> <java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home> - <jboss422.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> <jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> <jboss424.home>/home/opalka/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home> <jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home> Modified: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/src/main/distro/ant.properties.example 2009-02-23 14:24:20 UTC (rev 9348) @@ -3,7 +3,6 @@ # # Optional JBoss Home -jboss422.home=(a)jboss422.home@ jboss423.home=(a)jboss423.home@ jboss424.home=(a)jboss424.home@ jboss500.home=(a)jboss500.home@ @@ -11,7 +10,7 @@ jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510|jboss600] +# The JBoss server under test. This can be [jboss423|jboss424|jboss500|jboss501|jboss510|jboss600] jbossws.integration.target=jboss500 # The JBoss settings Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -27,28 +27,6 @@ </target> <!-- ================================================================== --> - <!-- Deployment JBoss422 --> - <!-- ================================================================== --> - - <target name="target-jboss422"> - <property name="jbossws.integration.target" value="jboss422"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <copy todir="${jboss422.home}" overwrite="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422"> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/> - </target> - - <!-- ================================================================== --> <!-- Deployment JBoss423 --> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/src/main/distro/build-setup.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -21,12 +21,6 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - <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}"/> @@ -67,7 +61,6 @@ <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/> <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/> - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> <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"/> @@ -75,7 +68,6 @@ <property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/> <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> - <available property="jboss422.available" file="${jboss422.available.file}"/> <available property="jboss423.available" file="${jboss423.available.file}"/> <available property="jboss424.available" file="${jboss424.available.file}"/> <available property="jboss500.available" file="${jboss500.available.file}"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/src/main/distro/build.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -48,7 +48,6 @@ <condition property="jbossws.integration.jboss42" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> <equals arg1="${jbossws.integration.target}" arg2="jboss424"/> </or> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-23 14:04:04 UTC (rev 9347) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-23 14:24:20 UTC (rev 9348) @@ -82,7 +82,6 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-framework:jar</include> - <include>org.jboss.ws:jbossws-jboss422: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>