gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r649504 - in /gump/metadata/project: hivemind.xml tapestry.xml
Date Fri, 18 Apr 2008 12:50:47 GMT
Author: bodewig
Date: Fri Apr 18 05:50:47 2008
New Revision: 649504

URL: http://svn.apache.org/viewvc?rev=649504&view=rev
Log:
Use mvn to build hivemind

Modified:
    gump/metadata/project/hivemind.xml
    gump/metadata/project/tapestry.xml

Modified: gump/metadata/project/hivemind.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/hivemind.xml?rev=649504&r1=649503&r2=649504&view=diff
==============================================================================
--- gump/metadata/project/hivemind.xml (original)
+++ gump/metadata/project/hivemind.xml Fri Apr 18 05:50:47 2008
@@ -22,112 +22,42 @@
 
   <svn repository="asf" dir="hivemind/hivemind1/trunk"/>
   
-  <project name="hivemind-compile">
-    <package>org.apache.hivemind</package>
-
-    <ant target="compile-tests" basedir="framework">
-      <property name="download-warning-marker-displayed" value="true"/>
-      <property name="junit-available" value="true"/>
-      <property name="javacc.home" reference="home" project="javacc"/>
-      <property name="java.classes.dir" value="target/classes"/>
-      <property name="test.classes.dir" value="target/test-classes"/>
-    </ant>
-
-    <depend project="ant"/>
-    <depend project="commons-logging"/>
-    <depend project="easymock"/>
-    <depend project="easymockclassextension"/>
-    <depend project="jakarta-oro"/>
-    <depend project="jakarta-servletapi-4"/>
-    <depend project="javassist"/>
-    <depend project="junit"/>
-    <depend project="logging-log4j-12"/>
-    <depend project="xml-apis"/>
-    <depend project="xml-xerces"/>
-
-
-    <work nested="hivemind/target/classes"/>
-    <work nested="hivebuild/target/classes"/>
-    <work nested="framework/target/classes"/>
-
-    <!--nag from="hlship@apache.org" to="hivemind-dev@jakarta.apache.org"/-->
-  </project>
-
   <project name="hivemind">
     <package>org.apache.hivemind</package>
 
-    <ant basedir="framework">
-      <property name="download-warning-marker-displayed" value="true"/>
-      <property name="junit-available" value="true"/>
-      <property name="javacc.home" reference="home" project="javacc"/>
-      <property name="project.version" value="@@DATE@@"/>
-      <sysproperty name="ant.build.clonevm" value="true"/>
-      <property name="java.classes.dir" value="target/classes"/>
-      <property name="test.classes.dir" value="target/test-classes"/>
-
-      <!-- Hivemind's tests need a classloader hierarchy unbuildable in Gump -->
-      <sysproperty name="build.sysclasspath" value="first"/>
-    </ant>
-
-    <depend project="hivemind-compile" inherit="all"/>
-    <depend project="xml-apis"/>
-    <depend project="xml-xerces"/>
-    <depend project="asm"/>
-    <depend project="cglib"/>
-
-    <work nested="hivebuild/target/classes"/>
-    <work nested="framework/target/classes"/>
-    <work nested="framework/target/test-classes"/>
-    <work nested="framework/src/descriptor"/>
-    <work nested="framework/src/test"/>
-    <work nested="framework/src/test-data"/>
-
-    <jar name="target/hivemind-@@DATE@@.jar"/>
-    <license name="LICENSE-2.0.txt"/>
-
-    <!--nag from="hlship@apache.org" to="hivemind-dev@jakarta.apache.org"/-->
-  </project>
-
-  <project name="hivemind-library">
-    <package>org.apache.hivemind.lib</package>
-
-    <ant basedir="library">
-      <property name="download-warning-marker-displayed" value="true"/>
-      <property name="junit-available" value="true"/>
-      <property name="project.version" value="@@DATE@@"/>
-      <sysproperty name="ant.build.clonevm" value="true"/>
-      <property name="java.classes.dir" value="target/classes"/>
-      <property name="test.classes.dir" value="target/test-classes"/>
-    </ant>
-
-    <depend project="ant"/>
-    <depend project="aopalliance"/>
-    <depend project="asm"/>
-    <depend project="commons-logging"/>
-    <depend project="easymock"/>
-    <depend project="ejb" />
-    <depend project="packaged-groovy" />
-    <depend project="hivemind"/>
-    <depend project="jakarta-oro"/>
-    <depend project="javassist"/>
-    <depend project="junit"/>
-    <depend project="logging-log4j-12"/>
-    <depend project="spring" ids="spring-core spring-beans"/>
-    <depend project="xml-apis"/>
-    <depend project="xml-xerces"/>
+    <mvn/>
 
-    <!-- This looks like a transitive dependency from groovy -->    
-    
-    <depend project="antlr"/>
-    
-    <work nested="hivebuild/target/classes"/>
-    <work nested="library/target/classes"/>
-    <work nested="library/target/test-classes"/>
-    <work nested="library/src/conf"/>
-    <work nested="library/src/descriptor"/>
-    <work nested="library/src/test"/>
+    <option project="aopalliance"/>
+    <option project="asm"/>
+    <option project="asm"/>
+    <option project="cglib"/>
+    <option project="commons-logging"/>
+    <option project="commons-logging"/>
+    <option project="easymock"/>
+    <option project="easymock"/>
+    <option project="easymockclassextension"/>
+    <option project="ejb" />
+    <option project="hivemind"/>
+    <option project="jakarta-oro"/>
+    <option project="jakarta-oro"/>
+    <option project="jakarta-servletapi-4"/>
+    <option project="javassist"/>
+    <option project="javassist"/>
+    <option project="junit"/>
+    <option project="junit"/>
+    <option project="logging-log4j-12"/>
+    <option project="logging-log4j-12"/>
+    <option project="packaged-groovy" />
+    <option project="spring" ids="spring-core spring-beans"/>
+    <option project="xml-apis"/>
+    <option project="xml-apis"/>
+    <option project="xml-apis"/>
+    <option project="xml-xerces"/>
+    <option project="xml-xerces"/>
+    <option project="xml-xerces"/>
 
-    <jar name="target/hivemind-lib-@@DATE@@.jar"/>
+    <jar name="target/hivemind-@@DATE@@.jar" id="hivemind"/>
+    <jar name="target/hivemind-lib-@@DATE@@.jar" id="hivemind-library"/>
     <license name="LICENSE-2.0.txt"/>
 
     <!--nag from="hlship@apache.org" to="hivemind-dev@jakarta.apache.org"/-->

Modified: gump/metadata/project/tapestry.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tapestry.xml?rev=649504&r1=649503&r2=649504&view=diff
==============================================================================
--- gump/metadata/project/tapestry.xml (original)
+++ gump/metadata/project/tapestry.xml Fri Apr 18 05:50:47 2008
@@ -58,7 +58,6 @@
     <depend project="easymock"/>
     <depend project="easymockclassextension"/>
     <depend project="hivemind"/>
-    <depend project="hivemind-library"/>
     <depend project="jakarta-oro"/>
     <depend project="jakarta-servletapi-4"/>
     <depend project="javassist"/>



Mime
View raw message