From scm-return-20512-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Wed Jul 11 22:33:18 2007 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 26023 invoked from network); 11 Jul 2007 22:33:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Jul 2007 22:33:17 -0000 Received: (qmail 91917 invoked by uid 500); 11 Jul 2007 22:33:20 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 91886 invoked by uid 500); 11 Jul 2007 22:33:19 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 91875 invoked by uid 99); 11 Jul 2007 22:33:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2007 15:33:19 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2007 15:33:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 23CC01A981A; Wed, 11 Jul 2007 15:32:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070711223256.23CC01A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - jpa/daytrader + daytrader daytrader Transactional 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 @@ org.apache.openjpa.persistence.PersistenceProviderImpl jdbc/TradeDataSource + jdbc/NoTxTradeDataSource org.apache.geronimo.samples.daytrader.AccountDataBean org.apache.geronimo.samples.daytrader.AccountProfileDataBean org.apache.geronimo.samples.daytrader.HoldingDataBean org.apache.geronimo.samples.daytrader.OrderDataBean org.apache.geronimo.samples.daytrader.QuoteDataBean - + true 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 @@ TradeJPA - jpa/daytrader + daytrader daytrader Transactional