geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r411006 - in /geronimo/daytrader/trunk/modules: ear/pom.xml ejb/pom.xml streamer/pom.xml web/pom.xml wsappclient/pom.xml
Date Fri, 02 Jun 2006 00:35:10 GMT
Author: jgenender
Date: Thu Jun  1 17:35:09 2006
New Revision: 411006

URL: http://svn.apache.org/viewvc?rev=411006&view=rev
Log:
Fix Daytrader poms to correctly set the Class-Path manifest entires.

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/viewvc/geronimo/daytrader/trunk/modules/ear/pom.xml?rev=411006&r1=411005&r2=411006&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Thu Jun  1 17:35:09 2006
@@ -1,110 +1,111 @@
 <?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">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>geronimo</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>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</connection>
-    <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ear</url>
-  </scm>
-	<dependencies>
-		<dependency>
-			<groupId>geronimo</groupId>
-			<artifactId>daytrader-web</artifactId>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>geronimo</groupId>
-			<artifactId>daytrader-ejb</artifactId>
-			<type>ejb</type>
-		</dependency>
-		<dependency>
-			<groupId>geronimo</groupId>
-			<artifactId>daytrader-streamer</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>geronimo</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>
-								geronimo
-							</groupId>
-							<artifactId>daytrader-web</artifactId>
-							<contextRoot>/daytrader</contextRoot>
-							<bundleFileName>web.war</bundleFileName>
-						</webModule>
-						<ejbModule>
-							<groupId>
-								geronimo
-							</groupId>
-							<artifactId>daytrader-ejb</artifactId>
-							<bundleFileName>dt-ejb.jar</bundleFileName>
-						</ejbModule>
-						<javaModule>
-							<groupId>
-								geronimo
-							</groupId>
-							<artifactId>daytrader-streamer</artifactId>
-							<bundleFileName>
-								streamer.jar
-							</bundleFileName>
-							<includeInApplicationXml>
-								true
-							</includeInApplicationXml>
-						</javaModule>
-						<javaModule>
-							<groupId>
-								geronimo
-							</groupId>
-							<artifactId>
-								daytrader-wsappclient
-							</artifactId>
-							<bundleFileName>
-								wsappclient.jar
-							</bundleFileName>
-							<!-- <includeInApplicationXml>true</includeInApplicationXml> -->
-						</javaModule>
-					</modules>
-				</configuration>
-			</plugin>
-      <plugin>
-        <artifactId>maven-one-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>install-maven-one-repository</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-		</plugins>
-	</build>
+    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>geronimo</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>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ear</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-web</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-ejb</artifactId>
+            <type>ejb</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>daytrader-streamer</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</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>
+                                geronimo
+                            </groupId>
+                            <artifactId>daytrader-web</artifactId>
+                            <contextRoot>/daytrader</contextRoot>
+                            <bundleFileName>web.war</bundleFileName>
+                        </webModule>
+                        <ejbModule>
+                            <groupId>
+                                geronimo
+                            </groupId>
+                            <artifactId>daytrader-ejb</artifactId>
+                            <bundleFileName>dt-ejb.jar</bundleFileName>
+                        </ejbModule>
+                        <javaModule>
+                            <groupId>
+                                geronimo
+                            </groupId>
+                            <artifactId>daytrader-streamer</artifactId>
+                            <bundleFileName>
+                                streamer.jar
+                            </bundleFileName>
+                            <includeInApplicationXml>
+                                true
+                            </includeInApplicationXml>
+                        </javaModule>
+                        <javaModule>
+                            <groupId>
+                                geronimo
+                            </groupId>
+                            <artifactId>
+                                daytrader-wsappclient
+                            </artifactId>
+                            <bundleFileName>
+                                wsappclient.jar
+                            </bundleFileName>
+                            <!-- <includeInApplicationXml>true</includeInApplicationXml>
-->
+
+                        </javaModule>
+                    </modules>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-one-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>install-maven-one-repository</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/pom.xml?rev=411006&r1=411005&r2=411006&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Thu Jun  1 17:35:09 2006
@@ -56,6 +56,11 @@
                 <artifactId>maven-ejb-plugin</artifactId>
                 <configuration>
                     <generateClient>true</generateClient>
+                    <archive>
+                        <manifestEntries>
+                            <Class-Path>wsappclient.jar</Class-Path>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?rev=411006&r1=411005&r2=411006&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Thu Jun  1 17:35:09 2006
@@ -24,6 +24,7 @@
       <groupId>geronimo</groupId>
       <artifactId>daytrader-ejb</artifactId>
       <version>1.1-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?rev=411006&r1=411005&r2=411006&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Thu Jun  1 17:35:09 2006
@@ -80,7 +80,7 @@
 					</filters>
                     <archive>
                         <manifestEntries>
-                            <Classpath>dt-ejb.jar streamer.jar wsappclient.jar</Classpath>
+                            <Class-Path>dt-ejb.jar streamer.jar wsappclient.jar</Class-Path>
                         </manifestEntries> 
                     </archive>
 					

Modified: geronimo/daytrader/trunk/modules/wsappclient/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/wsappclient/pom.xml?rev=411006&r1=411005&r2=411006&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/wsappclient/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/wsappclient/pom.xml Thu Jun  1 17:35:09 2006
@@ -37,7 +37,7 @@
                remove the manifestEntries section below and this comment. -->
           <archive>
             <manifestEntries>
-              <class-path>ejb.jar</class-path>
+              <class-path>dt-ejb.jar</class-path>
             </manifestEntries>
             <manifest>
               <main-class>org.apache.geronimo.samples.daytrader.client.ws.ClientApp</main-class>



Mime
View raw message