Author: thomas.diesler(a)jboss.com Date: 2007-01-05 05:00:42 -0500 (Fri, 05 Jan 2007) New Revision: 1800 Modified: trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/build.xml trunk/build/version.properties Log: Remove build dependency on jbossas install Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-04 16:26:33 UTC (rev 1799) +++ trunk/build/ant-import/build-setup.xml 2007-01-05 10:00:42 UTC (rev 1800) @@ -76,8 +76,6 @@ <echo/> <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> - <available property="jboss50.ejb3.available" file="${jboss50.client}/jboss-ejb3-client.jar"/> - <available property="jboss42.ejb3.available" file="${jboss42.client}/jboss-ejb3-client.jar"/> <available property="jbossws.thirdparty.available" file="${output.lib.dir}/jbossws-thirdparty.jar"/> <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> @@ -94,9 +92,6 @@ </or> </condition> - <fail message="Not available: ${jboss50.client}/jboss-ejb3-client.jar" unless="jboss50.ejb3.available"/> - <fail message="Not available: ${jboss42.client}/jboss-ejb3-client.jar" unless="jboss42.ejb3.available"/> - <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-04 16:26:33 UTC (rev 1799) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-05 10:00:42 UTC (rev 1800) @@ -38,6 +38,7 @@ <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/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"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> @@ -46,6 +47,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}/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"/> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> @@ -60,17 +62,21 @@ <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy-1.0.jar" dest="${thirdparty.dir}/policy-1.0.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}/stax-api/${stax-api}/lib/stax-api-1.0.jar" dest="${thirdparty.dir}/stax-api-1.0.jar" usetimestamp="true" verbose="true"/> + <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> </target> <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"/> <pathelement location="${thirdparty.dir}/activation.jar"/> - <pathelement location="${thirdparty.dir}/javassist.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"/> @@ -78,6 +84,7 @@ <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-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> @@ -100,10 +107,6 @@ <!-- The classpath for the jbossws core --> <path id="core.classpath"> <path refid="library.classpath"/> - <pathelement location="${jboss50.server.lib}/jboss-j2ee.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> </path> <!-- The classpath for the jboss50 integration --> @@ -127,9 +130,6 @@ <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}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3x.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> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-04 16:26:33 UTC (rev 1799) +++ trunk/build/build.xml 2007-01-05 10:00:42 UTC (rev 1800) @@ -32,7 +32,7 @@ <!-- | Build all jar files. --> - <target name="jars" depends="init,core-jars,jboss40-jars,jboss42-jars,jboss50-jars,tomcat-jars" description="Builds all jar files."> + <target name="jars" depends="init,core-jars" description="Builds all core jar files."> </target> <target name="build-docs" description="Build the documentation"> @@ -49,7 +49,11 @@ <ant antfile="${tests.dir}/build.xml" target="clean" inheritall="false"/> </target> - <target name="main" description="Executes the default target (most)." depends="most"/> + <target name="main" description="Executes the default target (most)." depends="most"> + + <echo message="jbossws.integration.target = ${jbossws.integration.target}"/> + <echo message="To deploy jbossws, run: ant deploy-${jbossws.integration.target}"/> + </target> <target name="most" description="Builds almost everything." depends="jars"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-04 16:26:33 UTC (rev 1799) +++ trunk/build/version.properties 2007-01-05 10:00:42 UTC (rev 1800) @@ -30,7 +30,9 @@ apache-xerces=2.7.1 hibernate=3.2.0.CR2 jboss-backport-concurrent=2.1.0.GA +jboss-ejb3=1.0.0.CR9-jboss4.0.5 jboss-jbossretro=1.0.2.GA +jbossas-core-libs=4.0.5.GA jbpm-bpel=1.1.Beta2 junit=3.8.1 oswego-concurrent=1.3.4