geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r369502 - in /geronimo/daytrader: ./ derby/ ear/ ejb/ plans/ streamer/ web/ wsappclient/
Date Mon, 16 Jan 2006 16:01:16 GMT
Author: hogstrom
Date: Mon Jan 16 08:00:59 2006
New Revision: 369502

URL: http://svn.apache.org/viewcvs?rev=369502&view=rev
Log:
multiple changes to allow daytrader to be independent of Geronimo and a bit of reorganization

Added:
    geronimo/daytrader/plans/
    geronimo/daytrader/plans/dayTrader-plan.xml
      - copied unchanged from r369166, geronimo/daytrader/dayTrader-plan.xml
    geronimo/daytrader/plans/db2-resource-plan.xml
      - copied unchanged from r369166, geronimo/daytrader/db2-resource-plan.xml
    geronimo/daytrader/plans/jms-resource-plan.xml
      - copied unchanged from r369166, geronimo/daytrader/jms-resource-plan.xml
Removed:
    geronimo/daytrader/dayTrader-plan.xml
    geronimo/daytrader/db2-resource-plan.xml
    geronimo/daytrader/jms-resource-plan.xml
Modified:
    geronimo/daytrader/derby/project.xml
    geronimo/daytrader/ear/maven.xml
    geronimo/daytrader/ear/project.xml
    geronimo/daytrader/ejb/project.xml
    geronimo/daytrader/project.properties
    geronimo/daytrader/streamer/project.xml
    geronimo/daytrader/web/project.xml
    geronimo/daytrader/wsappclient/project.xml

Modified: geronimo/daytrader/derby/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/derby/project.xml?rev=369502&r1=369501&r2=369502&view=diff
==============================================================================
--- geronimo/daytrader/derby/project.xml (original)
+++ geronimo/daytrader/derby/project.xml Mon Jan 16 08:00:59 2006
@@ -20,7 +20,7 @@
 
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../../../etc/project.xml</extend>
+    <extend>../project.xml</extend>
 
     <!-- ===================== -->
     <!-- Module Identification -->
@@ -30,6 +30,15 @@
     <artifactId>geronimo-daytrader-derby-db</artifactId>
     <shortDescription>Geronimo Daytrader Derby Database</shortDescription>
     <description>Geronimo Daytrader Derby Database</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derby_version}</version>
+        </dependency>
+    </dependencies>
+
 
     <build>
 

Modified: geronimo/daytrader/ear/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/ear/maven.xml?rev=369502&r1=369501&r2=369502&view=diff
==============================================================================
--- geronimo/daytrader/ear/maven.xml (original)
+++ geronimo/daytrader/ear/maven.xml Mon Jan 16 08:00:59 2006
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="ear:install">
-  <preGoal name="java:compile">
-  </preGoal>
-</project>
+<project default="ear:install"
+    xmlns:ant="jelly:ant"
+    xmlns:velocity="jelly:velocity"
+    >
+
+    <goal name="default">
+        <attainGoal name="ear:install"/>
+    </goal>
 
+    <!-- todo when the EAR plugin can generate a 1.4 DD remove this -->
+    <goal name="ear:generate-ear-descriptor">
+        <ant:echo>Generating ${maven.ear.descriptordir}/application.xml</ant:echo>
+        <velocity:merge basedir="${maven.ear.src}/META-INF" template="application.xml"
name="${maven.ear.descriptordir}/application.xml"/>
+    </goal>
+
+</project>

