geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r381823 - in /geronimo/trunk: maven.xml project.properties
Date Tue, 28 Feb 2006 23:28:43 GMT
Author: jlaskowski
Date: Tue Feb 28 15:28:40 2006
New Revision: 381823

URL: http://svn.apache.org/viewcvs?rev=381823&view=rev
Log:
GERONIMO-1317: Rename the "new" goals to more meaningful names with additional build properties

Thanks Donald!


Modified:
    geronimo/trunk/maven.xml
    geronimo/trunk/project.properties

Modified: geronimo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/maven.xml?rev=381823&r1=381822&r2=381823&view=diff
==============================================================================
--- geronimo/trunk/maven.xml (original)
+++ geronimo/trunk/maven.xml Tue Feb 28 15:28:40 2006
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="new"
+<project
     xmlns:j="jelly:core"
     xmlns:u="jelly:util"
     xmlns:ant="jelly:ant"
@@ -27,50 +27,43 @@
     xmlns:modules="local:modules"
     xmlns:gscm="g:scm">
 
-
     <goal name="new0">
-        <maven:reactor basedir="${basedir}" includes="tranql/tranql/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="tranql" ignoreFailures="false"
/>
+        <attainGoal name="m:tranql"/>
     </goal>
 
     <goal name="new00">
-        <maven:reactor basedir="${basedir}" includes="tranql/connector/project.xml,tranql/vendor/*/*/project.xml,tranql/derby/*/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="tranql-connector" ignoreFailures="false"
/>
+        <attainGoal name="m:tranql2"/>
     </goal>
 
     <goal name="new1">
-        <maven:reactor basedir="${basedir}" includes="modules/*/project.xml,plugins/*/project.xml"
-            excludes="modules/interop/project.xml" goals="multiproject:install-callback"
banner="geronimo and geronimo-plugins" ignoreFailures="false" />
+        <attainGoal name="m:geronimo:core"/>
     </goal>
 
     <goal name="new2">
-        <maven:reactor basedir="${basedir}" includes="openejb/modules/openejb-core/project.xml,openejb/modules/openejb-pkgen-builder/project.xml,openejb/modules/openejb-builder/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="openejb" ignoreFailures="false"
/>
+        <attainGoal name="m:openejb"/>
     </goal>
 
     <goal name="new3">
-        <maven:reactor basedir="${basedir}" includes="applications/*/project.xml,applications/daytrader/*/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="applications" ignoreFailures="false"
/>
+        <attainGoal name="m:geronimo:applications"/>
     </goal>
 
     <goal name="new4">
-        <maven:reactor basedir="${basedir}" includes="configs/*/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="configurations" ignoreFailures="false"
/>
+        <attainGoal name="m:geronimo:configs"/>
     </goal>
 
     <goal name="new5">
-        <maven:reactor basedir="${basedir}" includes="assemblies/*/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="assemblies" ignoreFailures="false"
/>
+        <attainGoal name="m:geronimo:assemblies"/>
     </goal>
 
     <goal name="new">
         <attainGoal name="new0"/>
         <attainGoal name="new00"/>
         <attainGoal name="new1"/>
-        <attainGoal name="new2"/>
         <attainGoal name="new3"/>
         <attainGoal name="new4"/>
         <attainGoal name="new5"/>
+    	<!-- OpenEJB depends on Configs -->
+        <attainGoal name="new2"/>
         <j:if test="${m2}">
             <attainGoal name="m2"/>
         </j:if>
@@ -113,7 +106,7 @@
        |    Same as m:clean m:default
        |
        | m:rebuild-all
-       |    Same as m:clean m:clean-repo m:default and it includes geronimo spec modules
+       |    Same as m:clean m:clean-repo m:default and it includes geronimo-spec modules
        |
        | m:checkout or m:co
        |    Checks out ActiveMQ, OpenEJB, and TranQL
@@ -167,22 +160,74 @@
         </j:forEach>
     </goal>
 
-    <goal name="m:rebuild-all" prereqs="m:clean,m:clean-repo,m:default"/>
+    <goal name="m:-all">
+        <!-- only setup multiproject for clean-all and eclipse goals -->
+        <j:set var="maven.multiproject.includes" value="${maven.geronimo.core.includes},${maven.tranql.core.includes},${maven.tranql.connector.includes},${maven.openejb.includes},${maven.geronimo.applications.includes},${maven.geronimo.configs.includes},${maven.geronimo.assemblies.includes}"/>
+        <j:set var="geronimo.all" value="true"/>
+    </goal>
+
+    <goal name="m:rebuild-all" prereqs="m:-all,m:clean,m:clean-repo,m:default"/>
     <goal name="m:rebuild" prereqs="m:clean,m:default"/>
 
