You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2010/04/13 19:32:45 UTC

svn commit: r933713 - in /geronimo/sandbox/jbohn: daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/ daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/ daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/w...

Author: jbohn
Date: Tue Apr 13 17:32:44 2010
New Revision: 933713

URL: http://svn.apache.org/viewvc?rev=933713&view=rev
Log:
some crude changes to avoid doing a TradeServicesManager lookup every time the jsps are displayed

Modified:
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp
    geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp
    geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp
    geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp
    geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp
    geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp Tue Apr 13 17:32:44 2010
@@ -24,13 +24,14 @@
 <%@ page import="java.util.ArrayList, org.apache.geronimo.samples.daytrader.util.TradeConfig, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*"
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
-<% 
+<%! 
     TradeServicesManager tradeServicesManager = null;
-
+%>
+<% 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
     }
- %>
+%>
 
 <TABLE style="font-size: smaller">
 	<TBODY>
@@ -168,49 +169,26 @@ if (status != null) {
 
 		<TR>
 			<TD align="left"><B>WebInterface</B>
-			<P align="left"><%configParm = "WebInterface";
-names = TradeConfig.webInterfaceNames;
-index = TradeConfig.webInterface;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
+                <P align="left">
+                <%
+                    configParm = "WebInterface";
+                    names = TradeConfig.webInterfaceNames;
+                    index = TradeConfig.webInterface;
+                    for (int i = 0; i < names.length; i++) {
+                        out.print("<INPUT type=\"radio\" name=\""
+                                 + configParm
+                                 + "\" value=\""
+                                 + i
+                                 + "\" ");
+                        if (index == i) out.print("checked");
+                        out.print("> " + names[i] + "<BR>");
+                    }
+                %>
+                </P>
 			</TD>
 			<TD>This setting determines the Web interface technology used, JSPs
 			or JSPs with static images and GIFs.</TD>
 		</TR>
-		<!--		<TR>
-			<TD align="left">
-			<B>Caching Type</B>
-			<P align="left"><%configParm = "CachingType";
-names = TradeConfig.cachingTypeNames;
-index = TradeConfig.cachingType;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
-			</TD>
-			<TD>
-			This setting determines the caching technology used for data caching
-			, DistributedMap, Command Caching or No Caching.
-			</TD>
-		</TR>-->
 		<TR>
 			<TD colspan="2" align="center"><B>Miscellaneous Settings</B></TD>
 		</TR>

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp Tue Apr 13 17:32:44 2010
@@ -17,9 +17,11 @@
 <%@ page
 	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <% 
     String symbol = request.getParameter("symbol");
-    TradeServicesManager tradeServicesManager = null;
 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp Tue Apr 13 17:32:44 2010
@@ -18,14 +18,15 @@
 	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <%
-TradeServicesManager tradeServicesManager = null;
-
-if (tradeServicesManager == null) {
-    tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
-}
+    if (tradeServicesManager == null) {
+        tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
+    }
 
-MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
+    MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
 %>
 <TABLE border="1" bgcolor="#ffffff" width="100%"
 	style="font-size: smaller">

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp Tue Apr 13 17:32:44 2010
@@ -24,9 +24,10 @@
 <%@ page import="java.util.ArrayList, org.apache.geronimo.samples.daytrader.util.TradeConfig, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*"
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
-<% 
+<%! 
     TradeServicesManager tradeServicesManager = null;
-
+%>
+<% 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
     }
@@ -168,49 +169,26 @@ if (status != null) {
 
 		<TR>
 			<TD align="left"><B>WebInterface</B>
-			<P align="left"><%configParm = "WebInterface";
-names = TradeConfig.webInterfaceNames;
-index = TradeConfig.webInterface;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
+                <P align="left">
+                <%
+                    configParm = "WebInterface";
+                    names = TradeConfig.webInterfaceNames;
+                    index = TradeConfig.webInterface;
+                    for (int i = 0; i < names.length; i++) {
+                        out.print("<INPUT type=\"radio\" name=\""
+                                 + configParm
+                                 + "\" value=\""
+                                 + i
+                                 + "\" ");
+                        if (index == i) out.print("checked");
+                        out.print("> " + names[i] + "<BR>");
+                    }
+                %>
+                </P>
 			</TD>
 			<TD>This setting determines the Web interface technology used, JSPs
 			or JSPs with static images and GIFs.</TD>
 		</TR>
-		<!--		<TR>
-			<TD align="left">
-			<B>Caching Type</B>
-			<P align="left"><%configParm = "CachingType";
-names = TradeConfig.cachingTypeNames;
-index = TradeConfig.cachingType;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
-			</TD>
-			<TD>
-			This setting determines the caching technology used for data caching
-			, DistributedMap, Command Caching or No Caching.
-			</TD>
-		</TR>-->
 		<TR>
 			<TD colspan="2" align="center"><B>Miscellaneous Settings</B></TD>
 		</TR>

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp Tue Apr 13 17:32:44 2010
@@ -17,9 +17,11 @@
 <%@ page
 	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <% 
     String symbol = request.getParameter("symbol");
-    TradeServicesManager tradeServicesManager = null;
 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();

Modified: geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-AppEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp Tue Apr 13 17:32:44 2010
@@ -18,14 +18,15 @@
 	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <%
-TradeServicesManager tradeServicesManager = null;
-
-if (tradeServicesManager == null) {
-    tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
-}
+    if (tradeServicesManager == null) {
+        tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
+    }
 
-MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
+    MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
 %>
 <TABLE border="1" bgcolor="#ffffff" width="100%"
 	style="font-size: smaller">

Modified: geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp Tue Apr 13 17:32:44 2010
@@ -24,13 +24,14 @@
 <%@ page import="java.util.ArrayList, org.apache.geronimo.samples.daytrader.util.TradeConfig, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*"
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
-<% 
+<%! 
     TradeServicesManager tradeServicesManager = null;
-
+%>
+<% 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
     }
