geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r396316 - in /geronimo/daytrader/trunk/modules: ear/pom.xml ejb/pom.xml streamer/pom.xml web/pom.xml wsappclient/pom.xml
Date Sun, 23 Apr 2006 21:12:48 GMT
Author: hogstrom
Date: Sun Apr 23 14:12:46 2006
New Revision: 396316

URL: http://svn.apache.org/viewcvs?rev=396316&view=rev
Log:
Updated the poms in the various modules to:

1. Improve readbility
2. Change ear packaging to use smaller artifact names than the default ones generated by maven.



Modified:
    geronimo/daytrader/trunk/modules/ear/pom.xml
    geronimo/daytrader/trunk/modules/ejb/pom.xml
    geronimo/daytrader/trunk/modules/streamer/pom.xml
    geronimo/daytrader/trunk/modules/web/pom.xml
    geronimo/daytrader/trunk/modules/wsappclient/pom.xml

Modified: geronimo/daytrader/trunk/modules/ear/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ear/pom.xml?rev=396316&r1=396315&r2=396316&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Sun Apr 23 14:12:46 2006
@@ -1,82 +1,94 @@
 <?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-ear</artifactId>
-  <name>DayTrader :: Enterprise Application</name>
-  <packaging>ear</packaging>
-  <description>Daytrader EAR</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.samples.daytrader</groupId>
-      <artifactId>daytrader-web</artifactId>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.samples.daytrader</groupId>
-      <artifactId>daytrader-ejb</artifactId>
-      <type>ejb</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.samples.daytrader</groupId>
-      <artifactId>daytrader-streamer</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.samples.daytrader</groupId>
-      <artifactId>daytrader-wsappclient</artifactId>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-ear-plugin</artifactId>
-        <configuration>
-          <displayName>DayTrader 1.1</displayName>
-          <description>DayTrader Stock Trading Performance Benchmark Sample</description>
-          <version>1.4</version>
-          <modules>
-            <webModule>
-              <groupId>org.apache.geronimo.samples.daytrader</groupId>
-              <artifactId>daytrader-web</artifactId>
-              <contextRoot>/daytrader</contextRoot>
-            </webModule>
-          </modules>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <configuration>
-          <container>
-            <containerId>geronimo1x</containerId>
-            <log>${project.build.directory}/cargo.log</log>
-            <output>${project.build.directory}/geronimo.log</output>
-            <zipUrlInstaller>
-              <url>http://www.apache.org/dist/geronimo/1.0/geronimo-tomcat-j2ee-1.0.zip</url>
-              <installDir>${java.io.tmpdir}/cargo-installs</installDir>
-            </zipUrlInstaller>
-          </container>
-          <configuration>
-            <dir>${project.build.directory}/geronimo</dir>
-          </configuration>
-          <deployer>
-            <deployables>
-              <deployable>
-                <properties>
-                  <plan>${basedir}/src/main/deployment/dayTrader-plan.xml</plan>
-                </properties>
-              </deployable>
-            </deployables>
-          </deployer>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.geronimo.samples.daytrader</groupId>
+		<artifactId>daytrader</artifactId>
+		<version>1.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>daytrader-ear</artifactId>
+	<name>DayTrader :: Enterprise Application</name>
+	<packaging>ear</packaging>
+	<description>Daytrader EAR</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-web</artifactId>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-ejb</artifactId>
+			<type>ejb</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-streamer</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.samples.daytrader</groupId>
+			<artifactId>daytrader-wsappclient</artifactId>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-ear-plugin</artifactId>
+				<configuration>
+					<displayName>DayTrader 1.1</displayName>
+					<description>
+						DayTrader Stock Trading Performance Benchmark
+						Sample
+					</description>
+					<version>1.4</version>
+					<modules>
+						<webModule>
+							<groupId>
+								org.apache.geronimo.samples.daytrader
+							</groupId>
+							<artifactId>daytrader-web</artifactId>
+							<contextRoot>/daytrader</contextRoot>
+							<bundleFileName>web.war</bundleFileName>
+						</webModule>
+						<ejbModule>
+							<groupId>
+								org.apache.geronimo.samples.daytrader
+							</groupId>
+							<artifactId>daytrader-ejb</artifactId>
+							<bundleFileName>ejb.jar</bundleFileName>
+						</ejbModule>
+						<javaModule>
+							<groupId>
+								org.apache.geronimo.samples.daytrader
+							</groupId>
+							<artifactId>daytrader-streamer</artifactId>
+							<bundleFileName>
+								streamer.jar
+							</bundleFileName>
+							<includeInApplicationXml>
+								true
+							</includeInApplicationXml>
+						</javaModule>
+						<javaModule>
+							<groupId>
+								org.apache.geronimo.samples.daytrader
+							</groupId>
+							<artifactId>
+								daytrader-wsappclient
+							</artifactId>
+							<bundleFileName>
+								wsappclient.jar
+							</bundleFileName>
+							<!-- <includeInApplicationXml>true</includeInApplicationXml> -->
+						</javaModule>
+					</modules>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/ejb/pom.xml?rev=396316&r1=396315&r2=396316&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Sun Apr 23 14:12:46 2006
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.geronimo.samples.daytrader</groupId>
@@ -40,34 +42,6 @@
 				<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>

Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=396316&r1=396315&r2=396316&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Sun Apr 23 14:12:46 2006
@@ -34,8 +34,11 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestEntries>
+              <class-path>ejb.jar</class-path>
+            </manifestEntries>
             <manifest>
