Jeff, this doesn't require a review since its fixing the issues with construction. Thanks...I'll
apply this.
Jeff Genender wrote:
I have some updates to the daytrader poms that make the ear class-path
entries correct in the manifests. The patch is included with this
email...
Thanks,
Jeff
Index: modules/ejb/pom.xml
===================================================================
--- modules/ejb/pom.xml (revision 410427)
+++ modules/ejb/pom.xml (working copy)
@@ -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>
Index: modules/ear/pom.xml
===================================================================
--- modules/ear/pom.xml (revision 410427)
+++ modules/ear/pom.xml (working copy)
@@ -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>
Index: modules/wsappclient/pom.xml
===================================================================
--- modules/wsappclient/pom.xml (revision 410427)
+++ modules/wsappclient/pom.xml (working copy)
@@ -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>
Index: modules/web/pom.xml
===================================================================
--- modules/web/pom.xml (revision 410427)
+++ modules/web/pom.xml (working copy)
@@ -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>