You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ho...@apache.org on 2006/03/07 23:12:32 UTC

svn commit: r384033 - in /geronimo/daytrader/trunk: ./ derby/ images/ modules/derby/ modules/ejb/ modules/ejb/src/ modules/ejb/src/main/resources/ modules/ejb/src/main/resources/META-INF/ plans/

Author: hogstrom
Date: Tue Mar  7 14:12:30 2006
New Revision: 384033

URL: http://svn.apache.org/viewcvs?rev=384033&view=rev
Log:
Maven 2 changes

Added:
    geronimo/daytrader/trunk/modules/derby/
      - copied from r383756, geronimo/daytrader/trunk/derby/
    geronimo/daytrader/trunk/modules/ejb/pom.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml
      - copied, changed from r383975, geronimo/daytrader/trunk/modules/ejb/src/main/resources/ejb-jar.xml
    geronimo/daytrader/trunk/pom.xml
Removed:
    geronimo/daytrader/trunk/derby/
    geronimo/daytrader/trunk/modules/ejb/src/ejb-jar.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/ejb-jar.xml
    geronimo/daytrader/trunk/project.properties
Modified:
    geronimo/daytrader/trunk/images/daytrader2.psd
    geronimo/daytrader/trunk/plans/dayTrader-plan.xml

Modified: geronimo/daytrader/trunk/images/daytrader2.psd
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/images/daytrader2.psd?rev=384033&r1=384032&r2=384033&view=diff
==============================================================================
Binary files - no diff available.

Added: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/pom.xml?rev=384033&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (added)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Tue Mar  7 14:12:30 2006
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.geronimo.samples.daytrader</groupId>
+    <artifactId>daytrader</artifactId>
+    <version>1.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>daytrader-ejb</artifactId>
+  <name>DayTrader :: EJBs</name>
+  <packaging>ejb</packaging>
+  <description>Daytrader EJBs</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.samples.daytrader</groupId>
+      <artifactId>daytrader-wsappclient</artifactId>
+      <version>1.1-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.3</version>
+      <!-- Caveat: We need a provided scope to make the deployment in Geronimo work -->
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-ejb-plugin</artifactId>
+        <configuration>
+           <generateClient>true</generateClient>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <configuration>
+          <container>
+            <containerId>jboss4x</containerId>
+            <zipUrlInstaller>
+              <url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.0.2.zip</url>
+              <installDir>${java.io.tmpdir}/cargo-installs</installDir>
+            </zipUrlInstaller>
+          </container>
+          <configuration>
+            <dir>${project.build.directory}/jboss</dir>
+          </configuration>
+        </configuration>
+        <!-- Configuration to do hot deployment to a running JBoss container
+        <configuration>
+          <container>
+            <containerId>jboss4x</containerId>
+            <type>remote</type>
+          </container>
+        </configuration>
+        -->
+      </plugin>
+    </plugins>
+  </build>
+</project>

Copied: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml (from r383975, geronimo/daytrader/trunk/modules/ejb/src/main/resources/ejb-jar.xml)
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml?p2=geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml&p1=geronimo/daytrader/trunk/modules/ejb/src/main/resources/ejb-jar.xml&r1=383975&r2=384033&rev=384033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/ejb-jar.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml Tue Mar  7 14:12:30 2006
@@ -2,7 +2,7 @@
 <ejb-jar version="2.1"
     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/ejb-jar_2_1.xsd"> 
-    <display-name>TradeEJBs</display-name>
+    <display-name>DayTraderEJBs</display-name>
     <enterprise-beans>
         <session>
             <description>Trade Session EJB manages all Trading services</description>

Modified: geronimo/daytrader/trunk/plans/dayTrader-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/plans/dayTrader-plan.xml?rev=384033&r1=384032&r2=384033&view=diff
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-plan.xml Tue Mar  7 14:12:30 2006
@@ -3,7 +3,7 @@
     configId="Trade">
 
     <module>
-        <web>daytrader-web-1.0-SNAPSHOT.war</web>
+        <web>daytrader-web-1.1-SNAPSHOT.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/web"
             configId="Web" parentId="Trade">
             <context-priority-classloader>false</context-priority-classloader>
@@ -30,7 +30,7 @@
     ##
     -->
     <module>
-        <ejb>daytrader-ejb-1.0-SNAPSHOT.jar</ejb>     <!--  Note this must match the -->
+        <ejb>daytrader-ejb-1.1-SNAPSHOT.jar</ejb>     <!--  Note this must match the -->
         <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
                      configId="TradeEJBs"
                      parentId="Web">
@@ -513,7 +513,7 @@
 
 
     <module>
-        <java>daytrader-streamer-1.0-SNAPSHOT.jar</java>
+        <java>daytrader-streamer-1.1-SNAPSHOT.jar</java>
         <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
             configId="foo"
             clientConfigId="tradeStreamerAppclient">

Added: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/pom.xml?rev=384033&view=auto
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (added)
+++ geronimo/daytrader/trunk/pom.xml Tue Mar  7 14:12:30 2006
@@ -0,0 +1,74 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.samples.daytrader</groupId>
+  <artifactId>daytrader</artifactId>
+  <name>DayTrader :: Performance Benchmark Sample</name>
+  <packaging>pom</packaging>
+  <version>1.1-SNAPSHOT</version>
+  <description>J2EE 1.4 Performance Benchmark Sample Application</description>
+  <inceptionYear>2005</inceptionYear>
+  <developers>
+    <developer>
+      <name>Matt Hogstrom</name>
+      <id>hogstrom</id>
+      <email>hogstrom@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>+5</timezone>
+    </developer>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Build Engineer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Christopher Blythe</name>
+      <roles>
+        <role>Added code to improve stability and new features</role>
+      </roles>
+    </contributor>
+    <contributor>
+      <name>Stan Cox</name>
+      <roles>
+        <role>Original Developer</role>
+      </roles>
+      <timezone>+5</timezone>
+    </contributor>
+    <contributor>
+      <name>Andrew Spyker</name>
+      <roles>
+        <role>Added the WSAppClient</role>
+      </roles>
+      <timezone>+5</timezone>
+    </contributor>
+  </contributors>
+  <dependencies/>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+  <modules>
+    <module>modules/ejb</module>
+    <module>modules/web</module>
+    <module>modules/streamer</module>
+    <module>modules/wsappclient</module>
+    <module>modules/ear</module>
+  </modules>
+  <profiles>
+    <profile>
+      <id>test</id>
+      <modules>
+        <module>functional-tests</module>
+      </modules>
+    </profile>
+  </profiles>
+</project>