You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2009/12/16 22:56:50 UTC
svn commit: r891444 - in /geronimo/sandbox/jbohn/daytrader-bp-new/modules:
./ daytrader-beans/ daytrader-core/ daytrader-entities/
daytrader-persist-jdbc/ daytrader-persist-jpa/
daytrader-tradeservices-interface/
Author: jbohn
Date: Wed Dec 16 21:56:50 2009
New Revision: 891444
URL: http://svn.apache.org/viewvc?rev=891444&view=rev
Log:
use daytrader-entities rather than daytrader-beans everywhere, ensure we import interfaces that are exported, cleanup the poms and dependencies, etc...
Modified:
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml?rev=891444&r1=891443&r2=891444&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-beans/pom.xml Wed Dec 16 21:56:50 2009
@@ -43,64 +43,6 @@
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
--->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-<!-- OpenJPA depends
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <scope>provided</scope>
- </dependency>
- OpenJPA PCEnhancer depends
- <dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
- <version>1.13.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- <scope>provided</scope>
- </dependency>
- end OpenJPA PCEnhancer depends -->
</dependencies>
<build>
<resources>
@@ -109,49 +51,19 @@
<filtering>true</filtering>
</resource>
</resources>
-<!--
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <path id="enhance.path.ref">
- <fileset dir="${project.build.outputDirectory}">
- <include name="*Bean*/*.class"/>
- </fileset>
- </path>
- <pathconvert property="enhance.files"
- refid="enhance.path.ref"
- pathsep=" "/>
- <java classname="org.apache.openjpa.enhance.PCEnhancer">
- <arg line="-p persistence.xml"/>
- <arg line="${enhance.files}"/>
- <classpath>
- <path refid="maven.dependency.classpath"/>
- <path refid="maven.compile.classpath"/>
- </classpath>
- </java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
--->
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>org.apache.geronimo.samples.daytrader.beans;version=1.0.0</Export-Package>
+ <Export-Package>
+ org.apache.geronimo.samples.daytrader.beans;version=1.0.0
+ </Export-Package>
+ <Import-Package>
+ org.apache.geronimo.samples.daytrader.beans;version=1.0,
+ org.apache.geronimo.samples.daytrader.util;version=1.0,
+ </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml?rev=891444&r1=891443&r2=891444&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-core/pom.xml Wed Dec 16 21:56:50 2009
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-beans</artifactId>
+ <artifactId>daytrader-entities</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
@@ -55,38 +55,6 @@
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <scope>provided</scope>
- </dependency>
--->
</dependencies>
<build>
@@ -106,13 +74,12 @@
org.apache.geronimo.samples.daytrader.core.spi;version=1.0.0
</Export-Package>
<Import-Package>
+ org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
org.apache.geronimo.samples.daytrader.beans;version=1.0,
org.apache.geronimo.samples.daytrader.util;version=1.0,
org.apache.geronimo.samples.daytrader.spi;version=1.0,
javax.naming,
javax.sql
- <!--javax.persistence;version=1.0.0,-->
- <!--javax.transaction-->
</Import-Package>
<Private-Package>
org.apache.geronimo.samples.daytrader.core
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml?rev=891444&r1=891443&r2=891444&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-entities/pom.xml Wed Dec 16 21:56:50 2009
@@ -45,11 +45,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -59,21 +54,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<scope>provided</scope>
@@ -145,10 +125,12 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>org.apache.geronimo.samples.daytrader.beans*;version=1.0.0</Export-Package>
+ <Export-Package>
+ org.apache.geronimo.samples.daytrader.beans;version=1.0.0
+ </Export-Package>
<Import-Package>
+ org.apache.geronimo.samples.daytrader.beans;version=1.0,
org.apache.geronimo.samples.daytrader.util;version=1.0,
- <!--*-->
org.apache.openjpa.enhance;version=1.3.0,
org.apache.openjpa.util;version=1.3.0,
javax.persistence;version=1.0.0
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml?rev=891444&r1=891443&r2=891444&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jdbc/pom.xml Wed Dec 16 21:56:50 2009
@@ -45,55 +45,21 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-entities</artifactId>
+ <artifactId>daytrader-tradeservices-interface</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-tradeservices-interface</artifactId>
+ <artifactId>daytrader-entities</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
--->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <scope>provided</scope>
- </dependency>
--->
</dependencies>
<build>
@@ -118,8 +84,6 @@
org.apache.geronimo.samples.daytrader.spi;version=1.0,
javax.naming,
javax.sql
- <!--javax.persistence;version=1.0.0,-->
- <!--javax.transaction-->
</Import-Package>
<Private-Package>
org.apache.geronimo.samples.daytrader.persist.jdbc
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml?rev=891444&r1=891443&r2=891444&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-persist-jpa/pom.xml Wed Dec 16 21:56:50 2009
@@ -45,53 +45,21 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-beans</artifactId>
+ <artifactId>daytrader-tradeservices-interface</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-tradeservices-interface</artifactId>
+ <artifactId>daytrader-entities</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
--->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
@@ -114,10 +82,7 @@
org.apache.geronimo.samples.daytrader.beans;version=1.0,
org.apache.geronimo.samples.daytrader.util;version=1.0,
org.apache.geronimo.samples.daytrader.spi;version=1.0,
- javax.naming,
- javax.sql,
- javax.persistence;version=1.0.0,
- javax.transaction
+ javax.persistence;version=1.0.0
</Import-Package>
<Private-Package>
org.apache.geronimo.samples.daytrader.persist.jpa
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml?rev=891444&r1=891443&r2=891444&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-tradeservices-interface/pom.xml Wed Dec 16 21:56:50 2009
@@ -39,10 +39,15 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.daytrader.modules</groupId>
- <artifactId>daytrader-beans</artifactId>
+ <artifactId>daytrader-entities</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -62,7 +67,7 @@
org.apache.geronimo.samples.daytrader.spi;version=1.0.0
</Export-Package>
<Import-Package>
- org.apache.geronimo.samples.daytrader.core.spi;version=1.0,
+ org.apache.geronimo.samples.daytrader.spi;version=1.0,
org.apache.geronimo.samples.daytrader.beans;version=1.0
</Import-Package>
</instructions>
Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml?rev=891444&r1=891443&r2=891444&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/pom.xml Wed Dec 16 21:56:50 2009
@@ -34,8 +34,8 @@
<module>daytrader-util</module>
<module>daytrader-beans</module>
<module>daytrader-entities</module>
- <module>daytrader-core</module>
<module>daytrader-tradeservices-interface</module>
+ <module>daytrader-core</module>
<module>daytrader-persist-jdbc</module>
<module>daytrader-persist-jpa</module>
</modules>