-              <addClasspath>true</addClasspath>
+<!--              <addClasspath>true</addClasspath>  -->
               <main-class>org.apache.geronimo.samples.daytrader.client.TradeClient</main-class>
             </manifest>
           </archive>

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/pom.xml?rev=396316&r1=396315&r2=396316&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Sun Apr 23 14:12:46 2006
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
-                             http://maven.apache.org/maven-v4_0_0.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.geronimo.samples.daytrader</groupId>
@@ -54,6 +53,34 @@
 							${basedir}/src/main/webapp/WEB-INF/classes/build.properties
 						</filter>
 					</filters>
+					<ejbModule>
+						<groupId>
+							org.apache.geronimo.samples.daytrader
+						</groupId>
+						<artifactId>daytrader-ejb</artifactId>
+						<bundleFileName>ejb.jar</bundleFileName>
+					</ejbModule>
+					<javaModule>
+						<groupId>
+							org.apache.geronimo.samples.daytrader
+						</groupId>
+						<artifactId>daytrader-streamer</artifactId>
+						<bundleFileName>
+							streamer.jar
+						</bundleFileName>
+					</javaModule>
+					<javaModule>
+						<groupId>
+							org.apache.geronimo.samples.daytrader
+						</groupId>
+						<artifactId>
+							daytrader-wsappclient
+						</artifactId>
+						<bundleFileName>
+							wsappclient.jar
+						</bundleFileName>
+					</javaModule>
+					
 					<resources>
 						<resource
 							implementation="org.apache.maven.model.Resource">
@@ -66,33 +93,6 @@
 							</includes>
 						</resource>
 					</resources>
-				</configuration>
-			</plugin>
-			<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>
 			</plugin>
 		</plugins>

Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?rev=396316&r1=396315&r2=396316&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Sun Apr 23 14:12:46 2006
@@ -32,7 +32,7 @@
                remove the manifestEntries section below and this comment. -->
           <archive>
             <manifestEntries>
-              <class-path>daytrader-ejb-${version}.jar</class-path>
+              <class-path>ejb.jar</class-path>
             </manifestEntries>
             <manifest>
               <main-class>org.apache.geronimo.samples.daytrader.client.ws.ClientApp</main-class>



Mime
View raw message