geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r555419 - in /geronimo/daytrader/trunk: modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/ modules/ejb/src/main/resources/META-INF/ plans/
Date Wed, 11 Jul 2007 22:32:55 GMT
Author: djencks
Date: Wed Jul 11 15:32:54 2007
New Revision: 555419

URL: http://svn.apache.org/viewvc?view=rev&rev=555419
Log:
a few naming tweaks, and add a non-jta datasource to persistence.xml

Modified:
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeJPA.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml
    geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml

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=555419&r1=555418&r2=555419
==============================================================================
--- 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 Jul 11 15:32:54 2007
@@ -938,7 +938,7 @@
         context = sc;
         if (sc != null) {
         try {
-            entityManager = (EntityManager) new InitialContext().lookup("java:comp/env/jpa/daytrader");
+            entityManager = (EntityManager) new InitialContext().lookup("java:comp/env/daytrader");
         } catch (NamingException e) {
             throw new EJBException("could not get Naming Context", e);
         }

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java?view=diff&rev=555419&r1=555418&r2=555419
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java
(original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ejb/TradeBean.java
Wed Jul 11 15:32:54 2007
@@ -1046,8 +1046,8 @@
 			{
 				qConnFactory = (ConnectionFactory) ic.lookup("java:comp/env/jms/QueueConnectionFactory");
                 tConnFactory = (ConnectionFactory) ic.lookup("java:comp/env/jms/TopicConnectionFactory");
-				streamerTopic = (Topic) ic.lookup("java:comp/geronimo/env/jms/TradeStreamerTopic");
-                brokerQueue = (Queue) ic.lookup("java:comp/geronimo/env/jms/TradeBrokerQueue");
+				streamerTopic = (Topic) ic.lookup("java:comp/env/jms/TradeStreamerTopic");
+                brokerQueue = (Queue) ic.lookup("java:comp/env/jms/TradeBrokerQueue");
 			}
 			catch (Exception e)
 			{

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=555419&r1=555418&r2=555419
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml Wed Jul 11
15:32:54 2007
@@ -221,7 +221,7 @@
                 <use-caller-identity/>
             </security-identity>
             <persistence-context-ref>
-                <persistence-context-ref-name>jpa/daytrader</persistence-context-ref-name>
+                <persistence-context-ref-name>daytrader</persistence-context-ref-name>
                 <persistence-unit-name>daytrader</persistence-unit-name>
                 <persistence-context-type>Transactional</persistence-context-type>
             </persistence-context-ref>

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml?view=diff&rev=555419&r1=555418&r2=555419
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/persistence.xml Wed Jul
11 15:32:54 2007
@@ -22,12 +22,13 @@
 
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
         <jta-data-source>jdbc/TradeDataSource</jta-data-source>
+        <non-jta-data-source>jdbc/NoTxTradeDataSource</non-jta-data-source>
         <class>org.apache.geronimo.samples.daytrader.AccountDataBean</class>
         <class>org.apache.geronimo.samples.daytrader.AccountProfileDataBean</class>
         <class>org.apache.geronimo.samples.daytrader.HoldingDataBean</class>
         <class>org.apache.geronimo.samples.daytrader.OrderDataBean</class>
         <class>org.apache.geronimo.samples.daytrader.QuoteDataBean</class>
-        <exclude-unlisted-classes/>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <properties>
             <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
             <!-- property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DB2Dictionary"/
-->

Modified: geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml?view=diff&rev=555419&r1=555418&r2=555419
==============================================================================
--- geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml Wed Jul 11 15:32:54 2007
@@ -107,7 +107,7 @@
                 <session>
                     <ejb-name>TradeJPA</ejb-name>
                     <persistence-context-ref>
-                        <persistence-context-ref-name>jpa/daytrader</persistence-context-ref-name>
+                        <persistence-context-ref-name>daytrader</persistence-context-ref-name>
                         <persistence-unit-name>daytrader</persistence-unit-name>
                         <persistence-context-type>Transactional</persistence-context-type>
                     </persistence-context-ref>



Mime
View raw message