geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r369657 - in /geronimo/branches/1.0/applications/daytrader: ./ bin/ core/ derby/ ear/ ear/src/application/META-INF/ ejb/ streamer/ web/ web/src/webapp/WEB-INF/ wsappclient/
Date Tue, 17 Jan 2006 03:38:10 GMT
Author: hogstrom
Date: Mon Jan 16 19:38:01 2006
New Revision: 369657

URL: http://svn.apache.org/viewcvs?rev=369657&view=rev
Log:
Removed hardcoded dependencies in DayTrader

Added:
    geronimo/branches/1.0/applications/daytrader/
      - copied from r369583, geronimo/trunk/applications/daytrader/
    geronimo/branches/1.0/applications/daytrader/README
      - copied unchanged from r369597, geronimo/trunk/applications/daytrader/README
    geronimo/branches/1.0/applications/daytrader/bin/
      - copied from r369597, geronimo/trunk/applications/daytrader/bin/
    geronimo/branches/1.0/applications/daytrader/core/
      - copied from r369597, geronimo/trunk/applications/daytrader/core/
    geronimo/branches/1.0/applications/daytrader/dayTrader-plan.xml
      - copied unchanged from r369597, geronimo/trunk/applications/daytrader/dayTrader-plan.xml
    geronimo/branches/1.0/applications/daytrader/db2-resource-plan.xml
      - copied unchanged from r369597, geronimo/trunk/applications/daytrader/db2-resource-plan.xml
    geronimo/branches/1.0/applications/daytrader/derby/
      - copied from r369597, geronimo/trunk/applications/daytrader/derby/
    geronimo/branches/1.0/applications/daytrader/ear/
      - copied from r369597, geronimo/trunk/applications/daytrader/ear/
    geronimo/branches/1.0/applications/daytrader/ejb/
      - copied from r369597, geronimo/trunk/applications/daytrader/ejb/
    geronimo/branches/1.0/applications/daytrader/jms-resource-plan.xml
      - copied unchanged from r369597, geronimo/trunk/applications/daytrader/jms-resource-plan.xml
    geronimo/branches/1.0/applications/daytrader/project.properties
      - copied unchanged from r369597, geronimo/trunk/applications/daytrader/project.properties
    geronimo/branches/1.0/applications/daytrader/streamer/
      - copied from r369597, geronimo/trunk/applications/daytrader/streamer/
    geronimo/branches/1.0/applications/daytrader/web/
      - copied from r369597, geronimo/trunk/applications/daytrader/web/
    geronimo/branches/1.0/applications/daytrader/wsappclient/
      - copied from r369597, geronimo/trunk/applications/daytrader/wsappclient/
Modified:
    geronimo/branches/1.0/applications/daytrader/ear/maven.xml
    geronimo/branches/1.0/applications/daytrader/ear/project.properties
    geronimo/branches/1.0/applications/daytrader/ear/src/application/META-INF/application.xml
    geronimo/branches/1.0/applications/daytrader/web/maven.xml
    geronimo/branches/1.0/applications/daytrader/web/project.properties
    geronimo/branches/1.0/applications/daytrader/web/src/webapp/WEB-INF/web.xml

Modified: geronimo/branches/1.0/applications/daytrader/ear/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/ear/maven.xml?rev=369657&r1=369597&r2=369657&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/ear/maven.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/ear/maven.xml Mon Jan 16 19:38:01 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/branches/1.0/applications/daytrader/ear/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/ear/project.properties?rev=369657&r1=369597&r2=369657&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/ear/project.properties (original)
+++ geronimo/branches/1.0/applications/daytrader/ear/project.properties Mon Jan 16 19:38:01
2006
@@ -1 +1,3 @@
 maven.multiproject.type=ear
+
+maven.ear.appxml.generate=true

Modified: geronimo/branches/1.0/applications/daytrader/ear/src/application/META-INF/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/ear/src/application/META-INF/application.xml?rev=369657&r1=369597&r2=369657&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/ear/src/application/META-INF/application.xml
(original)
+++ geronimo/branches/1.0/applications/daytrader/ear/src/application/META-INF/application.xml
Mon Jan 16 19:38:01 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/branches/1.0/applications/daytrader/web/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/web/maven.xml?rev=369657&r1=369597&r2=369657&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/web/maven.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/web/maven.xml Mon Jan 16 19:38:01 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/branches/1.0/applications/daytrader/web/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/web/project.properties?rev=369657&r1=369597&r2=369657&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/web/project.properties (original)
+++ geronimo/branches/1.0/applications/daytrader/web/project.properties Mon Jan 16 19:38:01
2006
@@ -1 +1,2 @@
 maven.multiproject.type=war
+maven.war.webxml=true

Modified: geronimo/branches/1.0/applications/daytrader/web/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/web/src/webapp/WEB-INF/web.xml?rev=369657&r1=369597&r2=369657&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/web/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/web/src/webapp/WEB-INF/web.xml Mon Jan 16
19:38:01 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>



Mime
View raw message