geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r809749 - in /geronimo/daytrader/trunk: ./ assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/ modules/util/src/main/java/org/apache/geronimo/samples/daytrader/util/ modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/
Date Mon, 31 Aug 2009 21:27:42 GMT
Author: dwoods
Date: Mon Aug 31 21:27:40 2009
New Revision: 809749

URL: http://svn.apache.org/viewvc?rev=809749&view=rev
Log:
comment out plugins for now.  daytrader-web-jdbc builds and deploys, but has runtime issues

Modified:
    geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml
    geronimo/daytrader/trunk/modules/util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java
    geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java
    geronimo/daytrader/trunk/pom.xml

Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml?rev=809749&r1=809748&r2=809749&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
Mon Aug 31 21:27:40 2009
@@ -23,7 +23,7 @@
         
         <sys:environment>
             <sys:moduleId>
-                <sys:groupId>org.apache.geronimo.daytrader.assemblies</sys:groupId>
+                <sys:groupId>org.apache.geronimo.daytrader.assemblies.web</sys:groupId>
                 <sys:artifactId>daytrader-web-jdbc</sys:artifactId>
                 <sys:version>2.2</sys:version>
                 <sys:type>war</sys:type>

Modified: geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml?rev=809749&r1=809748&r2=809749&view=diff
==============================================================================
--- geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/daytrader/trunk/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml
Mon Aug 31 21:27:40 2009
@@ -32,7 +32,7 @@
     </filter-mapping>
     
     <listener>
-        <listener-class>org.apache.geronimo.samples.daytrader.web.TradeWebContextListener</listener-class>
+        <listener-class>org.apache.geronimo.samples.daytrader.web.TradeJDBCContextListener</listener-class>
     </listener>
     
     <servlet>
@@ -82,19 +82,18 @@
         <servlet-name>TradeScenarioServlet</servlet-name>
         <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeScenarioServlet</servlet-class>
         <init-param>
-            <description>Sets the default RuntimeMode. Legal values include EJB and
Direct</description>
+            <description>Sets the default RuntimeMode. Legal values include Full EJB3,
Direct (JDBC), Session (EJB3) To Direct, Web JDBC, and Web JPA</description>
             <param-name>runTimeMode</param-name>
-            <param-value>DIRECT</param-value>
+            <param-value>Web JDBC</param-value>
         </init-param>
         <init-param>
-            <description>Sets the default Order Processing Mode. Legal values include
Synchronous, Asynchronous_1-Phase and Asynchronous_2-Phase</description>
+            <description>Sets the default Order Processing Mode. Legal values include
Synchronous and Asynchronous_2-Phase</description>
             <param-name>orderProcessingMode</param-name>
             <param-value>Synchronous</param-value>
         </init-param>
         <init-param>
             <description>
-                Sets the protocol the web application communicates with the server side services
when driving with TradeScenarioServlet. Legal values incude
-                Standard and WebServices.
+                Sets the protocol the web application communicates with the server side services
when driving with TradeScenarioServlet. Legal values incude Standard and WebServices.
             </description>
             <param-name>accessMode</param-name>
             <param-value>Standard</param-value>
@@ -130,9 +129,9 @@
             <param-value>1</param-value>
         </init-param>
         <init-param>
-            <description>Sets the data caching type</description>
-            <param-name>No Caching</param-name>
-            <param-value>2</param-value>
+            <description>Sets the data caching type, which can be DistributedMap, Command
Caching and No Caching</description>
+            <param-name>cachingType</param-name>
+            <param-value>No Caching</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>

Modified: geronimo/daytrader/trunk/modules/util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java?rev=809749&r1=809748&r2=809749&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java
(original)
+++ geronimo/daytrader/trunk/modules/util/src/main/java/org/apache/geronimo/samples/daytrader/util/TradeConfig.java
Mon Aug 31 21:27:40 2009
@@ -32,7 +32,7 @@
 	/* Trade Runtime Configuration Parameters */
 
 	/* Trade Runtime Mode parameters */
