Author: chris.laprun(a)jboss.com Date: 2008-06-24 10:25:12 -0400 (Tue, 24 Jun 2008) New Revision: 11130 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml Log: Clean up Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-24 14:21:15 UTC (rev 11129) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-24 14:25:12 UTC (rev 11130) @@ -1,7 +1,5 @@ <?xml version="1.0"?> -<project name="main.build" - default="synchronize" - basedir="."> +<project name="main.build" default="synchronize" basedir="."> <!-- Property File definitions --> <!--<property file="local.properties"/> @@ -10,11 +8,8 @@ <!-- Property Definitions --> <property name="generatedLibrariesFiles" value="../thirdparty/libraries.ent"/> + <property name="jboss.tasks.path" value="../tools/lib/jbossbuild.jar"/> - - <property name="jboss.tasks.path" - value="../tools/lib/jbossbuild.jar"/> - <!-- Allow jbossbuild.repository to be set from (in order or priority) + Command line -Djbossbuild.repository=... + synchronize.properties jbossbuild.repository setting @@ -29,7 +24,6 @@ <!-- File Imports --> <import file="../tools/etc/jbossbuild/tasks.xml"/> - <!-- Main Definition of dependencies --> <build id="jbossportal-thirdparty" impltitle="JBossPortal" @@ -63,14 +57,14 @@ <componentref name="apache-httpclient" version="3.0.1"/> <componentref name="apache-lang" version="2.1"/> <componentref name="apache-log4j" version="1.2.8"/> - <componentref name="apache-logging" version="1.0.5.SP1-jboss"/> + <componentref name="apache-logging" version="1.0.5.SP1-jboss"/> <componentref name="apache-lucene" version="1.4.3"/> <componentref name="apache-net" version="1.4.1"/> <componentref name="apache-xerces" version="2.7.1"/> <componentref name="asm" version="1.5.3"/> <componentref name="beanshell" version="1.3.0"/> - <componentref name="cglib" version="2.1.3"/> - <componentref name="commons-el" version="1.0"/> + <componentref name="cglib" version="2.1.3"/> + <componentref name="commons-el" version="1.0"/> <componentref name="dbunit" version="2.1"/> <componentref name="dom4j" version="1.6.1jboss"/> <componentref name="ehcache" version="1.2.2"/> @@ -81,37 +75,36 @@ <componentref name="hibernate" version="3.2.0.CR2"/> <componentref name="httpunit" version="1.6"/> <componentref name="hsqldb" version="1.8.0.2"/> - <componentref name="ibm-wsdl4j" version="1.6.2"/> + <componentref name="ibm-wsdl4j" version="1.6.2"/> <componentref name="jakarta-cactus" version="1.7.2"/> <componentref name="jakarta-io" version="1.0"/> <componentref name="jbossas/core-libs" version="4.0.4.GA"/> - <componentref name="jboss/aop" version="1.5.2.GA"/> + <componentref name="jboss/aop" version="1.5.2.GA"/> <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/> <componentref name="jboss/cache" version="1.4.1.SP3"/> <componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/> <componentref name="jboss/jbossws" version="2.0.1.SP2"/> <componentref name="jboss/jbossxb" version="1.0.0.CR7"/> <componentref name="jboss/microcontainer" version="1.0.2"/> - <!-- <componentref name="jboss/remoting" version="1.4.3.GA"/> --> - <componentref name="jboss/remoting" version="2.2.0.SP4"/> + <componentref name="jboss/remoting" version="2.2.0.SP4"/> <componentref name="jboss/serialization" version="1.0.1.GA"/> <componentref name="jboss/test" version="1.0.0.CR1"/> <componentref name="jflex" version="1.4.0"/> <componentref name="jcaptcha" version="1.0.6"/> <componentref name="jwebunit" version="1.2"/> - <componentref name="jcr" version="1.0"/> - <componentref name="jetty" version="6.0"/> + <componentref name="jcr" version="1.0"/> + <componentref name="jetty" version="6.0"/> <componentref name="jgroups" version="2.2.8"/> <componentref name="jsunit" version="2.1"/> <componentref name="junit" version="3.8.1"/> - <componentref name="odmg" version="3.0"/> - <componentref name="oswego-concurrent" version="1.3.4"/> - <componentref name="qdox" version="1.4"/> + <componentref name="odmg" version="3.0"/> + <componentref name="oswego-concurrent" version="1.3.4"/> + <componentref name="qdox" version="1.4"/> <componentref name="trove" version="1.0.2"/> <componentref name="sleepycat" version="3.0.12"/> <componentref name="slf4j" version="1.0.2"/> <componentref name="sun-jaf" version="1.1"/> - <componentref name="sun-javacc" version="3.2-portal"/> + <componentref name="sun-javacc" version="3.2-portal"/> <componentref name="sun-javamail" version="1.3.1"/> <componentref name="sun-jsf" version="1.2_04_P02"/> <componentref name="sun-opends" version="snapshot"/> @@ -126,26 +119,17 @@ <componentref name="portlet" version="2.0-Draft32"/> <componentref name="sun-jstl" version="1.2"/> <componentref name="jboss/web" version="2.1.0.GA"/> + </build> - <!-- For the presentation branch only, not the mainstream branch --> - <!-- <componentref name="gwt" version="1.4.60"/> - <componentref name="mygwt" version="0.3.0"/> --> - - </build> - <synchronizeinfo/> - + <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"/> + <gen-lib-file filename="${generatedLibrariesFiles}"/> + <visit-componentref-graph componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/> </target> <!-- Generate the targets --> <generate generate="jbossportal-thirdparty"/> - - - </project>