[jboss-cvs] JBossAS SVN: r70848 - in trunk: testsuite and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 13 18:11:06 EDT 2008
Author: adrian at jboss.org
Date: 2008-03-13 18:11:06 -0400 (Thu, 13 Mar 2008)
New Revision: 70848
Added:
trunk/build/build-thirdparty.xml
trunk/testsuite/build-thirdparty.xml
Modified:
trunk/build/build.xml
Log:
Revert maven build
Added: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml (rev 0)
+++ trunk/build/build-thirdparty.xml 2008-03-13 22:11:06 UTC (rev 70848)
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<!-- $Id: build-thirdparty.xml 70700 2008-03-10 21:00:47Z anil.saldhana at jboss.com $ -->
+<project name="main.build" default="synchronize" basedir=".">
+
+ <!-- Property File definitions -->
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property environment="env"/>
+
+ <!-- Property Definitions -->
+ <property name="generatedLibrariesFiles" value="../thirdparty/libraries.ent"/>
+
+ <!-- Allow jbossbuild.repository to be set from (in order or priority)
+ | Command line -Djbossbuild.repository=...
+ | synchronize.properties jbossbuild.repository setting
+ | JBOSS_REPOSITORY environment variable
+ | (e.g. JBOSS_REPOSITORY=file:///d:/projects/repository.jboss.com/)
+ -->
+
+ <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
+ <isset property="env.JBOSS_REPOSITORY"/>
+ </condition>
+
+ <!-- Fall back to default -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+ <!-- File Imports -->
+ <import file="../tools/etc/jbossbuild/tasks.xml"/>
+
+ <!-- Main Definition of dependencies -->
+ <build
+ id="jbossas-thirdparty"
+ impltitle="JBossAS"
+ implversion="jboss-head"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Application Server"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="../thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
+
+ <!--
+ The repository is in CVS under the module repository.jboss.com whose contents
+ are pushed to the http://repository.jboss.com site.
+ -->
+
+ <componentref name="antlr" version="2.7.6-brew"/>
+ <componentref name="apache-avalon" version="4.1.5"/>
+ <componentref name="apache-avalon-logkit" version="1.2"/>
+ <componentref name="apache-bcel" version="5.1"/>
+ <componentref name="apache-beanutils" version="1.7.0"/>
+ <componentref name="apache-bsf" version="2.3.0"/>
+ <componentref name="apache-codec" version="1.3.0"/>
+ <componentref name="apache-collections" version="3.1"/>
+ <componentref name="apache-digester" version="1.7-brew"/>
+ <componentref name="apache-discovery" version="0.4-brew"/>
+ <componentref name="apache-fileupload" version="1.1.1"/>
+ <componentref name="apache-httpclient" version="3.0.1"/>
+ <componentref name="apache-jaxme" version="0.2-cvs"/>
+ <componentref name="apache-log4j" version="1.2.14"/>
+ <componentref name="apache-logging" version="1.1.0.jboss"/>
+ <componentref name="apache-myfaces" version="1.1.3"/>
+ <componentref name="apache-scout" version="0.7rc2"/>
+ <componentref name="apache-slide" version="2.1-brew"/>
+ <componentref name="apache-velocity" version="1.4jboss"/>
+ <componentref name="apache-xalan" version="2.7.0.patch01-brew"/>
+ <componentref name="apache-xerces" version="2.9.0"/>
+ <componentref name="apache-xmlsec" version="1.3.0"/>
+ <componentref name="beanshell" version="1.3.0"/>
+ <componentref name="cglib" version="2.1.3"/>
+ <componentref name="commons-el" version="1.0"/>
+ <componentref name="dom4j" version="1.6.1"/>
+ <componentref name="easymock" version="1.1"/>
+ <componentref name="gnu-getopt" version="1.0.12-brew"/>
+ <componentref name="hibernate" version="3.2.4.SP1_CP01-brew"/>
+ <componentref name="hibernate-annotations" version="3.3.1.Beta1"/>
+ <componentref name="hibernate-commons-annotations" version="3.0.0.GA"/>
+ <componentref name="hibernate-entitymanager" version="3.3.2.Beta3"/>
+ <componentref name="hibernate-validator" version="3.0.0.GA"/>
+ <componentref name="hsqldb" version="1.8.0.8-brew"/>
+ <componentref name="jacorb" version="2.3.0jboss.patch5-brew"/>
+ <componentref name="javassist" version="3.7.1.GA"/>
+ <componentref name="jaxen" version="1.1-brew"/>
+ <componentref name="jboss/aop" version="2.0.0.CR7"/>
+ <componentref name="jboss/cache/jbosscache-core" version="2.1.0.CR4"/>
+ <componentref name="jboss/cache/jbosscache-pojo" version="2.1.0.CR4"/>
+ <componentref name="jboss/common-core" version="2.2.3.GA"/>
+ <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
+ <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
+ <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
+ <componentref name="jboss/integration" version="5.0.0.Beta4"/>
+ <componentref name="jboss/jaxr" version="1.2.0.GA"/>
+ <componentref name="jboss/jboss-ejb3-cache" version="0.11.1"/>
+ <componentref name="jboss/jboss-ejb3-ext-api" version="0.3-SNAPSHOT"/>
+ <componentref name="jboss/jboss-ejb3-ext-api-impl" version="0.3-SNAPSHOT"/>
+ <componentref name="jboss/jboss-ejb3-interceptors" version="0.12.0-SNAPSHOT"/>
+ <componentref name="jboss/jboss-ejb3-metadata" version="0.12.0-SNAPSHOT"/>
+ <componentref name="jboss/jboss-ejb3-core" version="0.1.0-SNAPSHOT"/>
+ <componentref name="jboss/jboss-ha-client" version="1.0.0.GA"/>
+ <componentref name="jboss/jboss-ha-server-api" version="1.0.0.GA"/>
+ <componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
+ <componentref name="jboss/jboss-javaee" version="5.0.0-SNAPSHOT"/>
+ <componentref name="jboss/jboss-managed" version="2.0.0.snapshot"/>
+ <componentref name="jboss/jboss-security-spi" version="2.0.2.Beta5"/>
+ <componentref name="jboss/jbosssx" version="2.0.2-SNAPSHOT"/>
+ <componentref name="jboss/jbosssx-client" version="2.0.2.Beta5"/>
+ <componentref name="jboss/jbossts" version="4.3.0.BETA2"/>
+ <componentref name="jboss/jboss-vfs" version="2.0.0.snapshot"/>
+ <componentref name="jboss/jbossws" version="snapshot"/>
+ <componentref name="jboss/jbossxb" version="2.0.0.CR5"/>
+ <componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
+ <componentref name="jboss/jnp-client" version="5.0.0.Beta4"/>
+ <componentref name="jboss/jnpserver" version="5.0.0.Beta4"/>
+ <componentref name="jboss/messaging" version="1.4.1.Beta1"/>
+ <componentref name="jboss/metadata" version="1.0.0.Beta6"/>
+ <componentref name="jboss/microcontainer" version="2.0.0.Beta10.1"/>
+ <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
+ <componentref name="jboss/remoting" version="2.4.0.Beta2"/>
+ <componentref name="jboss/serialization" version="1.0.3.GA"/>
+ <componentref name="jboss/test" version="1.0.5.GA"/>
+ <componentref name="jboss/web" version="2.1.0.CR13"/>
+ <componentref name="jfreechart" version="1.0.2"/>
+ <componentref name="jgroups" version="2.6.2"/>
+ <componentref name="joesnmp" version="0.3.4"/>
+ <componentref name="juddi" version="0.9RC4"/>
+ <componentref name="junit" version="3.8.2-brew"/>
+ <componentref name="nekohtml" version="0.9.1"/>
+ <componentref name="objectweb-joramtests" version="1.5"/>
+ <componentref name="odmg" version="3.0"/>
+ <componentref name="opensaml" version="1.1b"/>
+ <componentref name="osgi" version="4.0"/>
+ <componentref name="oswego-concurrent" version="1.3.4-jboss-update1"/>
+ <componentref name="qdox" version="1.6.1"/>
+ <componentref name="quartz" version="1.5.2"/>
+ <componentref name="sleepycat" version="3.0.12"/>
+ <componentref name="snmptrapappender" version="1.2.8-brew"/>
+ <componentref name="spring" version="2.0"/>
+ <componentref name="sun-jaf" version="1.1"/>
+ <componentref name="sun-javacc" version="3.2"/>
+ <componentref name="sun-javamail" version="1.4"/>
+ <componentref name="sun-jsf" version="1.2_08"/>
+ <componentref name="sun-jstl" version="1.2"/>
+ <componentref name="sun-opends" version="0.1.0.build016"/>
+ <componentref name="sun-servlet" version="2.5"/>
+ <componentref name="sun-xacml" version="2.0"/>
+ <componentref name="trove" version="1.0.2"/>
+ <componentref name="woodstox" version="3.1.1"/>
+ <componentref name="xdoclet" version="1.2.3"/>
+ <componentref name="xmlunit-xmlunit" version="1.0"/>
+
+ </build>
+
+ <synchronizeinfo/>
+
+ <!-- Generate the targets -->
+ <generate generate="jbossas-thirdparty"/>
+
+ <target
+ name="generate-lib-file"
+ description="generate libraries.ent and thirdparty license info"
+ depends="synchronize">
+ <gen-lib-file filename="${generatedLibrariesFiles}" />
+ <visit-componentref-graph componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
+ </target>
+
+</project>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-03-13 22:06:26 UTC (rev 70847)
+++ trunk/build/build.xml 2008-03-13 22:11:06 UTC (rev 70848)
@@ -912,18 +912,21 @@
<!-- the build -->
<target name="createthirdparty" unless="inhibit.downloads"
depends="check.inhibit.downloads, set.proxy">
- <condition property="mvn.cmd" value="mvn.bat" else="mvn">
- <os family="windows"/>
- </condition>
- <exec executable="${mvn.cmd}" dir="../thirdparty">
- <arg line="package"/>
- </exec>
+ <ant antfile="build-thirdparty.xml" target="generate-lib-file"/>
+ <ant dir="../testsuite" antfile="build-thirdparty.xml" target="generate-lib-file"/>
</target>
<!-- check if thirdparty libraries are to be downloaded -->
<target name="check.inhibit.downloads">
<condition property="inhibit.downloads">
- <istrue value="${nodownload}"/>
+ <or>
+ <uptodate property="dependencies.current"
+ targetfile="../thirdparty/libraries.ent">
+ <srcfiles dir= "." includes="build-thirdparty.xml"/>
+ <srcfiles dir= "../testsuite" includes="build-thirdparty.xml"/>
+ </uptodate>
+ <istrue value="${nodownload}"/>
+ </or>
</condition>
</target>
Added: trunk/testsuite/build-thirdparty.xml
===================================================================
--- trunk/testsuite/build-thirdparty.xml (rev 0)
+++ trunk/testsuite/build-thirdparty.xml 2008-03-13 22:11:06 UTC (rev 70848)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<project name="main.build"
+ default="synchronize"
+ basedir=".">
+
+ <!-- Property File definitions -->
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property environment="env"/>
+
+ <!-- Property Definitions -->
+ <property name="generatedLibrariesFiles" value="../thirdparty/testsuite-libraries.ent"/>
+
+ <!-- Allow jbossbuild.repository to be set from (in order or priority)
+ + Command line -Djbossbuild.repository=...
+ + synchronize.properties jbossbuild.repository setting
+ + JBOSS_REPOSITORY environment variable
+ -->
+ <condition property="jbossbuild.repository" value="${env.JBOSS_REPOSITORY}">
+ <isset property="env.JBOSS_REPOSITORY"/>
+ </condition>
+ <!-- Fall back to default -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+
+ <!-- File Imports -->
+ <import file="../tools/etc/jbossbuild/tasks.xml"/>
+
+ <!-- Main Definition of dependencies -->
+ <build id="jbossas-thirdparty"
+ impltitle="JBossAS"
+ implversion="jboss-head"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Application Server"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="../thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
+
+ <!--
+ The repository is in CVS under the module repository.jboss.com whose contents
+ are pushed to the http://repository.jboss.com site.
+ -->
+ <componentref name="apache-maven-ant-tasks" version="2.0.8"/>
+ <componentref name="httpunit" version="1.6"/>
+ </build>
+
+ <synchronizeinfo/>
+
+ <!-- Generate the targets -->
+ <generate generate="jbossas-thirdparty"/>
+
+ <target name="generate-lib-file"
+ description="generate testsuite-libraries.ent"
+ depends="synchronize">
+ <gen-lib-file filename="${generatedLibrariesFiles}" />
+ </target>
+
+</project>
More information about the jboss-cvs-commits
mailing list