- %>
+%>
 
 <TABLE style="font-size: smaller">
 	<TBODY>
@@ -168,49 +169,26 @@ if (status != null) {
 
 		<TR>
 			<TD align="left"><B>WebInterface</B>
-			<P align="left"><%configParm = "WebInterface";
-names = TradeConfig.webInterfaceNames;
-index = TradeConfig.webInterface;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
+                <P align="left">
+                <%
+                    configParm = "WebInterface";
+                    names = TradeConfig.webInterfaceNames;
+                    index = TradeConfig.webInterface;
+                    for (int i = 0; i < names.length; i++) {
+                        out.print("<INPUT type=\"radio\" name=\""
+                                 + configParm
+                                 + "\" value=\""
+                                 + i
+                                 + "\" ");
+                        if (index == i) out.print("checked");
+                        out.print("> " + names[i] + "<BR>");
+                    }
+                %>
+                </P>
 			</TD>
 			<TD>This setting determines the Web interface technology used, JSPs
 			or JSPs with static images and GIFs.</TD>
 		</TR>
-		<!--		<TR>
-			<TD align="left">
-			<B>Caching Type</B>
-			<P align="left"><%configParm = "CachingType";
-names = TradeConfig.cachingTypeNames;
-index = TradeConfig.cachingType;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
-			</TD>
-			<TD>
-			This setting determines the caching technology used for data caching
-			, DistributedMap, Command Caching or No Caching.
-			</TD>
-		</TR>-->
 		<TR>
 			<TD colspan="2" align="center"><B>Miscellaneous Settings</B></TD>
 		</TR>

Modified: geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp Tue Apr 13 17:32:44 2010
@@ -17,9 +17,11 @@
 <%@ page
 	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <% 
     String symbol = request.getParameter("symbol");
-    TradeServicesManager tradeServicesManager = null;
 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();

Modified: geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp Tue Apr 13 17:32:44 2010
@@ -18,14 +18,15 @@
 	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <%
-TradeServicesManager tradeServicesManager = null;
-
-if (tradeServicesManager == null) {
-    tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
-}
+    if (tradeServicesManager == null) {
+        tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
+    }
 
-MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
+    MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
 %>
 <TABLE border="1" bgcolor="#ffffff" width="100%"
 	style="font-size: smaller">

Modified: geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/config.jsp Tue Apr 13 17:32:44 2010
@@ -24,9 +24,10 @@
 <%@ page import="java.util.ArrayList, org.apache.geronimo.samples.daytrader.util.TradeConfig, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*"
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
-<% 
+<%! 
     TradeServicesManager tradeServicesManager = null;
-
+%>
+<% 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
     }
@@ -168,49 +169,26 @@ if (status != null) {
 
 		<TR>
 			<TD align="left"><B>WebInterface</B>
-			<P align="left"><%configParm = "WebInterface";
-names = TradeConfig.webInterfaceNames;
-index = TradeConfig.webInterface;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
+                <P align="left">
+                <%
+                    configParm = "WebInterface";
+                    names = TradeConfig.webInterfaceNames;
+                    index = TradeConfig.webInterface;
+                    for (int i = 0; i < names.length; i++) {
+                        out.print("<INPUT type=\"radio\" name=\""
+                                 + configParm
+                                 + "\" value=\""
+                                 + i
+                                 + "\" ");
+                        if (index == i) out.print("checked");
+                        out.print("> " + names[i] + "<BR>");
+                    }
+                %>
+                </P>
 			</TD>
 			<TD>This setting determines the Web interface technology used, JSPs
 			or JSPs with static images and GIFs.</TD>
 		</TR>
-		<!--		<TR>
-			<TD align="left">
-			<B>Caching Type</B>
-			<P align="left"><%configParm = "CachingType";
-names = TradeConfig.cachingTypeNames;
-index = TradeConfig.cachingType;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
-			</TD>
-			<TD>
-			This setting determines the caching technology used for data caching
-			, DistributedMap, Command Caching or No Caching.
-			</TD>
-		</TR>-->
 		<TR>
 			<TD colspan="2" align="center"><B>Miscellaneous Settings</B></TD>
 		</TR>

Modified: geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/displayQuote.jsp Tue Apr 13 17:32:44 2010
@@ -17,9 +17,11 @@
 <%@ page
 	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <% 
     String symbol = request.getParameter("symbol");
-    TradeServicesManager tradeServicesManager = null;
 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();

Modified: geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-CntEM/assemblies/web/daytrader-web-jpa/src/main/webapp/marketSummary.jsp Tue Apr 13 17:32:44 2010
@@ -18,14 +18,15 @@
 	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.core.*, org.apache.geronimo.samples.daytrader.core.util.*, org.apache.geronimo.samples.daytrader.beans.*, org.apache.geronimo.samples.daytrader.util.*"
 	session="true" isThreadSafe="true" isErrorPage="false"%>
 
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <%
-TradeServicesManager tradeServicesManager = null;
-
-if (tradeServicesManager == null) {
-    tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
-}
+    if (tradeServicesManager == null) {
+        tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
+    }
 
-MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
+    MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
 %>
 <TABLE border="1" bgcolor="#ffffff" width="100%"
 	style="font-size: smaller">

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/config.jsp Tue Apr 13 17:32:44 2010
@@ -24,9 +24,10 @@
 <%@ page import="java.util.ArrayList, org.apache.geronimo.samples.daytrader.util.TradeConfig, org.apache.geronimo.samples.daytrader.api.*"
 	session="false" isThreadSafe="true" isErrorPage="false"%>
 
-<% 
+<%! 
     TradeServicesManager tradeServicesManager = null;
-
+%>
+<% 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
     }
