geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r355433 - in /geronimo/branches/1.0: ./ applications/ applications/daytrader/ applications/daytrader/core/ applications/daytrader/core/src/ applications/daytrader/ear/ applications/daytrader/ear/src/ applications/daytrader/ejb/ applications...
Date Fri, 09 Dec 2005 10:08:57 GMT
Author: djencks
Date: Fri Dec  9 02:08:19 2005
New Revision: 355433

URL: http://svn.apache.org/viewcvs?rev=355433&view=rev
Log:
restructure daytrader app, corresponds to rev 355402, 355403, and 355408

Added:
    geronimo/branches/1.0/applications/daytrader/core/
      - copied from r355403, geronimo/branches/1.0/applications/daytrader/modules/core/
    geronimo/branches/1.0/applications/daytrader/core/maven.xml
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/core/maven.xml
    geronimo/branches/1.0/applications/daytrader/core/project.properties
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/core/project.properties
    geronimo/branches/1.0/applications/daytrader/core/project.xml
      - copied, changed from r355430, geronimo/branches/1.0/applications/daytrader/modules/core/project.xml
    geronimo/branches/1.0/applications/daytrader/core/src/
      - copied from r355430, geronimo/branches/1.0/applications/daytrader/modules/core/src/
    geronimo/branches/1.0/applications/daytrader/ear/
      - copied from r355403, geronimo/branches/1.0/applications/daytrader/modules/ear/
    geronimo/branches/1.0/applications/daytrader/ear/maven.xml
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/ear/maven.xml
    geronimo/branches/1.0/applications/daytrader/ear/project.properties
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/ear/project.properties
    geronimo/branches/1.0/applications/daytrader/ear/project.xml
      - copied, changed from r355430, geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml
    geronimo/branches/1.0/applications/daytrader/ear/src/
      - copied from r355430, geronimo/branches/1.0/applications/daytrader/modules/ear/src/
    geronimo/branches/1.0/applications/daytrader/ejb/
      - copied from r355403, geronimo/branches/1.0/applications/daytrader/modules/ejb/
    geronimo/branches/1.0/applications/daytrader/ejb/maven.xml
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/ejb/maven.xml
    geronimo/branches/1.0/applications/daytrader/ejb/project.properties
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/ejb/project.properties
    geronimo/branches/1.0/applications/daytrader/ejb/project.xml
      - copied, changed from r355430, geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml
    geronimo/branches/1.0/applications/daytrader/ejb/src/
      - copied from r355430, geronimo/branches/1.0/applications/daytrader/modules/ejb/src/
    geronimo/branches/1.0/applications/daytrader/streamer/
      - copied from r355403, geronimo/branches/1.0/applications/daytrader/modules/streamer/
    geronimo/branches/1.0/applications/daytrader/streamer/maven.xml
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/streamer/maven.xml
    geronimo/branches/1.0/applications/daytrader/streamer/project.properties
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/streamer/project.properties
    geronimo/branches/1.0/applications/daytrader/streamer/project.xml
      - copied, changed from r355430, geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml
    geronimo/branches/1.0/applications/daytrader/streamer/src/
      - copied from r355430, geronimo/branches/1.0/applications/daytrader/modules/streamer/src/
    geronimo/branches/1.0/applications/daytrader/web/
      - copied from r355403, geronimo/branches/1.0/applications/daytrader/modules/web/
    geronimo/branches/1.0/applications/daytrader/web/maven.xml
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/web/maven.xml
    geronimo/branches/1.0/applications/daytrader/web/project.properties
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/web/project.properties
    geronimo/branches/1.0/applications/daytrader/web/project.xml
      - copied, changed from r355430, geronimo/branches/1.0/applications/daytrader/modules/web/project.xml
    geronimo/branches/1.0/applications/daytrader/web/src/
      - copied from r355430, geronimo/branches/1.0/applications/daytrader/modules/web/src/
    geronimo/branches/1.0/applications/daytrader/wsappclient/
      - copied from r355403, geronimo/branches/1.0/applications/daytrader/modules/wsappclient/
    geronimo/branches/1.0/applications/daytrader/wsappclient/maven.xml
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/wsappclient/maven.xml
    geronimo/branches/1.0/applications/daytrader/wsappclient/project.properties
      - copied unchanged from r355430, geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.properties
    geronimo/branches/1.0/applications/daytrader/wsappclient/project.xml
      - copied, changed from r355430, geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml
    geronimo/branches/1.0/applications/daytrader/wsappclient/src/
      - copied from r355430, geronimo/branches/1.0/applications/daytrader/modules/wsappclient/src/
Removed:
    geronimo/branches/1.0/applications/daytrader/maven.xml
    geronimo/branches/1.0/applications/daytrader/modules/
    geronimo/branches/1.0/applications/daytrader/project.xml
Modified:
    geronimo/branches/1.0/applications/daytrader/project.properties
    geronimo/branches/1.0/applications/project.properties
    geronimo/branches/1.0/maven.xml

