Author: thomas.diesler(a)jboss.com Date: 2007-01-05 16:52:44 -0500 (Fri, 05 Jan 2007) New Revision: 1833 Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-samples.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/build.xml trunk/build/version.properties Log: Fix tomcat integration Add config name/file access on StubExt Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/ant-import/build-release.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -209,7 +209,6 @@ <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> <fileset dir="${thirdparty.dir}"> <include name="activation.jar"/> - <include name="log4j.jar"/> <include name="mailapi.jar"/> </fileset> <fileset dir="${core.output.lib.dir}"> Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/ant-import/build-samples.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -16,7 +16,7 @@ <!-- | Build the samples --> - <target name="build-samples" description="Builds the samples." depends="prepare"> + <target name="build-samples" description="Builds the samples." depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,tomcat-jars"> <property name="samples.target" value="jbossws-samples-${version.id}"/> <property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/ant-import/build-setup.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -75,10 +75,10 @@ <target name="prepare"> - <echo message="jboss50.home = ${jboss50.home}"/> - <echo message="jboss42.home = ${jboss42.home}"/> - <echo message="jboss40.home = ${jboss40.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="jboss50.home = ${jboss50.home}"/> + <echo message="jboss42.home = ${jboss42.home}"/> + <echo message="jboss40.home = ${jboss40.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> <echo/> <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-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -38,7 +38,8 @@ <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.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/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> @@ -48,6 +49,7 @@ <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}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.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}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> @@ -68,74 +70,64 @@ <target name="thirdparty-classpath" > - <!-- The combined library classpath --> - <path id="library.classpath"> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> + <!-- The thirdparty jars for a jbossws client --> + <path id="jbossws.thirdparty.classpath"> <pathelement location="${thirdparty.dir}/activation.jar"/> + <pathelement location="${thirdparty.dir}/commons-logging.jar"/> <pathelement location="${thirdparty.dir}/concurrent.jar"/> - <pathelement location="${thirdparty.dir}/log4j.jar"/> - <pathelement location="${thirdparty.dir}/hibernate3.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${thirdparty.dir}/jboss-container.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-deployers.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> <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}/junit.jar"/> + <pathelement location="${thirdparty.dir}/log4j.jar"/> <pathelement location="${thirdparty.dir}/mailapi.jar"/> - <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> - <pathelement location="${thirdparty.dir}/qdox.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> - <pathelement location="${thirdparty.dir}/xalan.jar"/> - <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> - <pathelement location="${thirdparty.dir}/xml-apis.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> - <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> </path> - - <!-- The classpath for the jbossws core --> + + <!-- The compile classpath for jbossws core --> <path id="core.classpath"> - <path refid="library.classpath"/> + <path refid="jbossws.thirdparty.classpath"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> + <pathelement location="${thirdparty.dir}/jboss-container.jar"/> + <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> + <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> </path> - <!-- The classpath for the jboss50 integration --> + <!-- The compile classpath for jboss50 integration --> <path id="jboss50.integration.classpath"> <path refid="core.classpath"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-mbeans.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> </path> - <!-- The classpath for the jboss42 integration --> + <!-- The compile classpath for jboss42 integration --> <path id="jboss42.integration.classpath"> <path refid="core.classpath"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> - <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/> - <pathelement location="${jboss42.server.lib}/jbosssx.jar"/> <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/> </path> - <!-- The classpath for the jboss42 integration --> + <!-- The compile classpath for jboss42 integration --> <path id="tomcat.integration.classpath"> <path refid="core.classpath"/> </path> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/build.xml 2007-01-05 21:52:44 UTC (rev 1833) @@ -16,6 +16,7 @@ <import file="${basedir}/ant-import/build-thirdparty.xml"/> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-samples.xml"/> <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../integration-jboss50/build.xml"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-05 21:52:38 UTC (rev 1832) +++ trunk/build/version.properties 2007-01-05 21:52:44 UTC (rev 1833) @@ -31,9 +31,11 @@ hibernate=3.2.0.CR2 jboss-backport-concurrent=2.1.0.GA jboss-common-core=2.0.2.CR1 -jboss-common-logging=2.0.1.GA +jboss-common-logging-log4j=2.0.2.GA +jboss-common-logging-spi=2.0.2.GA jboss-ejb3=1.0.0.CR9-jboss4.0.5 jboss-jbossretro=1.0.4.GA +jboss-vfs=2.0.0.snapshot jbossas-core-libs=4.0.5.GA jbpm-bpel=1.1.Beta2 junit=3.8.1