Author: thomas.diesler(a)jboss.com Date: 2007-01-25 07:18:34 -0500 (Thu, 25 Jan 2007) New Revision: 2104 Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties Log: Fix samples build Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-01-25 11:44:11 UTC (rev 2103) +++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-01-25 12:18:34 UTC (rev 2104) @@ -36,6 +36,12 @@ <mkdir dir="${build.src.samples.dir}/lib"/> <copy todir="${build.src.samples.dir}/lib"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-jboss50-integration.jar"/> </fileset> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-25 11:44:11 UTC (rev 2103) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-25 12:18:34 UTC (rev 2104) @@ -2,9 +2,9 @@ # # Required JBoss Home -#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 -#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 +jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 +jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +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] jbossws.integration.target=jboss42 @@ -13,7 +13,7 @@ jboss.server.instance=default # Tomcat Home -#tomcat.home=/usr/java/tomcat +tomcat.home=/usr/java/tomcat #tomcat.manager.username=manager #tomcat.manager.password=manager Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-25 11:44:11 UTC (rev 2103) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-25 12:18:34 UTC (rev 2104) @@ -29,13 +29,10 @@ <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}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" 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/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-client.jar" 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}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> @@ -70,10 +67,10 @@ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> - <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/> - <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-client.jar"/> + <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${lib.dir}/jboss-saaj.jar"/> + <pathelement location="${lib.dir}/jbossws-client.jar"/> </path> <path id="compile.classpath"> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-25 11:44:11 UTC (rev 2103) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-25 12:18:34 UTC (rev 2104) @@ -16,6 +16,7 @@ <property name="common.resources" value="${basedir}/common/resources"/> <property name="build.tests.dir" value="${basedir}/output"/> <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + <property name="lib.dir" value="${basedir}/lib"/> <!-- Force Thirdparty Get --> <condition property="force.thirdparty.get"> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-01-25 11:44:11 UTC (rev 2103) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-01-25 12:18:34 UTC (rev 2104) @@ -8,9 +8,9 @@ javassist=@javassist@ jbpm-bpel=@jbpm-bpel@ jboss-common-core=@jboss-common-core@ -jboss-common-logging=@jboss-common-logging@ +jboss-common-logging-log4j=@jboss-common-logging-log4j@ +jboss-common-logging-spi=@jboss-common-logging-spi@ jboss-ejb3=@jboss-ejb3@ -jboss-jbossws=(a)version.id@ jboss-jbossxb=@jboss-jbossxb@ jbossas-core-libs=@jbossas-core-libs@ oswego-concurrent=@oswego-concurrent@