geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r472726 - in /geronimo/daytrader/trunk: modules/ear/pom.xml modules/ejb/pom.xml modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeJPA.java modules/streamer/pom.xml modules/web/pom.xml plans/daytrader-jpa-plan.xml
Date Thu, 09 Nov 2006 01:07:57 GMT
Author: djencks
Date: Wed Nov  8 17:07:56 2006
New Revision: 472726

URL: http://svn.apache.org/viewvc?view=rev&rev=472726
Log:
fix query parameter name.  Leave out kitchen sinks. Use sequence def

Modified:
    geronimo/daytrader/trunk/modules/ear/pom.xml
    geronimo/daytrader/trunk/modules/ejb/pom.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeJPA.java
    geronimo/daytrader/trunk/modules/streamer/pom.xml
    geronimo/daytrader/trunk/modules/web/pom.xml
    geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml

Modified: geronimo/daytrader/trunk/modules/ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ear/pom.xml?view=diff&rev=472726&r1=472725&r2=472726
==============================================================================
--- geronimo/daytrader/trunk/modules/ear/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ear/pom.xml Wed Nov  8 17:07:56 2006
@@ -37,13 +37,11 @@
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader-streamer</artifactId>
             <version>${pom.version}</version>
-            <!--<scope>compile</scope>-->
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.daytrader</groupId>
             <artifactId>daytrader-wsappclient</artifactId>
             <version>${pom.version}</version>
-            <!--<scope>compile</scope>-->
         </dependency>
     </dependencies>
     <build>
@@ -52,11 +50,8 @@
                 <artifactId>maven-ear-plugin</artifactId>
                 <version>2.2</version>
                 <configuration>
-                    <displayName>DayTrader 1.2</displayName>
-                    <description>
-                        DayTrader Stock Trading Performance Benchmark
-                        Sample
-                    </description>
+                    <displayName>DayTrader 2.0</displayName>
+                    <description>DayTrader Stock Trading Performance Benchmark Sample</description>
                     <version>1.4</version>
                     <modules>
                         <webModule>
@@ -74,9 +69,7 @@
                             <groupId>org.apache.geronimo.daytrader</groupId>
                             <artifactId>daytrader-streamer</artifactId>
                             <bundleFileName>streamer.jar</bundleFileName>
-                            <includeInApplicationXml>
-                                true
-                            </includeInApplicationXml>
+                            <includeInApplicationXml>true</includeInApplicationXml>
                         </javaModule>
                         <javaModule>
                             <groupId>org.apache.geronimo.daytrader</groupId>
@@ -86,17 +79,6 @@
                         </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>

Modified: geronimo/daytrader/trunk/modules/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/pom.xml?view=diff&rev=472726&r1=472725&r2=472726
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/pom.xml Wed Nov  8 17:07:56 2006
@@ -30,22 +30,27 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_2.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_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-qname_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>commons-logging</groupId>
@@ -61,17 +66,20 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-all</artifactId>
             <version>0.9.6-incubating-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <version>2.6.2</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xmlParserAPIs</artifactId>
             <version>2.2.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeJPA.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeJPA.java?view=diff&rev=472726&r1=472725&r2=472726
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeJPA.java
(original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeJPA.java
Wed Nov  8 17:07:56 2006
@@ -505,10 +505,10 @@
 
             //Get the primary keys for all the closed Orders for this account.
             Query query = entityManager.createNamedQuery("closedOrders");
-            query.setParameter("userId", userID);
+            query.setParameter("userID", userID);
             Collection results = query.getResultList();
             Query updateStatus = entityManager.createNamedQuery("completeClosedOrders");
-            updateStatus.setParameter("userId", userID);
+            updateStatus.setParameter("userID", userID);
             updateStatus.executeUpdate();
             return results;
 //            if (ordersKeys == null) return dataBeans;

Modified: geronimo/daytrader/trunk/modules/streamer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/streamer/pom.xml?view=diff&rev=472726&r1=472725&r2=472726
==============================================================================
--- geronimo/daytrader/trunk/modules/streamer/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/streamer/pom.xml Wed Nov  8 17:07:56 2006
@@ -33,10 +33,23 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_2.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_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-all</artifactId>
+            <version>0.9.6-incubating-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     <build>

Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/pom.xml?view=diff&rev=472726&r1=472725&r2=472726
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Wed Nov  8 17:07:56 2006
@@ -43,23 +43,32 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_2.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-servlet_2.4_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jsp_2.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
             <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <!-- Removed per DAYTRADER-7 due to interop issues on commercial AppServers 
         <dependency>

Modified: geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml?view=diff&rev=472726&r1=472725&r2=472726
==============================================================================
--- geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml Wed Nov  8 17:07:56 2006
@@ -555,7 +555,7 @@
                     <properties>
                         <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
                         <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-                        <!--<property name="openjpa.Sequence" value="table(Table=OPENJPASEQ,
Increment=100)"/>-->
+                        <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ,
Increment=100)"/>
                     </properties>
                 </persistence-unit>
             </persistence>



Mime
View raw message