Author: thomas.diesler(a)jboss.com Date: 2006-11-14 07:44:10 -0500 (Tue, 14 Nov 2006) New Revision: 1420 Modified: branches/jbossws-1.0/ant.properties.example branches/jbossws-1.0/src/ant/build-samples.xml branches/jbossws-1.0/src/ant/build-thirdparty.xml branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/IOUtils.java branches/jbossws-1.0/src/main/resources/samples/ant.properties.example branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java branches/jbossws-1.0/version.properties Log: Fix jdk1.4 samples Modified: branches/jbossws-1.0/ant.properties.example =================================================================== --- branches/jbossws-1.0/ant.properties.example 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/ant.properties.example 2006-11-14 12:44:10 UTC (rev 1420) @@ -7,7 +7,7 @@ #jboss.jdk15.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 # Optional JBoss Home -#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA +#jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA # The JBoss server instance jboss.server.instance=default Modified: branches/jbossws-1.0/src/ant/build-samples.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-14 12:44:10 UTC (rev 1420) @@ -31,11 +31,28 @@ <mkdir dir="${build.src.samples.dir}/lib"/> <copy todir="${build.src.samples.dir}/lib"> + <fileset dir="${jboss.client}"> + <include name="commons-logging.jar"/> + <include name="jbossall-client.jar"/> + <include name="mail.jar"/> + </fileset> <fileset dir="${build.lib.dir}"> + <include name="jbossws-client.jar"/> <include name="jbossws-jboss-integration.jar"/> <include name="jbossws-tomcat-integration.jar"/> + <include name="jbossws14-client.jar"/> + <include name="jbossws14-jboss-integration.jar"/> + <include name="jbossws14-tomcat-integration.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> + <include name="activation.jar"/> + <include name="commons-collections.jar"/> + <include name="dom4j.jar"/> + <include name="javassist.jar"/> + <include name="jbossretro-rt.jar"/> + <include name="jboss-backport-concurrent.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="log4j.jar"/> <include name="servlet-api.jar"/> </fileset> </copy> Modified: branches/jbossws-1.0/src/ant/build-thirdparty.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-14 12:44:10 UTC (rev 1420) @@ -11,7 +11,7 @@ <!-- $Id:build-thirdparty.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ --> -<project default="init-thirdparty" name="JBossWS-Thirdparty"> +<project name="JBossWS-Thirdparty"> <!-- ========= --> <!-- Libraries --> @@ -25,12 +25,14 @@ <mkdir dir="${thirdparty.dir}"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <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}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss.jar" dest="${thirdparty.dir}/jboss.jar" usetimestamp="true" verbose="true"/> @@ -45,6 +47,7 @@ <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/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> + <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/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.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"/> Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/IOUtils.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/IOUtils.java 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/IOUtils.java 2006-11-14 12:44:10 UTC (rev 1420) @@ -58,6 +58,7 @@ r = ins.read(bytes); } } + public static byte[] convertToBytes(DataHandler dh) { try Modified: branches/jbossws-1.0/src/main/resources/samples/ant.properties.example =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-14 12:44:10 UTC (rev 1420) @@ -1,10 +1,8 @@ # JBossWS samples build properties # -# Required JBoss Home +# JBoss Home #jboss.jdk15.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 - -# Optional JBoss Home #jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA # The JBoss server instance Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 12:44:10 UTC (rev 1420) @@ -2,10 +2,10 @@ <!-- $Id$ --> -<project default="imported"> +<project> <!-- - Init + Init --> <target name="init"> @@ -31,6 +31,16 @@ </and> </condition> + <!-- JBossWS Version --> + <condition property="jbossws.version" value="jbossws14"> + <not> + <isset property="HAVE_JDK_1.5"/> + </not> + </condition> + <condition property="jbossws.version" value="jbossws"> + <isset property="HAVE_JDK_1.5"/> + </condition> + <!-- JBoss Home --> <condition property="jboss.home" value="${jboss.jdk14.home}"> <not> @@ -40,14 +50,11 @@ <condition property="jboss.home" value="${jboss.jdk15.home}"> <isset property="HAVE_JDK_1.5"/> </condition> - - <property name="jboss.client" value="${jboss.home}/client"/> - <property name="jboss.lib" value="${jboss.home}/lib"/> + <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> - <property name="jboss.server.lib" value="${jboss.server}/lib"/> <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> - <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/> + <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME @@ -72,11 +79,8 @@ <property name="node0.http.url" value="http://${node0}:8080"/> <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <available property="jbossws.client.jar" value="jbossws14-client.jar" file="${jboss.client}/jbossws14-client.jar"/> - <available property="jbossws.client.jar" value="jbossws-client.jar" file="${jboss.client}/jbossws-client.jar"/> - <path id="client.classpath"> - <fileset dir="${jboss.client}"> + <fileset dir="${basedir}/lib"> <include name="activation.jar"/> <include name="commons-logging.jar"/> <include name="javassist.jar"/> @@ -84,7 +88,7 @@ <include name="jbossall-client.jar"/> <include name="jbossretro-rt.jar"/> <include name="jboss-backport-concurrent.jar"/> - <include name="${jbossws.client.jar}"/> + <include name="${jbossws.version}-client.jar"/> <include name="log4j.jar"/> <include name="mail.jar"/> </fileset> @@ -92,22 +96,22 @@ <path id="compile.classpath"> <path refid="client.classpath"/> - <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/> - <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${basedir}/lib/jboss.jar"/> + <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/> + <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/> + <pathelement location="${basedir}/lib/jboss-annotations-ejb3.jar"/> + <pathelement location="${basedir}/lib/jboss-ejb3x.jar"/> </path> <path id="tests.classpath"> <path refid="client.classpath"/> - <fileset dir="${jboss.client}"> + <fileset dir="${basedir}/lib"> <include name="jboss-aop-jdk50-client.jar"/> <include name="jboss-aspect-jdk50-client.jar"/> <include name="jboss-ejb3-client.jar"/> </fileset> - <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/> - <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/> + <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/> + <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/> <pathelement location="${basedir}/lib/servlet-api.jar"/> </path> Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-14 12:44:10 UTC (rev 1420) @@ -22,7 +22,7 @@ <!-- The jBPM BPEL classpath --> <path id="jbpmbpel.classpath"> <path refid="client.classpath" /> - <fileset dir="${jboss.server.lib}"> + <fileset dir="${basedir}/lib"> <include name="dom4j.jar" /> <include name="commons-collections.jar" /> </fileset> Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-11-14 12:44:10 UTC (rev 1420) @@ -26,11 +26,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.nio.channels.FileChannel; +import java.io.InputStream; +import java.io.OutputStream; import org.jboss.test.ws.JBossWSTest; import org.jboss.ws.tools.WSTools; import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.utils.IOUtils; import org.w3c.dom.Element; /** @@ -48,9 +50,9 @@ File outputDir = new File("tools/jbws1090"); outputDir.mkdirs(); // copy webservices.xml fixture to output folder - FileChannel src = new FileInputStream("resources/tools/metadatafixture/webservices.xml").getChannel(); - FileChannel dest = new FileOutputStream("tools/jbws1090/webservices.xml").getChannel(); - src.transferTo(0L, src.size(), dest); + InputStream src = new FileInputStream("resources/tools/metadatafixture/webservices.xml"); + OutputStream dest = new FileOutputStream("tools/jbws1090/webservices.xml"); + IOUtils.copyStream(dest, src); src.close(); dest.close(); Modified: branches/jbossws-1.0/version.properties =================================================================== --- branches/jbossws-1.0/version.properties 2006-11-14 00:04:05 UTC (rev 1419) +++ branches/jbossws-1.0/version.properties 2006-11-14 12:44:10 UTC (rev 1420) @@ -24,9 +24,11 @@ # thirdparty library versions apache-ant=1.6.5 +apache-collections=3.1 apache-log4j=1.2.8 apache-xalan=j_2.7.0 apache-xerces=2.7.1 +dom4j=1.6.1jboss jboss-backport-concurrent=2.1.0.GA jboss-jbossretro=1.0.2.GA jbossas=4.0.4.GA