Author: thomas.diesler(a)jboss.com Date: 2007-05-08 23:39:21 -0400 (Tue, 08 May 2007) New Revision: 3008 Removed: trunk/build/etc/component-info/ trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/ trunk/build/hudson/hudson-home/jobs/AS-4.0.5-jdk14/ trunk/build/hudson/hudson-home/jobs/AS-4.0.5/ trunk/build/hudson/hudson-home/jobs/AS-4.0/ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/ trunk/build/hudson/hudson-home/jobs/JBWS-Trunk-Tests-AS-5.0/ trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt Modified: trunk/build/ant-import/build-deploy.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/ant.properties.example trunk/build/etc/component-info.xml trunk/build/version.properties trunk/jbossws-core/build.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt Log: Remove support for AS40 Modified: trunk/build/ant-import/build-deploy.xml =================================================================== --- trunk/build/ant-import/build-deploy.xml 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/build/ant-import/build-deploy.xml 2007-05-09 03:39:21 UTC (rev 3008) @@ -70,6 +70,10 @@ <include name="standard-*-config.xml"/> </fileset> </copy> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/> </target> <!-- ================================================================== --> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/build/ant-import/build-setup.xml 2007-05-09 03:39:21 UTC (rev 3008) @@ -44,13 +44,6 @@ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/> - <property name="jboss40.lib" value="${jboss40.home}/lib"/> - <property name="jboss40.client" value="${jboss40.home}/client"/> - <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> - <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> - <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> - <property name="jboss40.thirdparty" value="${jboss40.home}/../../../thirdparty"/> - <property name="tomcat.conf.dir" value="${tomcat.home}/conf"/> <property name="tomcat.common.dir" value="${tomcat.home}/common"/> <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/> @@ -59,12 +52,10 @@ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> <property name="tomcat.available.file" value="${tomcat.home}/server/lib/catalina.jar"/> <available property="jboss50.available" file="${jboss50.available.file}"/> <available property="jboss42.available" file="${jboss42.available.file}"/> - <available property="jboss40.available" file="${jboss40.available.file}"/> <available property="tomcat.available" file="${tomcat.available.file}"/> <!-- JDK Detection --> @@ -81,7 +72,6 @@ <echo message="jboss50.home = ${jboss50.home}"/> <echo message="jboss42.home = ${jboss42.home}"/> - <echo message="jboss40.home = ${jboss40.home}"/> <echo message="tomcat.home = ${tomcat.home}"/> <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/build/ant-import/build-thirdparty.xml 2007-05-09 03:39:21 UTC (rev 3008) @@ -35,8 +35,6 @@ <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/eclipse-compiler/${eclipse-compiler}/lib/jdtCompilerAdapter.jar" dest="${thirdparty.dir}/jdtCompilerAdapter.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/eclipse-compiler/${eclipse-compiler}/lib/org.eclipse.jdt.core.jar" dest="${thirdparty.dir}/org.eclipse.jdt.core.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> @@ -56,6 +54,8 @@ <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/build/ant.properties.example 2007-05-09 03:39:21 UTC (rev 3008) @@ -6,9 +6,8 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA -#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 -# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] +# The JBoss server under test. This can be [jboss50|jboss42|tomcat] jbossws.integration.target=jboss50 # The JBoss server instance @@ -38,10 +37,6 @@ hudson.jboss42.build=jboss-4.2.0.GA hudson.jboss42.rev=HEAD -hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0 -hudson.jboss40.build=jboss-4.0.5.SP1 -hudson.jboss40.rev=HEAD - hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com, alejandro.guizar(a)jboss.com hudson.smtp.host=mail.navisite.com Modified: trunk/build/etc/component-info.xml =================================================================== --- trunk/build/etc/component-info.xml 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/build/etc/component-info.xml 2007-05-09 03:39:21 UTC (rev 3008) @@ -28,6 +28,9 @@ <import componentref="jbpm/bpel"> <compatible version="@jbpm-bpel@"/> </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@jbossws-spi@"/> + </import> <import componentref="jboss/jbossws-wsconsume-impl"> <compatible version="@jbossws-wsconsume-impl@"/> </import> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/build/version.properties 2007-05-09 03:39:21 UTC (rev 3008) @@ -50,6 +50,8 @@ jboss-jbossretro=1.0.4.GA jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 +jbossws-jboss42=SNAPSHOT +jbossws-jboss50=SNAPSHOT jbossas-core-libs=4.0.5.GA junit=3.8.1 oswego-concurrent=1.3.4 Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/jbossws-core/build.xml 2007-05-09 03:39:21 UTC (rev 3008) @@ -146,14 +146,14 @@ <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/**"/> </fileset> - <fileset dir="${core.resources.dir}/standard-config"> - <include name="standard-jaxrpc-client-config.xml"/> - <include name="standard-jaxws-client-config.xml"/> - </fileset> <fileset dir="${core.resources.dir}"> <include name="schema/**"/> <include name="dtd/**"/> </fileset> + <metainf dir="${core.resources.dir}/standard-config"> + <include name="standard-jaxrpc-client-config.xml"/> + <include name="standard-jaxws-client-config.xml"/> + </metainf> </jar> <!-- Build jbossws-resources.zip --> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/jbossws-tests/build.xml 2007-05-09 03:39:21 UTC (rev 3008) @@ -50,9 +50,6 @@ <condition property="jboss.home" value="${jboss42.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - <condition property="jboss.home" value="${jboss40.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> - </condition> <!-- Integration Target Server --> <condition property="jbossws.integration.target.jboss"> @@ -140,31 +137,13 @@ <target name="common-classpath" depends="prepare,thirdparty"> - <condition property="jbossws.classpath" value="jbossws.classpath.jdk15"> - <isset property="HAVE_JDK_1.5"/> - </condition> - <property name="jbossws.classpath" value="jbossws.classpath.jdk14"/> - - <path id="jbossws.classpath.jdk15"> + <path id="jbossws.classpath"> <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> <pathelement location="${core.output.lib.dir}/jbossws-core.jar"/> <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> - <pathelement location="${integration.output.lib.dir}/jbossws-integration.jar"/> - <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/> - <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/> - <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/> - <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/> </path> - <path id="jbossws.classpath.jdk14"> - <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> - <pathelement location="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar"/> - <pathelement location="${jboss40.output.lib.dir}/jbossws14-client.jar"/> - <pathelement location="${jboss40.output.lib.dir}/jbossws14-core.jar"/> - </path> - <path id="jbossws.classpath" refid="${jbossws.classpath}"/> <!-- The combined compile classpath --> <path id="javac.classpath"> @@ -179,6 +158,8 @@ <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/stax-api.jar"/> <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-jboss50.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-jboss42.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> </path> </target> @@ -364,20 +345,8 @@ <!-- Compiling --> <!-- ================================================================== --> - <target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/> + <target name="compile" depends="wsconsume,compile15" description="Compile sources"/> - <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${tests.java.dir}"/> - <exclude name="org/jboss/test/ws/jaxws/**"/> - <exclude name="org/jboss/test/ws/tools/jaxws/**"/> - <exclude name="org/jboss/test/ws/tools/jsr181/**"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - <target name="compile15" depends="init" if="HAVE_JDK_1.5"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" Deleted: trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/jbossws-tests/src/resources/tests-jboss40-excludes.txt 2007-05-09 03:39:21 UTC (rev 3008) @@ -1,14 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# JBossAS-4.2 excludes -org/jboss/test/ws/jaxrpc/jbws723/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/serviceref/** Deleted: trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt 2007-05-09 03:39:21 UTC (rev 3008) @@ -1,23 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# JBossAS-4.2 excludes -org/jboss/test/ws/jaxrpc/jbws723/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/eardeployment/** -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jbws944/** -org/jboss/test/ws/jaxws/jbws981/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* -org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.* -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/samples/xop/** -org/jboss/test/ws/jaxws/serviceref/** - - Modified: trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-05-09 03:39:21 UTC (rev 3008) @@ -8,3 +8,6 @@ org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/jbws1581/** org/jboss/test/ws/jaxws/serviceref/** + +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* Deleted: trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt 2007-05-09 01:37:10 UTC (rev 3007) +++ trunk/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt 2007-05-09 03:39:21 UTC (rev 3008) @@ -1,19 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/eardeployment/** -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jbws944/** -org/jboss/test/ws/jaxws/jbws981/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* -org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.* -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.* -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/samples/xop/** -org/jboss/test/ws/jaxws/serviceref/** -