geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r384196 - in /geronimo/daytrader/trunk/modules: ear/pom.xml ear/src/application/ ear/src/main/ ear/src/main/application/ streamer/src/main/client/ streamer/src/main/resources/ web/pom.xml
Date Wed, 08 Mar 2006 12:19:34 GMT
Author: hogstrom
Date: Wed Mar  8 04:19:33 2006
New Revision: 384196

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

Added:
    geronimo/daytrader/trunk/modules/ear/src/main/
    geronimo/daytrader/trunk/modules/ear/src/main/application/
      - copied from r384033, geronimo/daytrader/trunk/modules/ear/src/application/
    geronimo/daytrader/trunk/modules/streamer/src/main/resources/
      - copied from r384035, geronimo/daytrader/trunk/modules/streamer/src/main/client/
    geronimo/daytrader/trunk/modules/web/pom.xml
Removed:
    geronimo/daytrader/trunk/modules/ear/src/application/
    geronimo/daytrader/trunk/modules/streamer/src/main/client/
Modified:
    geronimo/daytrader/trunk/modules/ear/pom.xml

Modified: geronimo/daytrader/trunk/modules/ear/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ear/pom.xml?rev=384196&r1=384195&r2=384196&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Wed Mar  8 04:19:33 2006
@@ -40,7 +40,7 @@
       <plugin>
         <artifactId>maven-ear-plugin</artifactId>
         <configuration>
-          <displayName>Trade</displayName>
+          <displayName>DayTrader 1.1</displayName>
           <description>DayTrader Stock Trading Performance Benchmark Sample</description>
           <version>1.4</version>
           <modules>

Added: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/pom.xml?rev=384196&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (added)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Wed Mar  8 04:19:33 2006
@@ -0,0 +1,131 @@
+<?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-web</artifactId>
+  <name>DayTrader :: Web Application</name>
+  <packaging>war</packaging>
+  <description>Daytrader Web</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.samples.daytrader</groupId>
+      <artifactId>daytrader-ejb</artifactId>
+      <version>1.1-SNAPSHOT</version>
+      <!-- Caveat: it should be ejb-client but the daytrader build is not quite perfect
yet... -->
+      <type>ejb</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+      <version>1.0</version>
+      <!-- Caveat: Issue with the Jetty6 plugin not including provided scope. This is
because Maven does
+           not seem to pass provided scope deps. To make the in-place deployment work the
scope has to be
+           compile -->
+      <!--scope>compile</scope-->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty6-plugin</artifactId>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <configuration>
+          <container>
+            <containerId>tomcat5x</containerId>
+            <zipUrlInstaller>
+              <url>http://www.apache.org/dist/jakarta/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.zip</url>
+              <installDir>${java.io.tmpdir}/cargo-installs</installDir>
+            </zipUrlInstaller>
+          </container>
+          <configuration>
+            <dir>${project.build.directory}/tomcat</dir>
+          </configuration>
+        </configuration>
+        <!-- Configuration to use when Tomcat is already installed on your machine
+        <configuration>
+          <container>
+            <containerId>tomcat5x</containerId>
+            <home>c:/apps/jakarta-tomcat-5.0.30</home>
+          </container>
+          <configuration>
+            <dir>${project.build.directory}/tomcat</dir>
+          </configuration>
+        </configuration>
+        -->
+        <!-- Configuration to do hot deployment to a running Tomcat container
+        <configuration>
+          <container>
+            <containerId>tomcat5x</containerId>
+            <type>remote</type>
+          </container>
+          <configuration>
+            <type>runtime</type>
+            <properties>
+              <cargo.remote.username>username</cargo.remote.username>
+              <cargo.remote.password>password</cargo.remote.password>
+            </properties>
+          </configuration>
+        </configuration>
+        -->
+        <!-- Configuration to use when doing a local deployment
+        <configuration>
+          <container>
+            <containerId>tomcat5x</containerId>
+            <home>c:/apps/jakarta-tomcat-5.0.30</home>
+          </container>
+          <configuration>
+            <type>existing</type>
+            <dir>c:/apps/jakarta-tomcat-5.0.30</dir>
+          </configuration>
+        </configuration>
+        -->
+      </plugin>
+      <!-- Test for doing in-place development with Cargo and Jetty
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <configuration>
+          <container>
+            <log>container.log</log>
+            <dependencies>
+              <dependency>
+                <location>${project.build.outputDirectory}</location>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.geronimo.samples.daytrader</groupId>
+                <artifactId>daytrader-ejb</artifactId>
+                <type>ejb</type>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+              </dependency>
+            </dependencies>
+          </container>
+          <configuration>
+            <dir>${project.build.directory}/tomcat</dir>            
+            <deployables>
+              <deployable>
+                <location>${basedir}/src/main/webapp</location>
+              </deployable>
+            </deployables>
+          </configuration>
+        </configuration>
+      </plugin>
+      -->
+    </plugins>
+  </build>
+</project>



Mime
View raw message