geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r370034 - in /geronimo/trunk/applications/daytrader: core/ derby/ ear/ ear/src/application/META-INF/ ejb/ streamer/ streamer/src/client/META-INF/ web/ web/src/webapp/WEB-INF/ wsappclient/ wsappclient/src/client/META-INF/
Date Wed, 18 Jan 2006 03:54:00 GMT
Author: hogstrom
Date: Tue Jan 17 19:53:51 2006
New Revision: 370034

URL: http://svn.apache.org/viewcvs?rev=370034&view=rev
Log:
Updated Daytrader to not have hardcoded dependencies

Modified:
    geronimo/trunk/applications/daytrader/core/project.xml
    geronimo/trunk/applications/daytrader/derby/project.xml
    geronimo/trunk/applications/daytrader/ear/maven.xml
    geronimo/trunk/applications/daytrader/ear/project.properties
    geronimo/trunk/applications/daytrader/ear/project.xml
    geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml
    geronimo/trunk/applications/daytrader/ejb/project.xml
    geronimo/trunk/applications/daytrader/streamer/maven.xml
    geronimo/trunk/applications/daytrader/streamer/project.properties
    geronimo/trunk/applications/daytrader/streamer/project.xml
    geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
    geronimo/trunk/applications/daytrader/web/maven.xml
    geronimo/trunk/applications/daytrader/web/project.properties
    geronimo/trunk/applications/daytrader/web/project.xml
    geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml
    geronimo/trunk/applications/daytrader/wsappclient/maven.xml
    geronimo/trunk/applications/daytrader/wsappclient/project.properties
    geronimo/trunk/applications/daytrader/wsappclient/project.xml
    geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF

Modified: geronimo/trunk/applications/daytrader/core/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/core/project.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/core/project.xml (original)
+++ geronimo/trunk/applications/daytrader/core/project.xml Tue Jan 17 19:53:51 2006
@@ -4,7 +4,7 @@
   <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-core</artifactId>
-  <name>core</name>
+  <name>DayTrader :: Core</name>
   <package>org.apache.geronimo.samples.daytrader</package>
   <description>Common files for day Trader</description>
   <dependencies>

Modified: geronimo/trunk/applications/daytrader/derby/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/derby/project.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/derby/project.xml (original)
+++ geronimo/trunk/applications/daytrader/derby/project.xml Tue Jan 17 19:53:51 2006
@@ -26,7 +26,7 @@
     <!-- Module Identification -->
     <!-- ===================== -->
 
-    <name>Geronimo :: Daytrader Derby database</name>
+    <name>DayTrader :: Derby Database</name>
     <artifactId>geronimo-daytrader-derby-db</artifactId>
     <shortDescription>Geronimo Daytrader Derby Database</shortDescription>
     <description>Geronimo Daytrader Derby Database</description>

Modified: geronimo/trunk/applications/daytrader/ear/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/ear/maven.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/ear/maven.xml (original)
+++ geronimo/trunk/applications/daytrader/ear/maven.xml Tue Jan 17 19:53:51 2006
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="ear:install">
+<project xmlns:j="jelly:core" 
+         xmlns:ant="jelly:ant" 
+         xmlns:define="jelly:define"
+         xmlns:velocity="jelly:velocity"
+         xmlns:util="jelly:util"
+         default="ear:install">
+
   <preGoal name="java:compile">
   </preGoal>
+  <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/trunk/applications/daytrader/ear/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/ear/project.properties?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/ear/project.properties (original)
+++ geronimo/trunk/applications/daytrader/ear/project.properties Tue Jan 17 19:53:51 2006
@@ -1 +1,3 @@
 maven.multiproject.type=ear
+
+maven.ear.appxml.generate=true

Modified: geronimo/trunk/applications/daytrader/ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/ear/project.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/ear/project.xml (original)
+++ geronimo/trunk/applications/daytrader/ear/project.xml Tue Jan 17 19:53:51 2006
@@ -4,7 +4,7 @@
     <extend>../../../etc/project.xml</extend>
     <pomVersion>3</pomVersion>
     <artifactId>daytrader-ear</artifactId>
-    <name>DayTrader Enterprise Application</name>
+    <name>DayTrader :: Enterprise Application</name>
     <package>org.apache.geronimo.samples.daytrader.ejb</package>
     <description>Day Trader Enterprise Archive</description>
     <dependencies>

Modified: geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml (original)
+++ geronimo/trunk/applications/daytrader/ear/src/application/META-INF/application.xml Tue
Jan 17 19:53:51 2006
@@ -2,21 +2,21 @@
 <application  version="1.4"
     xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
-      <description>Application description</description>
+      <description>DayTrader Stock Trading Performance Benchmark Sample</description>
       <display-name>Trade</display-name>
       <module>