Copied: geronimo/branches/1.0/applications/daytrader/core/project.xml (from r355430, geronimo/branches/1.0/applications/daytrader/modules/core/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/core/project.xml?p2=geronimo/branches/1.0/applications/daytrader/core/project.xml&p1=geronimo/branches/1.0/applications/daytrader/modules/core/project.xml&r1=355430&r2=355433&rev=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/core/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/core/project.xml Fri Dec  9 02:08:19 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../project.xml</extend>
+  <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-core</artifactId>
   <name>core</name>

Copied: geronimo/branches/1.0/applications/daytrader/ear/project.xml (from r355430, geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/ear/project.xml?p2=geronimo/branches/1.0/applications/daytrader/ear/project.xml&p1=geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml&r1=355430&r2=355433&rev=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/ear/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/ear/project.xml Fri Dec  9 02:08:19 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../project.xml</extend>
+  <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-ear</artifactId>
   <name>DayTrader Enterprise Application</name>

Copied: geronimo/branches/1.0/applications/daytrader/ejb/project.xml (from r355430, geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/ejb/project.xml?p2=geronimo/branches/1.0/applications/daytrader/ejb/project.xml&p1=geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml&r1=355430&r2=355433&rev=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/ejb/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/ejb/project.xml Fri Dec  9 02:08:19 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../project.xml</extend>
+  <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-ejb</artifactId>
   <name>DayTrader EJBs</name>

Modified: geronimo/branches/1.0/applications/daytrader/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/project.properties?rev=355433&r1=355432&r2=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/project.properties (original)
+++ geronimo/branches/1.0/applications/daytrader/project.properties Fri Dec  9 02:08:19 2005
@@ -1,9 +1,7 @@
 maven.xdoc.date=left
-maven.multiproject.includes=modules/**/project.xml
-maven.multiproject.war.includes=modules/web/project.xml
-maven.multiproject.ejb.includes=modules/ejb/project.xml
-maven.multiproject.ear.includes=modules/ear/project.xml
-maven.multiproject.streamer.includes=modules/streamer/project.xml
-maven.multiproject.jar.includes=modules/core/project.xml,modules/wsappclient/project.xml
-#geronimo_version=1.0
-#activemq_version=3.2.1
+maven.multiproject.includes=**/project.xml
+maven.multiproject.war.includes=web/project.xml
+maven.multiproject.ejb.includes=ejb/project.xml
+maven.multiproject.ear.includes=ear/project.xml
+maven.multiproject.streamer.includes=streamer/project.xml
+maven.multiproject.jar.includes=core/project.xml,wsappclient/project.xml

Copied: geronimo/branches/1.0/applications/daytrader/streamer/project.xml (from r355430, geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/streamer/project.xml?p2=geronimo/branches/1.0/applications/daytrader/streamer/project.xml&p1=geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml&r1=355430&r2=355433&rev=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/streamer/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/streamer/project.xml Fri Dec  9 02:08:19
2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../project.xml</extend>
+  <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-streamer</artifactId>
   <name>streamer</name>

Copied: geronimo/branches/1.0/applications/daytrader/web/project.xml (from r355430, geronimo/branches/1.0/applications/daytrader/modules/web/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/web/project.xml?p2=geronimo/branches/1.0/applications/daytrader/web/project.xml&p1=geronimo/branches/1.0/applications/daytrader/modules/web/project.xml&r1=355430&r2=355433&rev=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/web/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/web/project.xml Fri Dec  9 02:08:19 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../project.xml</extend>
+  <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-web</artifactId>
   <name>Web Application</name>

Copied: geronimo/branches/1.0/applications/daytrader/wsappclient/project.xml (from r355430,
geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/wsappclient/project.xml?p2=geronimo/branches/1.0/applications/daytrader/wsappclient/project.xml&p1=geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml&r1=355430&r2=355433&rev=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/modules/wsappclient/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/wsappclient/project.xml Fri Dec  9 02:08:19
2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../project.xml</extend>
+  <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-wsappclient</artifactId>
   <name>daytrader-wsappclient</name>

Modified: geronimo/branches/1.0/applications/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/project.properties?rev=355433&r1=355432&r2=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/project.properties (original)
+++ geronimo/branches/1.0/applications/project.properties Fri Dec  9 02:08:19 2005
@@ -20,10 +20,9 @@
 #multiproject properties
 maven.multiproject.includes=\
 */project.xml,\
-daytrader/*/*/project.xml
+daytrader/*/project.xml
 
-maven.multiproject.excludes=\
-daytrader/project.xml
+maven.multiproject.excludes=
 
 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=355433&r1=355432&r2=355433&view=diff
==============================================================================
--- geronimo/branches/1.0/maven.xml (original)
+++ geronimo/branches/1.0/maven.xml Fri Dec  9 02:08:19 2005
@@ -49,8 +49,8 @@
     </goal>
 
     <goal name="new3">
-        <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" />
+        <maven:reactor basedir="${basedir}" includes="applications/*/project.xml,applications/daytrader/*/project.xml"
+            excludes="" goals="multiproject:install-callback" banner="applications" ignoreFailures="false"
/>
     </goal>
 
     <goal name="new4">



Mime
View raw message