Modified: geronimo/daytrader/ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/ear/project.xml?rev=369502&r1=369501&r2=369502&view=diff
==============================================================================
--- geronimo/daytrader/ear/project.xml (original)
+++ geronimo/daytrader/ear/project.xml Mon Jan 16 08:00:59 2006
@@ -1,77 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-    <extend>../../../etc/project.xml</extend>
-    <pomVersion>3</pomVersion>
-    <artifactId>daytrader-ear</artifactId>
-    <name>DayTrader Enterprise Application</name>
-    <package>org.apache.geronimo.samples.daytrader.ejb</package>
-    <description>Day Trader Enterprise Archive</description>
-    <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons_logging_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-core</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <ear.bundle>true</ear.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-wsappclient</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <ear.bundle>true</ear.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-web</artifactId>
-            <version>${pom.currentVersion}</version>
-            <type>war</type>
-            <properties>
-                <ear.bundle>true</ear.bundle>
-                <ear.appxml.war.context-root>/daytrader</ear.appxml.war.context-root>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-ejb</artifactId>
-            <version>${pom.currentVersion}</version>
-            <type>ejb</type>
-            <properties>
-                <ear.bundle>true</ear.bundle>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>daytrader-streamer</artifactId>
-            <version>${pom.currentVersion}</version>
-            <properties>
-                <ear.bundle>true</ear.bundle>
-            </properties>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-        </unitTest>
-        <resources>
-        </resources>
-    </build>
+  <extend>../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <artifactId>daytrader-ear</artifactId>
+  <name>DayTrader Enterprise Application</name>
+  <package>org.apache.geronimo.samples.daytrader.ejb</package>
+  <description>Day Trader Enterprise Archive</description>
+  <dependencies>
+    <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons_logging_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>daytrader-wsappclient</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+          <ear.bundle>true</ear.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>daytrader-web</artifactId>
+      <version>${pom.currentVersion}</version>
+      <type>war</type>
+      <properties>
+          <ear.bundle>true</ear.bundle>
+          <ear.appxml.war.context-root>/daytrader</ear.appxml.war.context-root>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>daytrader-ejb</artifactId>
+      <version>${pom.currentVersion}</version>
+      <type>ejb</type>
+      <properties>
+          <ear.bundle>true</ear.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>daytrader-streamer</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+          <ear.bundle>true</ear.bundle>
+      </properties>
+    </dependency>
+    
+  </dependencies>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+    </unitTest>
+    <resources>
+    </resources>
+  </build>
 </project>

Modified: geronimo/daytrader/ejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/ejb/project.xml?rev=369502&r1=369501&r2=369502&view=diff
==============================================================================
--- geronimo/daytrader/ejb/project.xml (original)
+++ geronimo/daytrader/ejb/project.xml Mon Jan 16 08:00:59 2006
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../../etc/project.xml</extend>
+  <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-ejb</artifactId>
   <name>DayTrader EJBs</name>
   <package>org.apache.geronimo.samples.daytrader.ejb</package>
   <description>Day Trader EJBs</description>
   <dependencies>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>daytrader-core</artifactId>
-      <version>${pom.currentVersion}</version>
-    </dependency>
     <dependency>
       <groupId>geronimo</groupId>
       <artifactId>daytrader-wsappclient</artifactId>

Modified: geronimo/daytrader/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/project.properties?rev=369502&r1=369501&r2=369502&view=diff
==============================================================================
--- geronimo/daytrader/project.properties (original)
+++ geronimo/daytrader/project.properties Mon Jan 16 08:00:59 2006
@@ -4,8 +4,11 @@
 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
+maven.multiproject.jar.includes=wsappclient/project.xml
 
 #geronimo_version=1.0-SNAPSHOT
 #activemq_version=3.2.1
 
+jelly_velocity_tags_version=1.0
+velocity_version=1.4
+derby_version=10.1.1.0

Modified: geronimo/daytrader/streamer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/streamer/project.xml?rev=369502&r1=369501&r2=369502&view=diff
==============================================================================
--- geronimo/daytrader/streamer/project.xml (original)
+++ geronimo/daytrader/streamer/project.xml Mon Jan 16 08:00:59 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../../etc/project.xml</extend>
+  <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-streamer</artifactId>
   <name>streamer</name>

Modified: geronimo/daytrader/web/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/web/project.xml?rev=369502&r1=369501&r2=369502&view=diff
==============================================================================
--- geronimo/daytrader/web/project.xml (original)
+++ geronimo/daytrader/web/project.xml Mon Jan 16 08:00:59 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../../etc/project.xml</extend>
+  <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-web</artifactId>
   <name>Web Application</name>

Modified: geronimo/daytrader/wsappclient/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/wsappclient/project.xml?rev=369502&r1=369501&r2=369502&view=diff
==============================================================================
--- geronimo/daytrader/wsappclient/project.xml (original)
+++ geronimo/daytrader/wsappclient/project.xml Mon Jan 16 08:00:59 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
-  <extend>../../../etc/project.xml</extend>
+  <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-wsappclient</artifactId>
   <name>daytrader-wsappclient</name>



Mime
View raw message