geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjbly...@apache.org
Subject svn commit: r561940 - in /geronimo/daytrader/trunk: modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/ modules/ejb/src/main/resources/META-INF/ modules/web/src/main/webapp/WEB-INF/ plans/
Date Wed, 01 Aug 2007 20:39:43 GMT
Author: cjblythe
Date: Wed Aug  1 13:39:35 2007
New Revision: 561940

URL: http://svn.apache.org/viewvc?view=rev&rev=561940
Log:
DAYTRADER-48 Remove old TradeJPA components, since these have been replaced by the full EJB3
mode impl.

Removed:
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeJPA.java
Modified:
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java
    geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
    geronimo/daytrader/trunk/modules/ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
    geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml
    geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml
    geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.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/TradeAction.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java?view=diff&rev=561940&r1=561939&r2=561940
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java
(original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java
Wed Aug  1 13:39:35 2007
@@ -44,7 +44,6 @@
     private static TradeServices trade = null;
     private static TradeHome tradeHome = null;
     private static TradeJDBCHome tradeJDBCHome = null;
-    private static TradeHome tradeHomeJPA = null;
 
 
     public TradeAction() {
@@ -78,24 +77,6 @@
                 Log.error("TradeAction:TradeAction() Creation of Trade EJB failed\n" + e);
                 e.printStackTrace();
             }
-        } else if (TradeConfig.runTimeMode == TradeConfig.JPA) {
-            try {
-                if (tradeHomeJPA == null) {
-                    InitialContext ic = new InitialContext();
-                    try {
-                        tradeHomeJPA = (TradeHome) (javax.rmi.PortableRemoteObject.narrow(ic.lookup("java:comp/env/ejb/TradeJPA"),
TradeHome.class));
-                    }
-                    catch (Exception e) {
-                        Log.log("TradeAction:createTrade lookup of java:comp/env/ejb/TradeJPA
failed. Reverting to JNDI lookup of Trade");
-                        tradeHomeJPA = (TradeHome) (javax.rmi.PortableRemoteObject.narrow(ic.lookup("TradeJPA"),
TradeHome.class));
-                    }
-                }
-                trade = tradeHomeJPA.create();
-            }
-            catch (Exception e) {
-                Log.error("TradeAction:TradeAction() Creation of Trade JPA failed\n" + e);
-                e.printStackTrace();
-            }
         } else if (TradeConfig.runTimeMode == TradeConfig.EJB3) {
             try {
                 if (!(trade instanceof TradeSLSBRemote)) {
@@ -112,7 +93,7 @@
                 }
             }
             catch (Exception e) {
-                Log.error("TradeAction:TradeAction() Creation of Trade JPA failed\n" + e);
+                Log.error("TradeAction:TradeAction() Creation of Trade EJB 3 failed\n" +
e);
                 e.printStackTrace();
             }
         }else if (TradeConfig.runTimeMode == TradeConfig.DIRECT) {

Modified: geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java?view=diff&rev=561940&r1=561939&r2=561940
==============================================================================
--- geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
(original)
+++ geronimo/daytrader/trunk/modules/ejb/src/main/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
Wed Aug  1 13:39:35 2007
@@ -34,13 +34,12 @@
 	/* Trade Runtime Configuration Parameters */
 
 	/* Trade Runtime Mode parameters */
-	public static String[] runTimeModeNames = { "EJB", "Direct", "SessionDirect", "JPA", "EJB3"
};
+	public static String[] runTimeModeNames = { "EJB", "Direct", "SessionDirect", "EJB3" };
 	public static final int EJB = 0;
 	public static final int DIRECT = 1;
 	public static final int SESSION = 2;
-	public static final int JPA = 3;
-    public static final int EJB3 = 4;
-	public static int runTimeMode = JPA;
+    public static final int EJB3 = 3;
+	public static int runTimeMode = DIRECT;
 
 	public static String[] orderProcessingModeNames =
 		{ "Synchronous", "Asynchronous_2-Phase" };

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=561940&r1=561939&r2=561940
==============================================================================
--- 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 Aug 
1 13:39:35 2007
@@ -163,70 +163,6 @@
             </security-identity>
         </session>
 
-
-        <!--
-          **
-          **  T r a d e J P A
-          ** 
-         -->
-        <session>
-            <description>Trade JPA Session EJB manages all Trading services</description>
-            <display-name>TradeJPA</display-name>
-            <ejb-name>TradeJPA</ejb-name>
-            <home>org.apache.geronimo.samples.daytrader.ejb.TradeHome</home>
-            <remote>org.apache.geronimo.samples.daytrader.ejb.Trade</remote>
-            <ejb-class>org.apache.geronimo.samples.daytrader.TradeJPA</ejb-class>
-            <session-type>Stateless</session-type>
-            <transaction-type>Container</transaction-type>
-            <env-entry>
-                <env-entry-name>orderBySQLSupported</env-entry-name>
-                <env-entry-type>java.lang.Boolean</env-entry-type>
-                <env-entry-value>true</env-entry-value>
-            </env-entry>
-            <env-entry>
-                <env-entry-name>updateQuotePrices</env-entry-name>
-                <env-entry-type>java.lang.Boolean</env-entry-type>
-                <env-entry-value>true</env-entry-value>
-            </env-entry>
-            <env-entry>
-                <env-entry-name>publishQuotePriceChange</env-entry-name>
-                <env-entry-type>java.lang.Boolean</env-entry-type>
-                <env-entry-value>false</env-entry-value>
-            </env-entry>
-            <resource-ref>
-                <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
-                <res-type>javax.jms.QueueConnectionFactory</res-type>
-                <res-auth>Application</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
-            <resource-ref>
-                <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
-                <res-type>javax.jms.TopicConnectionFactory</res-type>
-                <res-auth>Application</res-auth>
-                <res-sharing-scope>Shareable</res-sharing-scope>
-            </resource-ref>
-            <message-destination-ref>
-                <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
-                <message-destination-type>javax.jms.Queue</message-destination-type>
-                <message-destination-usage>Produces</message-destination-usage>
-                <message-destination-link>TradeBrokerQueue</message-destination-link>
-            </message-destination-ref>
-            <message-destination-ref>
-                <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
-                <message-destination-type>javax.jms.Topic</message-destination-type>
-                <message-destination-usage>Produces</message-destination-usage>
-                <message-destination-link>TradeStreamerTopic</message-destination-link>
-            </message-destination-ref>
-            <security-identity>
-                <description/>
-                <use-caller-identity/>
-            </security-identity>
-            <persistence-context-ref>
-                <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>
-        </session>
         
         <!--
           **
@@ -1053,17 +989,6 @@
                     <method-param>double</method-param>
                 </method-params>
             </method>
-            <method>
-                <ejb-name>TradeJPA</ejb-name>
-                <method-intf>Remote</method-intf>
-                <method-name>publishQuotePriceChange</method-name>
-                <method-params>
-                    <method-param>org.apache.geronimo.samples.daytrader.QuoteDataBean</method-param>
-                    <method-param>java.math.BigDecimal</method-param>
-                    <method-param>java.math.BigDecimal</method-param>
-                    <method-param>double</method-param>
-                </method-params>
-            </method>
         	<method>
         		<ejb-name>TradeJDBC</ejb-name>
         		<method-intf>Remote</method-intf>
@@ -1092,14 +1017,6 @@
                     <method-param>boolean</method-param>
                 </method-params>
             </method>
-            <method>
-                <ejb-name>TradeJPA</ejb-name>
-                <method-intf>Remote</method-intf>
-                <method-name>resetTrade</method-name>
-                <method-params>
-                    <method-param>boolean</method-param>
-                </method-params>
-            </method>
         	<method>
         		<ejb-name>TradeJDBC</ejb-name>
         		<method-intf>Remote</method-intf>
@@ -1151,10 +1068,6 @@
             </method>
             <method>
                 <ejb-name>TradeEJB</ejb-name>
-                <method-name>*</method-name>
-            </method>
-            <method>
-                <ejb-name>TradeJPA</ejb-name>
                 <method-name>*</method-name>
             </method>
             <method>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml?view=diff&rev=561940&r1=561939&r2=561940
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml Wed Aug  1 13:39:35
2007
@@ -821,13 +821,6 @@
 		<remote>org.apache.geronimo.samples.daytrader.ejb.Trade</remote>
 		<ejb-link>TradeEJB</ejb-link>
 	</ejb-ref>
-	<ejb-ref>
-		<ejb-ref-name>ejb/TradeJPA</ejb-ref-name>
-		<ejb-ref-type>Session</ejb-ref-type>
-		<home>org.apache.geronimo.samples.daytrader.ejb.TradeHome</home>
-		<remote>org.apache.geronimo.samples.daytrader.ejb.Trade</remote>
-		<ejb-link>TradeJPA</ejb-link>
-	</ejb-ref>
     <ejb-ref>
         <ejb-ref-name>ejb/TradeSLSBBean</ejb-ref-name>
         <ejb-ref-type>Session</ejb-ref-type>

Modified: geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml?view=diff&rev=561940&r1=561939&r2=561940
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-db2-9.1-XA-plan.xml Wed Aug  1 13:39:35 2007
@@ -112,15 +112,6 @@
                 </session>
                 
                 <session>
-                    <ejb-name>TradeJPA</ejb-name>
-                    <persistence-context-ref>
-                        <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>
-                </session>
-                
-                <session>
                     <ejb-name>KeySequenceEJB</ejb-name>
                     <jndi-name>ejb/KeySequenceEJB</jndi-name>
                     <cache-size>100</cache-size>

Modified: geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml?view=diff&rev=561940&r1=561939&r2=561940
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-db2-plan.xml Wed Aug  1 13:39:35 2007
@@ -112,15 +112,6 @@
                 </session>
                 
                 <session>
-                    <ejb-name>TradeJPA</ejb-name>
-                    <persistence-context-ref>
-                        <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>
-                </session>
-                
-                <session>
                     <ejb-name>KeySequenceEJB</ejb-name>
                     <jndi-name>ejb/KeySequenceEJB</jndi-name>
                     <cache-size>100</cache-size>

Modified: geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml?view=diff&rev=561940&r1=561939&r2=561940
==============================================================================
--- geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/dayTrader-oracle-XA-plan.xml Wed Aug  1 13:39:35 2007
@@ -106,15 +106,6 @@
                 </session>
                 
                 <session>
-                    <ejb-name>TradeJPA</ejb-name>
-                    <persistence-context-ref>
-                        <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>
-                </session>
-                
-                <session>
                     <ejb-name>KeySequenceEJB</ejb-name>
                     <jndi-name>ejb/KeySequenceEJB</jndi-name>
                     <cache-size>100</cache-size>

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=561940&r1=561939&r2=561940
==============================================================================
--- geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/daytrader-g-2.0-SNAPSHOT-plan.xml Wed Aug  1 13:39:35 2007
@@ -101,15 +101,6 @@
                 </session>
                 
                 <session>
-                    <ejb-name>TradeJPA</ejb-name>
-                    <persistence-context-ref>
-                        <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>
-                </session>
-                
-                <session>
                     <ejb-name>KeySequenceEJB</ejb-name>
                     <jndi-name>ejb/KeySequenceEJB</jndi-name>
                     <cache-size>100</cache-size>



Mime
View raw message