Return-Path: Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org Received: (qmail 37098 invoked from network); 15 Apr 2010 19:32:42 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Apr 2010 19:32:42 -0000 Received: (qmail 70627 invoked by uid 500); 15 Apr 2010 19:32:42 -0000 Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org Received: (qmail 70545 invoked by uid 500); 15 Apr 2010 19:32:42 -0000 Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: aries-dev@incubator.apache.org Delivered-To: mailing list aries-commits@incubator.apache.org Received: (qmail 70537 invoked by uid 99); 15 Apr 2010 19:32:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Apr 2010 19:32:42 +0000 X-ASF-Spam-Status: No, hits=-1539.1 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Apr 2010 19:32:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 01D8E238890B; Thu, 15 Apr 2010 19:32:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r934558 - in /incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources: PingJspEL.jsp config.jsp displayQuote.jsp marketSummary.jsp Date: Thu, 15 Apr 2010 19:32:20 -0000 To: aries-commits@incubator.apache.org From: jbohn@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100415193221.01D8E238890B@eris.apache.org> Author: jbohn Date: Thu Apr 15 19:32:20 2010 New Revision: 934558 URL: http://svn.apache.org/viewvc?rev=934558&view=rev Log: merge 933727 from trunk to branch - ARIES-186 AriesTrader - some changes to prevent repeat lookup of the TradeServicesManager reference in the jsps and a little more cleanup Modified: incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/PingJspEL.jsp incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/config.jsp incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/displayQuote.jsp incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/marketSummary.jsp Modified: incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/PingJspEL.jsp URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/PingJspEL.jsp?rev=934558&r1=934557&r2=934558&view=diff ============================================================================== --- incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/PingJspEL.jsp (original) +++ incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/PingJspEL.jsp Thu Apr 15 19:32:20 2010 @@ -23,53 +23,52 @@ <%@ page import="org.apache.aries.samples.ariestrader.util.*,org.apache.aries.samples.ariestrader.api.*,org.apache.aries.samples.ariestrader.api.persistence.*" session="false" %> <%! -int hitCount = 0; -String initTime = new java.util.Date().toString(); + int hitCount = 0; + String initTime = new java.util.Date().toString(); + TradeServicesManager tradeServicesManager = null; %> <% -// setup some variables to work with later -int someint1 = TradeConfig.rndInt(100) + 1; -pageContext.setAttribute("someint1", new Integer(someint1)); -int someint2 = TradeConfig.rndInt(100) + 1; -pageContext.setAttribute("someint2", new Integer(someint2)); -float somefloat1 = TradeConfig.rndFloat(100) + 1.0f; -pageContext.setAttribute("somefloat1", new Float(somefloat1)); -float somefloat2 = TradeConfig.rndFloat(100) + 1.0f; -pageContext.setAttribute("somefloat2", new Float(somefloat2)); - -TradeServicesManager tradeServicesManager = null; - -if (tradeServicesManager == null) { - tradeServicesManager = TradeServiceUtilities.getTradeServicesManager(); -} -TradeServices tradeServices = tradeServicesManager.getTradeServices(); - -QuoteDataBean quoteData0=null, quoteData1=null, quoteData2=null, quoteData3=null; - -try { - quoteData0 = tradeServices.getQuote(TradeConfig.rndSymbol()); - quoteData1 = tradeServices.getQuote(TradeConfig.rndSymbol()); - quoteData2 = tradeServices.getQuote(TradeConfig.rndSymbol()); - quoteData3 = tradeServices.getQuote(TradeConfig.rndSymbol()); -} -catch (Exception e) -{ - Log.error("PingJspEL.jsp exception", e); -} - -pageContext.setAttribute("quoteData0", quoteData0); -pageContext.setAttribute("quoteData1", quoteData1); -pageContext.setAttribute("quoteData2", quoteData2); -pageContext.setAttribute("quoteData3", quoteData3); - -QuoteDataBean quoteData[] = new QuoteDataBean[4]; -quoteData[0] = quoteData0; -quoteData[1] = quoteData1; -quoteData[2] = quoteData2; -quoteData[3] = quoteData3; + // setup some variables to work with later + int someint1 = TradeConfig.rndInt(100) + 1; + pageContext.setAttribute("someint1", new Integer(someint1)); + int someint2 = TradeConfig.rndInt(100) + 1; + pageContext.setAttribute("someint2", new Integer(someint2)); + float somefloat1 = TradeConfig.rndFloat(100) + 1.0f; + pageContext.setAttribute("somefloat1", new Float(somefloat1)); + float somefloat2 = TradeConfig.rndFloat(100) + 1.0f; + pageContext.setAttribute("somefloat2", new Float(somefloat2)); + + if (tradeServicesManager == null) { + tradeServicesManager = TradeServiceUtilities.getTradeServicesManager(); + } + TradeServices tradeServices = tradeServicesManager.getTradeServices(); + + QuoteDataBean quoteData0=null, quoteData1=null, quoteData2=null, quoteData3=null; + + try { + quoteData0 = tradeServices.getQuote(TradeConfig.rndSymbol()); + quoteData1 = tradeServices.getQuote(TradeConfig.rndSymbol()); + quoteData2 = tradeServices.getQuote(TradeConfig.rndSymbol()); + quoteData3 = tradeServices.getQuote(TradeConfig.rndSymbol()); + } + catch (Exception e) + { + Log.error("PingJspEL.jsp exception", e); + } + + pageContext.setAttribute("quoteData0", quoteData0); + pageContext.setAttribute("quoteData1", quoteData1); + pageContext.setAttribute("quoteData2", quoteData2); + pageContext.setAttribute("quoteData3", quoteData3); + + QuoteDataBean quoteData[] = new QuoteDataBean[4]; + quoteData[0] = quoteData0; + quoteData[1] = quoteData1; + quoteData[2] = quoteData2; + quoteData[3] = quoteData3; -pageContext.setAttribute("quoteData", quoteData); + pageContext.setAttribute("quoteData", quoteData); %>
Modified: incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/config.jsp URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/config.jsp?rev=934558&r1=934557&r2=934558&view=diff ============================================================================== --- incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/config.jsp (original) +++ incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/config.jsp Thu Apr 15 19:32:20 2010 @@ -24,9 +24,10 @@ <%@ page import="java.util.ArrayList, org.apache.aries.samples.ariestrader.util.TradeConfig, org.apache.aries.samples.ariestrader.api.*" session="false" isThreadSafe="true" isErrorPage="false"%> -<% +<%! TradeServicesManager tradeServicesManager = null; - +%> +<% if (tradeServicesManager == null) { tradeServicesManager = TradeServiceUtilities.getTradeServicesManager(); } @@ -168,49 +169,26 @@ if (status != null) { WebInterface -

<%configParm = "WebInterface"; -names = TradeConfig.webInterfaceNames; -index = TradeConfig.webInterface; -for (int i = 0; i < names.length; i++) { - out.print( - " " + names[i] + "
"); -} -%>

+

+ <% + configParm = "WebInterface"; + names = TradeConfig.webInterfaceNames; + index = TradeConfig.webInterface; + for (int i = 0; i < names.length; i++) { + out.print(" " + names[i] + "
"); + } + %> +

This setting determines the Web interface technology used, JSPs or JSPs with static images and GIFs. - Miscellaneous Settings @@ -241,15 +219,6 @@ for (int i = 0; i < names.length; i++) { web request. Change this value to repeat operations multiple times per web request. - Modified: incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/displayQuote.jsp URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/displayQuote.jsp?rev=934558&r1=934557&r2=934558&view=diff ============================================================================== --- incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/displayQuote.jsp (original) +++ incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/displayQuote.jsp Thu Apr 15 19:32:20 2010 @@ -17,9 +17,11 @@ <%@ page import="java.math.BigDecimal, org.apache.aries.samples.ariestrader.api.*, org.apache.aries.samples.ariestrader.api.persistence.*, org.apache.aries.samples.ariestrader.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: incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/marketSummary.jsp URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/marketSummary.jsp?rev=934558&r1=934557&r2=934558&view=diff ============================================================================== --- incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/marketSummary.jsp (original) +++ incubator/aries/branches/0.1-incubating-RC1/samples/ariestrader/modules/ariestrader-web/src/main/resources/marketSummary.jsp Thu Apr 15 19:32:20 2010 @@ -18,14 +18,15 @@ import="java.util.Collection, java.util.Iterator, org.apache.aries.samples.ariestrader.api.*, org.apache.aries.samples.ariestrader.api.persistence.*, org.apache.aries.samples.ariestrader.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(); %>