Author: thomas.diesler(a)jboss.com Date: 2007-01-15 11:52:56 -0500 (Mon, 15 Jan 2007) New Revision: 1972 Modified: trunk/build/ant-import/build-thirdparty.xml trunk/build/version.properties trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java Log: Fix jdk1.4 build up to jbws-1458 Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-15 16:31:58 UTC (rev 1971) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-15 16:52:56 UTC (rev 1972) @@ -53,7 +53,8 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/security-spi/${jboss-security-spi}/lib/jboss-security-spi.jar" dest="${thirdparty.dir}/jboss-security-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> @@ -68,7 +69,7 @@ <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx-lgpl-2.0.6.jar" dest="${thirdparty.dir}/wstx-lgpl-2.0.6.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> </target> @@ -87,13 +88,13 @@ <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> - <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/> <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/stax-api.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> + <pathelement location="${thirdparty.dir}/wstx.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> <pathelement location="${thirdparty.dir}/xalan.jar"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-15 16:31:58 UTC (rev 1971) +++ trunk/build/version.properties 2007-01-15 16:52:56 UTC (rev 1972) @@ -17,7 +17,7 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss javassist=3.4.GA -jboss-jbossxb=1.0.0.CR8 +jboss-jbossxb=1.0.0.CR7 jboss-microcontainer=snapshot jboss-remoting=2.0.0.GA sun-jaxb=2.0.3 @@ -35,13 +35,13 @@ jboss-common-logging-spi=2.0.2.GA jboss-ejb3=1.0.0.CR9-jboss4.0.5 jboss-jbossretro=1.0.4.GA -jboss-security-spi=2.0.0.Beta +jboss-security=4.0.5.GA jboss-vfs=2.0.0.snapshot jbossas-core-libs=4.0.5.GA jbpm-bpel=1.1.Beta2 junit=3.8.1 oswego-concurrent=1.3.4 -qdox=1.6 +qdox=1.4 stax-api=1.0 sun-jaf=1.1 sun-javamail=1.4 Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-15 16:31:58 UTC (rev 1971) +++ trunk/jbossws-tests/build.xml 2007-01-15 16:52:56 UTC (rev 1972) @@ -114,13 +114,13 @@ <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> - <!-- Define the jbossws.build --> - <condition property="jbossws.build" value="jbossws14"> + <!-- Define the jbossws.client.jar --> + <condition property="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar"> <not> <isset property="HAVE_JDK_1.5"/> </not> </condition> - <condition property="jbossws.build" value="jbossws"> + <condition property="jbossws.client.jar" value="${core.output.lib.dir}/jbossws-client.jar"> <isset property="HAVE_JDK_1.5"/> </condition> @@ -155,12 +155,14 @@ <!-- The combined compile classpath --> <path id="javac.classpath"> <path refid="core.classpath"/> - <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> + <pathelement location="${jbossws.client.jar}"/> <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="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> <pathelement location="${thirdparty.dir}/policy.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> @@ -261,7 +263,9 @@ <target name="generate-sources" depends="compile" description="Generate the deployment resources."> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> - <classpath location="${core.output.lib.dir}/jbossws-client.jar"/> + <classpath location="${jbossws.client.jar}"/> + <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> + <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 16:31:58 UTC (rev 1971) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 16:52:56 UTC (rev 1972) @@ -267,7 +267,7 @@ throw new IllegalStateException("Length of VariableMapping[] do not match"); } - HashMap<String, VariableMapping> actualMappings = new HashMap<String, VariableMapping>(vm2.length); + HashMap actualMappings = new HashMap(vm2.length); for (int i = 0; i < len1; i++) { VariableMapping current = vm2[i]; @@ -280,7 +280,7 @@ for (int i = 0; i < len1; i++) { VariableMapping expected = vm1[i]; - VariableMapping actual = actualMappings.get(expected.getJavaVariableName()); + VariableMapping actual = (VariableMapping)actualMappings.get(expected.getJavaVariableName()); if (actual == null) throw new IllegalStateException("Variable '" + expected.getJavaVariableName() + "' not found.");