-    <goal name="m:build-all" prereqs="m:default"/>
+    <goal name="m:build-all" prereqs="m:-all,m:default"/>
     <goal name="m:build" prereqs="m:default"/>
     <goal name="m:default" prereqs="m:init">
-        <!-- don't run the active mq tests they take way too long and don't complete successfully
-->
-        <!-- <u:available file="${basedir}/activemq">
-            <mkdir dir="${basedir}/activemq/modules/core/target/test-reports/"/>
-            <ant:touch file="${basedir}/activemq/modules/core/target/test-reports/tstamp"/>
-        </u:available> -->
-        <j:set var="goal" value="default"/>
-        <attainGoal name="multiproject:goal"/>
+        <j:if test="${context.getVariable('geronimo.all') == 'true'}">
+            <u:available file="${basedir}/tranql">
+                <attainGoal name="m:tranql"/>
+                <attainGoal name="m:tranql2"/>
+            </u:available>
+        </j:if>
+        <attainGoal name="m:geronimo:core"/>
+        <j:if test="${context.getVariable('geronimo.all') == 'true'}">
+            <u:available file="${basedir}/openejb">
+                <attainGoal name="m:openejb"/>
+            </u:available>
+        </j:if>
+        <attainGoal name="m:geronimo:applications"/>
+        <attainGoal name="m:geronimo:configs"/>
+        <attainGoal name="m:geronimo:assemblies"/>
+        <j:if test="${m2}">
+            <attainGoal name="m2"/>
+        </j:if>
+    </goal>
+
+    <goal name="m:tranql">
+        <maven:reactor basedir="${basedir}" includes="${maven.tranql.core.includes}"
+            excludes="${maven.tranql.core.excludes}" goals="multiproject:install-callback"
banner="tranql" ignoreFailures="false" />
     </goal>
 
-    <goal name="m:clean-all" prereqs="m:clean"/>
+    <goal name="m:tranql2">
+        <maven:reactor basedir="${basedir}" includes="${maven.tranql.connector.includes}"
+            excludes="${maven.tranql.connector.excludes}" goals="multiproject:install-callback"
banner="tranql-connector/-vendor/-derby" ignoreFailures="false" />
+    </goal>
+
+    <goal name="m:geronimo:core">
+        <maven:reactor basedir="${basedir}" includes="${maven.geronimo.core.includes}"
+            excludes="${maven.geronimo.core.excludes}" goals="multiproject:install-callback"
banner="geronimo-modules and geronimo-plugins" ignoreFailures="false" />
+    </goal>
+
+    <goal name="m:openejb">
+        <maven:reactor basedir="${basedir}" includes="${maven.openejb.includes}"
+            excludes="${maven.openejb.excludes}" goals="multiproject:install-callback" banner="openejb"
ignoreFailures="false" />
+    </goal>
+
+    <goal name="m:geronimo:applications">
+        <maven:reactor basedir="${basedir}" includes="${maven.geronimo.applications.includes}"
+            excludes="${maven.geronimo.applications.excludes}" goals="multiproject:install-callback"
banner="geronimo-applications" ignoreFailures="false" />
+    </goal>
+
+    <goal name="m:geronimo:configs">
+        <maven:reactor basedir="${basedir}" includes="${maven.geronimo.configs.includes}"
+            excludes="${maven.geronimo.configs.excludes}" goals="multiproject:install-callback"
banner="geronimo-configs" ignoreFailures="false" />
+    </goal>
+
+    <goal name="m:geronimo:assemblies">
+        <maven:reactor basedir="${basedir}" includes="${maven.geronimo.assemblies.includes}"
+            excludes="${maven.geronimo.assemblies.excludes}" goals="multiproject:install-callback"
banner="geronimo-assemblies" ignoreFailures="false" />
+    </goal>
+
+    <goal name="m:clean-all" prereqs="m:-all,m:clean"/>
     <goal name="m:clean" prereqs="m:init">
         <u:tokenize var="directories" delim=",">${modules.directories}</u:tokenize>
         <j:forEach var="directory" items="${directories}">
@@ -316,9 +361,11 @@
         </ant:exec>
         <!--gscm:update dir="${basedir}/activemq"/-->
         <!--gscm:update dir="${basedir}/howl/logger"/-->
-        <ant:exec dir="${basedir}/openejb" executable="svn">
-            <ant:arg line="update"/>
-        </ant:exec>
+        <u:available file="${basedir}/openejb">
+            <ant:exec dir="${basedir}/openejb" executable="svn">
+                <ant:arg line="update"/>
+            </ant:exec>
+        </u:available>
 <!--
         <gscm:update dir="${basedir}/tranql/tranql"/>
         <gscm:update dir="${basedir}/tranql/connector"/>