-         <java>daytrader-streamer-1.1-SNAPSHOT.jar</java>
+         <java>daytrader-streamer-${daytrader_version}.jar</java>
       </module>
       <module>
-         <java>daytrader-wsappclient-1.1-SNAPSHOT.jar</java>
+         <java>daytrader-wsappclient-${daytrader_version}.jar</java>
       </module>
       <module>
          <web>
-            <web-uri>daytrader-web-1.1-SNAPSHOT.war</web-uri>
+            <web-uri>daytrader-web-${daytrader_version}.war</web-uri>
             <context-root>/daytrader</context-root>
          </web>
       </module>
       <module>
-         <ejb>daytrader-ejb-1.1-SNAPSHOT.jar</ejb>
+         <ejb>daytrader-ejb-${daytrader_version}.jar</ejb>
       </module>
 </application>

Modified: geronimo/trunk/applications/daytrader/ejb/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/ejb/project.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/ejb/project.xml (original)
+++ geronimo/trunk/applications/daytrader/ejb/project.xml Tue Jan 17 19:53:51 2006
@@ -4,7 +4,7 @@
   <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-ejb</artifactId>
-  <name>DayTrader EJBs</name>
+  <name>DayTrader :: EJBs</name>
   <package>org.apache.geronimo.samples.daytrader.ejb</package>
   <description>Day Trader EJBs</description>
   <dependencies>

Modified: geronimo/trunk/applications/daytrader/streamer/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/streamer/maven.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/streamer/maven.xml (original)
+++ geronimo/trunk/applications/daytrader/streamer/maven.xml Tue Jan 17 19:53:51 2006
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="jar:install">
+<project xmlns:j="jelly:core"
+         xmlns:ant="jelly:ant"
+         xmlns:define="jelly:define"
+         xmlns:velocity="jelly:velocity"
+         xmlns:util="jelly:util"
+         default="jar:jar">
+
   <preGoal name="java:compile">
   </preGoal>
+
+  <preGoal name="jar:jar">
+      <ant:echo>Generating Manifest file for Streamer Application</ant:echo>
+      <ant:mkdir dir="${maven.build.dir}/tmp"/>
+      <ant:echo>And this is found in ${maven.jar.source.path}/client/META-INF</ant:echo>
+     <velocity:merge basedir="${basedir}/src/client/META-INF" template="MANIFEST.MF" name="${maven.build.dir}/tmp/MANIFEST.MF"/>
+  </preGoal>
+
 </project>
 

Modified: geronimo/trunk/applications/daytrader/streamer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/streamer/project.properties?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/streamer/project.properties (original)
+++ geronimo/trunk/applications/daytrader/streamer/project.properties Tue Jan 17 19:53:51
2006
@@ -1,2 +1,2 @@
 maven.multiproject.type=jar
-maven.jar.manifest=src/client/META-INF/MANIFEST.MF
+maven.jar.manifest=${maven.build.dir}/tmp/MANIFEST.MF

Modified: geronimo/trunk/applications/daytrader/streamer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/streamer/project.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/streamer/project.xml (original)
+++ geronimo/trunk/applications/daytrader/streamer/project.xml Tue Jan 17 19:53:51 2006
@@ -4,7 +4,7 @@
   <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-streamer</artifactId>
-  <name>streamer</name>
+  <name>DayTrader :: Quote Streamer</name>
   <package>org.apache.geronimo.samples.daytrader.client</package>
   <description>Streamer Application for Day Trader</description>
   <dependencies>

Modified: geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF (original)
+++ geronimo/trunk/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF Tue Jan
17 19:53:51 2006
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Class-Path:  daytrader-ejb-1.1-SNAPSHOT.jar
+Class-Path:  daytrader-ejb-${daytrader_version}.jar
 Created-By: 1.4.2_08 (Sun Microsystems Inc.)
 Ant-Version: Apache Ant 1.5.4 
 Main-Class: org.apache.geronimo.samples.daytrader.client.TradeClient

Modified: geronimo/trunk/applications/daytrader/web/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/web/maven.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/web/maven.xml (original)
+++ geronimo/trunk/applications/daytrader/web/maven.xml Tue Jan 17 19:53:51 2006
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="war:install">
+<project xmlns:j="jelly:core"
+         xmlns:ant="jelly:ant"
+         xmlns:define="jelly:define"
+         xmlns:velocity="jelly:velocity"
+         xmlns:util="jelly:util"
+         default="war:install">
+
   <preGoal name="java:compile">
   </preGoal>
+
+  <postGoal name="war:webapp">
+      <ant:echo>Generating ${maven.war.descriptordir}/web.xml</ant:echo>
+      <velocity:merge basedir="${maven.war.src}/WEB-INF" template="web.xml" name="${maven.war.webapp.dir}/WEB-INF/web.xml"/>
+  </postGoal>
 </project>