-    public static String[] runTimeModeNames = {"Full EJB3", "Direct JDBC", "Session (EJB3)
To Direct", "Direct JDBC (No TxMgr)", "Direct JPA"};
+    public static String[] runTimeModeNames = {"Full EJB3", "Direct (JDBC)", "Session (EJB3)
To Direct", "Web JDBC", "Web JPA"};
     public static final int EJB3 = 0;
     public static final int DIRECT = 1;
     public static final int SESSION3 = 2;

Modified: geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java?rev=809749&r1=809748&r2=809749&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java
(original)
+++ geronimo/daytrader/trunk/modules/web/src/main/java/org/apache/geronimo/samples/daytrader/web/OrdersAlertFilter.java
Mon Aug 31 21:27:40 2009
@@ -23,7 +23,7 @@
 //import org.apache.geronimo.samples.daytrader.*;
 import org.apache.geronimo.samples.daytrader.TradeAction;
 import org.apache.geronimo.samples.daytrader.TradeServices;
-import org.apache.geronimo.samples.daytrader.soap.*;
+//import org.apache.geronimo.samples.daytrader.soap.*;
 import org.apache.geronimo.samples.daytrader.util.*;
 
 public class OrdersAlertFilter implements Filter {
@@ -70,14 +70,25 @@
 					if ( (userID != null) && (userID.trim().length()>0) )
 					{	
 						TradeServices tAction=null;
-						if(TradeConfig.getAccessMode() == TradeConfig.STANDARD)
+						if(TradeConfig.getAccessMode() == TradeConfig.STANDARD) {
 							tAction = new TradeAction();
-						else if(TradeConfig.getAccessMode() == TradeConfig.WEBSERVICES)
-							tAction = new TradeWebSoapProxy();										
+						} else if(TradeConfig.getAccessMode() == TradeConfig.WEBSERVICES) {
+                            try {
+                                Class c = Class.forName("org.apache.geronimo.samples.daytrader.soap.TradeWebSoapProxy");
                               
+                                tAction = (TradeServices) c.newInstance();
+                            }
+                            catch (Exception e) {
+                                Log.error("OrdersAlertFilter:doFilter() Creation of TradeWebSoapProxy
failed\n" + e);
+                                throw new IllegalArgumentException(e);
+                            }
+                        }
 						java.util.Collection closedOrders = tAction.getClosedOrders(userID);
-						if ( (closedOrders!=null) && (closedOrders.size() > 0) )
+						if ( (closedOrders!=null) && (closedOrders.size() > 0) ) {
 							req.setAttribute("closedOrders", closedOrders);
-						if (Log.doTrace()) Log.printCollection("OrderAlertFilter: userID="+userID+" closedOrders=",
closedOrders);
+                        }
+						if (Log.doTrace()) {
+                            Log.printCollection("OrderAlertFilter: userID="+userID+" closedOrders=",
closedOrders);
+                        }
 					}
 				}	
 			}

Modified: geronimo/daytrader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/pom.xml?rev=809749&r1=809748&r2=809749&view=diff
==============================================================================
--- geronimo/daytrader/trunk/pom.xml (original)
+++ geronimo/daytrader/trunk/pom.xml Mon Aug 31 21:27:40 2009
@@ -143,10 +143,11 @@
     <modules>
         <!-- Daytrader application -->
         <module>modules</module>
-        <!-- Geronimo c-m-p built plugins -->
-        <module>plugins</module>
         <!-- Installable assemblies -->
         <module>assemblies</module>
+        <!-- Geronimo c-m-p built plugins
+        <module>plugins</module>
+        -->
     </modules>
 
     <dependencyManagement>
@@ -172,6 +173,11 @@
                 <artifactId>commons-logging</artifactId>
                 <version>1.0.4</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-kernel</artifactId>
+                <version>${openjpaVersion}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message