geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r835489 - in /geronimo/sandbox/jbohn/daytrader-bp-AppEM: assemblies/web/ assemblies/web/daytrader-eba-jpa/ assemblies/web/daytrader-web-jdbc/ assemblies/web/daytrader-web-jpa/ modules/core/src/main/java/org/apache/geronimo/samples/daytrader...
Date Thu, 12 Nov 2009 18:35:31 GMT
Author: jbohn
Date: Thu Nov 12 18:35:31 2009
New Revision: 835489

URL: http://svn.apache.org/viewvc?rev=835489&view=rev
Log:
update App managed EM version to be consistent with Container managed EM

Added:
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-eba-jpa/
      - copied from r835401, geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-eba-jpa/
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/
      - copied from r835400, geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/
Modified:
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/pom.xml
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/pom.xml?rev=835489&r1=835488&r2=835489&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/pom.xml Thu
Nov 12 18:35:31 2009
@@ -44,20 +44,12 @@
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
-<!--
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-beans</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
--->
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-entities</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-web</artifactId>
@@ -90,13 +82,6 @@
 
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>ops4j.releases</id>
-            <url>http://repository.ops4j.org/maven2</url>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/pom.xml?rev=835489&r1=835400&r2=835489&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/pom.xml Thu
Nov 12 18:35:31 2009
@@ -26,10 +26,10 @@
     </parent>
     
     <groupId>org.apache.geronimo.daytrader.assemblies.web</groupId>
-    <artifactId>daytrader-web-jdbc</artifactId>    
+    <artifactId>daytrader-web-jpa</artifactId>    
     <packaging>war</packaging>
-    <name>DayTrader :: Assemblies - Web + Direct JDBC</name>
-    <description>A version of Daytrader for basic Web constainers</description>
+    <name>DayTrader :: Assemblies - Web + Direct JPA</name>
+    <description>A version of Daytrader for basic Web containers and JPA</description>
     
     <dependencies>
         <dependency>
@@ -44,14 +44,6 @@
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.daytrader.modules</groupId>
-            <artifactId>daytrader-beans</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
--->
         <dependency>
             <groupId>org.apache.geronimo.daytrader.modules</groupId>
             <artifactId>daytrader-entities</artifactId>
@@ -90,13 +82,6 @@
 
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>ops4j.releases</id>
-            <url>http://repository.ops4j.org/maven2</url>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/pom.xml?rev=835489&r1=835488&r2=835489&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/pom.xml (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/pom.xml Thu Nov 12 18:35:31 2009
@@ -32,9 +32,8 @@
 
     <modules>
         <module>daytrader-web-jdbc</module>
-<!--
         <module>daytrader-web-jpa</module>
--->
+        <module>daytrader-eba-jpa</module>
     </modules>
 
 </project>

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java?rev=835489&r1=835488&r2=835489&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/TradeServicesManagerImpl.java
Thu Nov 12 18:35:31 2009
@@ -60,6 +60,8 @@
       * TradeServicesManagerImpl null constructor
       */
     public TradeServicesManagerImpl() {
+        if (Log.doTrace())
+            Log.trace("TradeServicesManagerImpl()");
     }
 
     /**

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml?rev=835489&r1=835488&r2=835489&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml
(original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/modules/entities/src/main/resources/META-INF/persistence.xml
Thu Nov 12 18:35:31 2009
@@ -33,7 +33,7 @@
             <property name="openjpa.jdbc.DBDictionary" value="derby" />
             <property name="openjpa.BrokerImpl" value="non-finalizing" /> 
             <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
-            <property name="openjpa.jdbc.UpdateManager" value="com.ibm.ws.persistence.jdbc.kernel.OperationOrderUpdateManager(batchLimit=0)"
/> 
+            <property name="openjpa.jdbc.UpdateManager" value="org.apache.openjpa.jdbc.kernel.BatchingConstraintUpdateManager"/>
         </properties>
         
         
@@ -45,7 +45,7 @@
         <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
         <property name="openjpa.Multithreaded" value="true"/>
         <property name="openjpa.Compatibility" value="flushBeforeDetach=false"/>
-        <property name="openjpa.jdbc.UpdateManager" value="org.apache.openjpa.jdbc.kernel.BatchingConstraintUpdateManager"/>
+        <property name="openjpa.jdbc.UpdateManager" value="com.ibm.ws.persistence.jdbc.kernel.OperationOrderUpdateManager(batchLimit=0)"
/> 
       </properties>
       -->
     </persistence-unit>



Mime
View raw message