+
 

Modified: geronimo/trunk/applications/daytrader/web/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/web/project.properties?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/web/project.properties (original)
+++ geronimo/trunk/applications/daytrader/web/project.properties Tue Jan 17 19:53:51 2006
@@ -1 +1,2 @@
 maven.multiproject.type=war
+maven.war.webxml=true

Modified: geronimo/trunk/applications/daytrader/web/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/web/project.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/web/project.xml (original)
+++ geronimo/trunk/applications/daytrader/web/project.xml Tue Jan 17 19:53:51 2006
@@ -4,7 +4,7 @@
   <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-web</artifactId>
-  <name>Web Application</name>
+  <name>DayTrader :: Web Application</name>
   <package>org.apache.geronimo.samples.daytrader.web</package>
   <description>This is the web application.</description>
   <dependencies>

Modified: geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/daytrader/web/src/webapp/WEB-INF/web.xml Tue Jan 17 19:53:51
2006
@@ -410,13 +410,13 @@
          <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
          <message-destination-type>javax.jms.Queue</message-destination-type>
          <message-destination-usage>Produces</message-destination-usage>
-         <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
+         <message-destination-link>daytrader-ejb-${daytrader_version}.jar#TradeBrokerQueue</message-destination-link>
       </message-destination-ref>
       <message-destination-ref id="MessageDestinationRef_2">
          <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
          <message-destination-type>javax.jms.Topic</message-destination-type>
          <message-destination-usage>Produces</message-destination-usage>
-         <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
+         <message-destination-link>daytrader-ejb-${daytrader_version}.jar#TradeStreamerTopic</message-destination-link>
       </message-destination-ref>
       <service-ref>
         <description>WSDL Service Trade</description>

Modified: geronimo/trunk/applications/daytrader/wsappclient/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/wsappclient/maven.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/wsappclient/maven.xml (original)
+++ geronimo/trunk/applications/daytrader/wsappclient/maven.xml Tue Jan 17 19:53:51 2006
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" default="jar:install">
+<project xmlns:j="jelly:core"
+         xmlns:ant="jelly:ant"
+         xmlns:define="jelly:define"
+         xmlns:velocity="jelly:velocity"
+         xmlns:util="jelly:util"
+         default="jar:jar">
+
   <preGoal name="java:compile">
   </preGoal>
+
+  <preGoal name="jar:jar">
+      <ant:echo>Generating Manifest file for Streamer Application</ant:echo>
+      <ant:mkdir dir="${maven.build.dir}/tmp"/>
+      <ant:echo>And this is found in ${maven.jar.source.path}/client/META-INF</ant:echo>
+     <velocity:merge basedir="${basedir}/src/client/META-INF" template="MANIFEST.MF" name="${maven.build.dir}/tmp/MANIFEST.MF"/>
+  </preGoal>
+
 </project>
 

Modified: geronimo/trunk/applications/daytrader/wsappclient/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/wsappclient/project.properties?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/wsappclient/project.properties (original)
+++ geronimo/trunk/applications/daytrader/wsappclient/project.properties Tue Jan 17 19:53:51
2006
@@ -1,2 +1,2 @@
 maven.multiproject.type=jar
-maven.jar.manifest=src/client/META-INF/MANIFEST.MF
+maven.jar.manifest=${maven.build.dir}/tmp/MANIFEST.MF

Modified: geronimo/trunk/applications/daytrader/wsappclient/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/wsappclient/project.xml?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/wsappclient/project.xml (original)
+++ geronimo/trunk/applications/daytrader/wsappclient/project.xml Tue Jan 17 19:53:51 2006
@@ -4,7 +4,7 @@
   <extend>../../../etc/project.xml</extend>
   <pomVersion>3</pomVersion>
   <artifactId>daytrader-wsappclient</artifactId>
-  <name>daytrader-wsappclient</name>
+  <name>DayTrader :: WS Application Client</name>
   <package>org.apache.geronimo.samples.daytrader</package>
   <description>Common files for day Trader</description>
   <dependencies>

Modified: geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF?rev=370034&r1=370033&r2=370034&view=diff
==============================================================================
--- geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF (original)
+++ geronimo/trunk/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF Tue
Jan 17 19:53:51 2006
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Class-Path: daytrader-ejb-1.1-SNAPSHOT.jar
+Class-Path: daytrader-ejb-${daytrader_version}.jar
 Created-By: 1.4.2_08 (Sun Microsystems Inc.)
 Ant-Version: Apache Ant 1.5.4 
 Main-Class: org.apache.geronimo.samples.daytrader.client.ws.ClientApp



Mime
View raw message