@@ -328,8 +375,12 @@
     <goal name="m:fresh-checkout">
         <!--delete dir="${basedir}/activemq"/-->
         <!--delete dir="${basedir}/howl"/-->
-        <delete dir="${basedir}/openejb"/>
-        <!--<delete dir="${basedir}/tranql"/>-->
+        <u:available file="${basedir}/openejb">
+            <delete dir="${basedir}/openejb"/>
+        </u:available>
+        <u:available file="${basedir}/tranql">
+            <delete dir="${basedir}/tranql"/>
+        </u:available>
         <attainGoal name="m:checkout"/>
         <ant:exec dir="${basedir}" executable="svn">
             <ant:arg line="update"/>

Modified: geronimo/trunk/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/project.properties?rev=381823&r1=381822&r2=381823&view=diff
==============================================================================
--- geronimo/trunk/project.properties (original)
+++ geronimo/trunk/project.properties Tue Feb 28 15:28:40 2006
@@ -26,25 +26,93 @@
 maven.itest.skip=true
 maven.remote.group=apcvs
 
-#multiproject properties
-maven.multiproject.includes=\
-plugins/*/project.xml,\
-applications/*/project.xml,\
+#Geronimo core multiproject properties
+#-------------------------------------
+maven.geronimo.core.includes=\
 modules/*/project.xml,\
-#configs/*/project.xml,\
-#assemblies/*/project.xml,\
-openejb/modules/*/project.xml,\
-tranql/*/project.xml
+plugins/*/project.xml
+
+maven.geronimo.core.excludes=\
+modules/interop/project.xml
+
+#Geronimo applications multiproject properties
+#---------------------------------------------
+maven.geronimo.applications.includes=\
+applications/*/project.xml,\
+applications/daytrader/*/project.xml
+
+maven.geronimo.applications.excludes=
+
+#Geronimo configs multiproject properties
+#----------------------------------------
+maven.geronimo.configs.includes=\
+configs/*/project.xml
+
+maven.geronimo.configs.excludes=
+
+#Geronimo assemblies multiproject properties
+#-------------------------------------------
+maven.geronimo.assemblies.includes=\
+assemblies/*/project.xml
+
+maven.geronimo.assemblies.excludes=
+
+#Setup multiproject goals used for Clean & Eclipse operations
+-------------------------------------------------------------
+# Assemblies and configs are excluded
+maven.multiproject.includes=\
+${maven.geronimo.core.includes},\
+${maven.geronimo.applications.includes},\
+${maven.openejb.includes},\
+${maven.tranql.core.includes},\
+${maven.tranql.connector.includes}
 
 maven.multiproject.excludes=\
-openejb/modules/connector/project.xml,\
-openejb/modules/webadmin/project.xml,\
-activemq/modules/*/project.xml,\
-sandbox/*/project.xml,\
-assemblies/j2ee-installer/project.xml
+${maven.geronimo.core.excludes},\
+${maven.geronimo.applications.excludes},\
+${maven.geronimo.configs.excludes},\
+${maven.geronimo.assemblies.excludes},\
+${maven.activemq.excludes},\
+${maven.sandbox.excludes}
 
+#Setup multiproject goals used for IDEA users
 maven.idea.project.multiproject.includes=${maven.multiproject.includes}
 maven.idea.project.multiproject.excludes=${maven.multiproject.excludes}
+
+#TranQL multiproject properties
+#------------------------------
+maven.tranql.core.includes=\
+tranql/tranql/project.xml
+
+maven.tranql.core.excludes=
+
+maven.tranql.connector.includes=\
+tranql/connector/project.xml,\
+tranql/vendor/*/*/project.xml,\
+tranql/derby/*/project.xml
+
+maven.tranql.connector.excludes=
+
+#OpenEJB multiproject properties
+#------------------------------
+maven.openejb.includes=\
+openejb/modules/*/project.xml
+
+maven.openejb.excludes=
+
+#ActiveMQ multiproject properties
+#------------------------------
+maven.activemq.includes=
+
+maven.activemq.excludes=\
+activemq/modules/*/project.xml
+
+#Sandbox multiproject properties
+#------------------------------
+maven.sandbox.includes=
+
+maven.sandbox.excludes=\
+sandbox/*/project.xml
 
 #if you are a committer on all these projects use e.g. -Dgeronimo.otherproject.cvs.access=:ext:djencks
 #if you are a committer on one of these projects set the appropriate property here or on
the command line.



Mime
View raw message