[jbossws-commits] JBossWS SVN: r11299 - in stack/metro/trunk: modules/management and 5 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-12-15 02:38:39 -0500 (Tue, 15 Dec 2009) New Revision: 11299 Removed: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt Modified: stack/metro/trunk/build.xml stack/metro/trunk/modules/management/pom.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-deploy-artifacts.xml Log: removing AS 5.0.0 support Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/build.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -54,9 +54,6 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}"> - <isset property="profiles.profile.properties.jboss500.home"/> - </condition> <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}"> <isset property="profiles.profile.properties.jboss501.home"/> </condition> @@ -72,14 +69,12 @@ <!-- Loads the properties from the user profile --> <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> - <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}"/> <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/> <echo/> - <echo message="jboss500.home=${jboss500.home}"/> <echo message="jboss501.home=${jboss501.home}"/> <echo message="jboss510.home=${jboss510.home}"/> <echo message="jboss600.home=${jboss600.home}"/> Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/modules/management/pom.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -31,11 +31,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <scope>provided</scope> </dependency> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/modules/server/pom.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -146,14 +146,6 @@ <artifactItems> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <version>${jbossws.jboss500.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <version>${jbossws.jboss501.version}</version> <classifier>resources</classifier> 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-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -18,11 +18,6 @@ <copy file="${src.dir}/jbossws-metro-config-as5.xml" - tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-metro-config-as5.xml" tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/modules/testsuite/pom.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -324,63 +324,6 @@ </profile> <!-- - Name: jboss500 - Descr: JBoss-5.0.0 specific options - --> - <profile> - <id>jboss500</id> - <properties> - <jboss.version>5.0.0.GA</jboss.version> - <jbossws.integration.target>jboss500</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>${jboss.javaee.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <!-- http://jira.codehaus.org/browse/MCOMPILER-72 --> - <testExcludeFile>../test-excludes-jboss500.txt</testExcludeFile> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss500.home}/lib/endorsed</argLine> - <!-- TODO: replace with maven dependencies --> - <additionalClasspathElements> - <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss501 Descr: JBoss-5.0.1 specific options --> Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-12-15 07:38:39 UTC (rev 11299) @@ -1,54 +0,0 @@ -# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-1949] Metro MTOM ignores content-type on attachment part -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.* -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.* -org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.* - -# [JBWS-2102] JSR-261 impl not available in Metro -org/jboss/test/ws/jaxws/samples/addressing/** - -# [JBWS-2596] Resource injection in jaxws endpoints and handlers -org/jboss/test/ws/jaxws/jbws2074/** -org/jboss/test/ws/jaxws/jbws2634/** - -# [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-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-2384] NameAlreadyBoundException when more than one virtual host are specified in @WebContext(virtualHosts) annotation variable -org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-2400] Rewrite large attachment testcase -org/jboss/test/ws/jaxws/jbws2000/** - -# [JBWS-2462] Address rewrite test fails in Metro integration -org/jboss/test/ws/jaxws/jbws2150/** - -# [JBWS-2715] JAXBIntroductions support -org/jboss/test/ws/jaxws/jaxbcust/** -org/jboss/test/ws/jaxws/samples/jaxbintros/** Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/pom.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -47,7 +47,6 @@ <jbossws.common.version>1.2.2-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>3.2.2-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>1.2.2-SNAPSHOT</jbossws.spi.version> - <jbossws.jboss500.version>3.2.1.GA</jbossws.jboss500.version> <jbossws.jboss501.version>3.2.1.GA</jbossws.jboss501.version> <jbossws.jboss510.version>3.2.1.GA</jbossws.jboss510.version> <!-- JBWS-2505 --> @@ -106,18 +105,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <version>${jbossws.jboss500.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500</artifactId> - <version>${jbossws.jboss500.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <version>${jbossws.jboss501.version}</version> </dependency> @@ -476,18 +463,6 @@ </profile> <!-- - Name: jboss500 - Descr: JBoss-5.0.0 specific options - --> - <profile> - <id>jboss500</id> - <properties> - <jbossws.integration.target>jboss500</jbossws.integration.target> - <jboss.home>${jboss500.home}</jboss.home> - </properties> - </profile> - - <!-- Name: jboss501 Descr: JBoss-5.0.1 specific options --> Modified: stack/metro/trunk/profiles.xml.example =================================================================== --- stack/metro/trunk/profiles.xml.example 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/profiles.xml.example 2009-12-15 07:38:39 UTC (rev 11299) @@ -11,7 +11,6 @@ </property> </activation> <properties> - <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/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home> <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home> <jboss600.home>/home/opalka/svn/jbossas/tags/JBoss_6_0_0_M1/build/output/jboss-6.0.0.M1</jboss600.home> Modified: stack/metro/trunk/src/main/distro/Install.txt =================================================================== --- stack/metro/trunk/src/main/distro/Install.txt 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/src/main/distro/Install.txt 2009-12-15 07:38:39 UTC (rev 11299) @@ -13,7 +13,6 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss500 ant deploy-jboss501 ant deploy-jboss510 ant deploy-jboss600 Modified: stack/metro/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/metro/trunk/src/main/distro/ant.properties.example 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-12-15 07:38:39 UTC (rev 11299) @@ -3,13 +3,12 @@ # # Optional JBoss Home -jboss500.home=(a)jboss500.home@ jboss501.home=(a)jboss501.home@ jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ jboss601.home=(a)jboss601.home@ -# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600|jboss601] +# The JBoss server under test. This can be [jboss501|jboss510|jboss600|jboss601] jbossws.integration.target=jboss510 # The JBoss settings Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -28,30 +28,6 @@ </target> <!-- ================================================================== --> - <!-- Deployment JBoss500 --> - <!-- ================================================================== --> - - <target name="target-jboss500"> - <property name="jboss.server.instance" value="default"/> - <property name="jbossws.integration.target" value="jboss500"/> - <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-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <copy todir="${jboss500.home}" overwrite="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <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-jbossws targetdir="${jboss500.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> - </target> - - <!-- ================================================================== --> <!-- Deployment JBoss501 --> <!-- ================================================================== --> Modified: stack/metro/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-setup.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -20,13 +20,6 @@ <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> - <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}"/> - <property name="jboss500.server.lib" value="${jboss500.home}/common/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - <property name="jboss501.lib" value="${jboss501.home}/lib"/> <property name="jboss501.client" value="${jboss501.home}/client"/> <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> @@ -55,13 +48,11 @@ <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/> <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/> - <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"/> <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> <available property="jboss501.available" file="${jboss501.available.file}"/> <available property="jboss510.available" file="${jboss510.available.file}"/> <available property="jboss600.available" file="${jboss600.available.file}"/> Modified: stack/metro/trunk/src/main/distro/build.xml =================================================================== --- stack/metro/trunk/src/main/distro/build.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/src/main/distro/build.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -47,7 +47,6 @@ <condition property="jbossws.integration.jboss50" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> </or> </condition> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-15 07:31:48 UTC (rev 11298) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-15 07:38:39 UTC (rev 11299) @@ -79,7 +79,6 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-framework:jar</include> - <include>org.jboss.ws:jbossws-jboss500:jar</include> <include>org.jboss.jaxr:juddi-service:sar</include> <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include>