@@ -168,49 +169,26 @@ if (status != null) {
 
 		<TR>
 			<TD align="left"><B>WebInterface</B>
-			<P align="left"><%configParm = "WebInterface";
-names = TradeConfig.webInterfaceNames;
-index = TradeConfig.webInterface;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
+                <P align="left">
+                <%
+                    configParm = "WebInterface";
+                    names = TradeConfig.webInterfaceNames;
+                    index = TradeConfig.webInterface;
+                    for (int i = 0; i < names.length; i++) {
+                        out.print("<INPUT type=\"radio\" name=\""
+                                 + configParm
+                                 + "\" value=\""
+                                 + i
+                                 + "\" ");
+                        if (index == i) out.print("checked");
+                        out.print("> " + names[i] + "<BR>");
+                    }
+                %>
+                </P>
 			</TD>
 			<TD>This setting determines the Web interface technology used, JSPs
 			or JSPs with static images and GIFs.</TD>
 		</TR>
-		<!--		<TR>
-			<TD align="left">
-			<B>Caching Type</B>
-			<P align="left"><%configParm = "CachingType";
-names = TradeConfig.cachingTypeNames;
-index = TradeConfig.cachingType;
-for (int i = 0; i < names.length; i++) {
-	out.print(
-		"<INPUT type=\"radio\" name=\""
-			+ configParm
-			+ "\" value=\""
-			+ i
-			+ "\" ");
-	if (index == i)
-		out.print("checked");
-	out.print("> " + names[i] + "<BR>");
-}
-%></P>
-			</TD>
-			<TD>
-			This setting determines the caching technology used for data caching
-			, DistributedMap, Command Caching or No Caching.
-			</TD>
-		</TR>-->
 		<TR>
 			<TD colspan="2" align="center"><B>Miscellaneous Settings</B></TD>
 		</TR>

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/displayQuote.jsp Tue Apr 13 17:32:44 2010
@@ -15,11 +15,13 @@
   limitations under the License.
 -->
 <%@ page
-	import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
-	session="true" isThreadSafe="true" isErrorPage="false"%>
+    import="java.math.BigDecimal, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+    session="true" isThreadSafe="true" isErrorPage="false"%>
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <% 
     String symbol = request.getParameter("symbol");
-    TradeServicesManager tradeServicesManager = null;
 
     if (tradeServicesManager == null) {
         tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();

Modified: geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp?rev=933713&r1=933712&r2=933713&view=diff
==============================================================================
--- geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp (original)
+++ geronimo/sandbox/jbohn/daytrader-bp-new/modules/daytrader-web/src/main/resources/marketSummary.jsp Tue Apr 13 17:32:44 2010
@@ -15,17 +15,18 @@
   limitations under the License.
 -->
 <%@ page
-	import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
-	session="true" isThreadSafe="true" isErrorPage="false"%>
+    import="java.util.Collection, java.util.Iterator, org.apache.geronimo.samples.daytrader.api.*, org.apache.geronimo.samples.daytrader.persistence.api.*, org.apache.geronimo.samples.daytrader.util.*"
+    session="true" isThreadSafe="true" isErrorPage="false"%>
 
+<%! 
+    TradeServicesManager tradeServicesManager = null;
+%>
 <%
-TradeServicesManager tradeServicesManager = null;
-
-if (tradeServicesManager == null) {
-    tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
-}
+    if (tradeServicesManager == null) {
+        tradeServicesManager = TradeServiceUtilities.getTradeServicesManager();
+    }
 
-MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
+    MarketSummaryDataBean marketSummaryData = tradeServicesManager.getMarketSummary();
 %>
 <TABLE border="1" bgcolor="#ffffff" width="100%"
 	style="font-size: smaller">