You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/09 03:09:42 UTC

svn commit: r355316 - in /geronimo/branches/1.0: applications/daytrader/project.properties applications/project.properties maven.xml

Author: djencks
Date: Thu Dec  8 18:09:40 2005
New Revision: 355316

URL: http://svn.apache.org/viewcvs?rev=355316&view=rev
Log:
merge of build daytrader in applications

Modified:
    geronimo/branches/1.0/applications/daytrader/project.properties
    geronimo/branches/1.0/applications/project.properties
    geronimo/branches/1.0/maven.xml

Modified: geronimo/branches/1.0/applications/daytrader/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/project.properties?rev=355316&r1=355315&r2=355316&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/project.properties (original)
+++ geronimo/branches/1.0/applications/daytrader/project.properties Thu Dec  8 18:09:40 2005
@@ -6,6 +6,6 @@
 maven.multiproject.streamer.includes=modules/streamer/project.xml
 maven.multiproject.jar.includes=modules/core/project.xml,modules/wsappclient/project.xml
 
-geronimo_version=1.0-SNAPSHOT
-activemq_version=3.2.1
+#geronimo_version=1.0-SNAPSHOT
+#activemq_version=3.2.1
 

Modified: geronimo/branches/1.0/applications/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/project.properties?rev=355316&r1=355315&r2=355316&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/project.properties (original)
+++ geronimo/branches/1.0/applications/project.properties Thu Dec  8 18:09:40 2005
@@ -19,9 +19,11 @@
 
 #multiproject properties
 maven.multiproject.includes=\
-*/project.xml
+*/project.xml,\
+daytrader/*/*/project.xml
 
 maven.multiproject.excludes=\
+daytrader/project.xml
 
 maven.idea.project.multiproject.includes=${maven.multiproject.includes}
 maven.idea.project.multiproject.excludes=${maven.multiproject.excludes}

Modified: geronimo/branches/1.0/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/maven.xml?rev=355316&r1=355315&r2=355316&view=diff
==============================================================================
--- geronimo/branches/1.0/maven.xml (original)
+++ geronimo/branches/1.0/maven.xml Thu Dec  8 18:09:40 2005
@@ -49,8 +49,8 @@
     </goal>
 
     <goal name="new3">
-        <maven:reactor basedir="${basedir}" includes="applications/*/project.xml"
-            excludes="" goals="multiproject:install-callback" banner="applications" ignoreFailures="false" />
+        <maven:reactor basedir="${basedir}" includes="applications/*/project.xml,applications/daytrader/modules/*/project.xml"
+            excludes="applications/daytrader/project.xml" goals="multiproject:install-callback" banner="applications" ignoreFailures="false" />
     </goal>
 
     <goal name="new4">