Return-Path: 
 <scm-return-10240-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 91773 invoked from network); 30 Jan 2006 18:23:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 30 Jan 2006 18:23:35 -0000
Received: (qmail 13578 invoked by uid 500); 30 Jan 2006 18:23:34 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 13436 invoked by uid 500); 30 Jan 2006 18:23:34 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 13425 invoked by uid 99); 30 Jan 2006 18:23:34 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jan 2006 10:23:34 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 30 Jan 2006 10:23:32 -0800
Received: (qmail 91656 invoked by uid 65534); 30 Jan 2006 18:23:12 -0000
Message-ID: <20060130182312.91653.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r373562 - in /geronimo/daytrader/trunk: ear/
 ejb/src/java/org/apache/geronimo/samples/daytrader/
 ejb/src/java/org/apache/geronimo/samples/daytrader/util/
 web/src/java/org/apache/geronimo/samples/daytrader/web/prims/
 web/src/webapp/ web/src/...
Date: Mon, 30 Jan 2006 18:23:10 -0000
To: scm@geronimo.apache.org
From: hogstrom@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: hogstrom
Date: Mon Jan 30 10:23:04 2006
New Revision: 373562

URL: http://svn.apache.org/viewcvs?rev=373562&view=rev
Log:
Added new primitives and cleaned up some DDs

Added:
    geronimo/daytrader/trunk/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java
Modified:
    geronimo/daytrader/trunk/ear/project.xml
    geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
    geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java
    geronimo/daytrader/trunk/web/src/webapp/WEB-INF/web.xml
    geronimo/daytrader/trunk/web/src/webapp/web_prmtv.html

Modified: geronimo/daytrader/trunk/ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/ear/project.xml?rev=373562&r1=373561&r2=373562&view=diff
==============================================================================
--- geronimo/daytrader/trunk/ear/project.xml (original)
+++ geronimo/daytrader/trunk/ear/project.xml Mon Jan 30 10:23:04 2006
@@ -18,14 +18,14 @@
             <artifactId>log4j</artifactId>
             <version>${log4j_version}</version>
         </dependency>
-<!--        <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>daytrader-wsappclient</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>
                 <ear.bundle>true</ear.bundle>
             </properties>
-        </dependency>  -->
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>daytrader-web</artifactId>

Modified: geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/TradeConfig.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/TradeConfig.java?rev=373562&r1=373561&r2=373562&view=diff
==============================================================================
--- geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/TradeConfig.java (original)
+++ geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/TradeConfig.java Mon Jan 30 10:23:04 2006
@@ -108,6 +108,7 @@
 	private static boolean actionTrace = false;
 	private static boolean updateQuotePrices = true;
 	private static int primIterations = 1;
+	private static boolean longRun = true;
 
 	/*
 	 * Penny stocks is a problem where the random price change factor gets a stock
@@ -825,4 +826,12 @@
 	public static void setPrimIterations(int iter) {
 		primIterations = iter;
 	}	
+
+    public static boolean getLongRun() {
+        return longRun;
+    }
+
+    public static void setLongRun(boolean longRun) {
+        TradeConfig.longRun = longRun;
+    }
 }

Modified: geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java?rev=373562&r1=373561&r2=373562&view=diff
==============================================================================
--- geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java (original)
+++ geronimo/daytrader/trunk/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java Mon Jan 30 10:23:04 2006
@@ -28,6 +28,7 @@
 
 	public static void log(String message)
 	{
+        log.debug("DayTrader Log:" + new java.util.Date() + "------\n\t ");
 		log.debug(message);
 	}
 	public static void log(String msg1, String msg2)

Added: geronimo/daytrader/trunk/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java?rev=373562&view=auto
==============================================================================
--- geronimo/daytrader/trunk/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java (added)
+++ geronimo/daytrader/trunk/web/src/java/org/apache/geronimo/samples/daytrader/web/prims/ExplicitGC.java Mon Jan 30 10:23:04 2006
@@ -0,0 +1,123 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable 
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.samples.daytrader.web.prims;
+
+import java.io.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+
+import org.apache.geronimo.samples.daytrader.util.*;
+
+
+/**
+ *
+ * ExplicitGC invokes System.gc().  This allows one to gather min / max heap statistics.
+ *
+ */
+public class ExplicitGC extends HttpServlet
+{
+
+	private static String initTime;
+	private static int hitCount;
+
+	/**
+	 * forwards post requests to the doGet method
+	 * Creation date: (01/29/2006 20:10:00 PM)
+	 * @param res javax.servlet.http.HttpServletRequest
+	 * @param res2 javax.servlet.http.HttpServletResponse
+	 */
+	public void doPost(HttpServletRequest req, HttpServletResponse res)
+		throws ServletException, IOException
+	{
+		doGet(req, res);
+	}
+	
+	/**
+		* this is the main method of the servlet that will service all get requests.
+		* @param request HttpServletRequest
+		* @param responce HttpServletResponce
+		**/
+	public void doGet(HttpServletRequest req, HttpServletResponse res)
+		throws ServletException, IOException
+	{
+		try
+			{
+			res.setContentType("text/html");
+
+			ServletOutputStream out = res.getOutputStream();
+             hitCount++;
+             long totalMemory         = Runtime.getRuntime().totalMemory();
+
+             long maxMemoryBeforeGC   = Runtime.getRuntime().maxMemory();
+             long freeMemoryBeforeGC  = Runtime.getRuntime().freeMemory();
+             long startTime           = System.currentTimeMillis();
+             
+             System.gc();  // Invoke the GC.
+
+             long endTime            = System.currentTimeMillis();
+             long maxMemoryAfterGC   = Runtime.getRuntime().maxMemory();
+             long freeMemoryAfterGC  = Runtime.getRuntime().freeMemory();
+             
+             
+             
+			out.println(
+				"<html><head><title>ExplicitGC</title></head>"
+					+ "<body><HR><BR><FONT size=\"+2\" color=\"#000066\">Explicit Garbage Collection<BR></FONT><FONT size=\"+1\" color=\"#000066\">Init time : "
+					+ initTime
+					+ "<BR><BR></FONT>  <B>Hit Count: "
+					+ hitCount 
+					+ "<br>"
+					+ "     Total Memory = " + totalMemory + "<br>"
+					+ "<br> Statistics before GC <br>"
+					+ "       Max Memory = " + maxMemoryBeforeGC + "<br>"
+					+ "      Free Memory = " + freeMemoryBeforeGC + "<br>"
+					+ "<br> Statistics after GC <br>"
+					+ "       Max Memory = " + maxMemoryAfterGC + "<br>"
+					+ "      Free Memory = " + freeMemoryAfterGC + "<br>"
+					+ "      Used Memory = " + (totalMemory - freeMemoryAfterGC) + "<br>" +
+					+ " Total Time in GC = " + Float.toString(endTime - startTime / 1000) + "s"
+					+ "</body></html>");
+		}
+		catch (Exception e)
+			{
+			Log.error(e, "ExplicitGC.doGet(...): general exception caught");
+			res.sendError(500, e.toString());
+
+		}
+	}
+	
+	/** 
+	 * returns a string of information about the servlet
+	 * @return info String: contains info about the servlet
+	 **/
+	public String getServletInfo()
+	{
+		return "Generate Explicit GC to VM";
+	}
+	/**
+	* called when the class is loaded to initialize the servlet
+	* @param config ServletConfig:
+	**/
+	public void init(ServletConfig config) throws ServletException
+	{
+		super.init(config);
+		initTime = new java.util.Date().toString();
+		hitCount = 0;
+
+	}
+}

Modified: geronimo/daytrader/trunk/web/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/web/src/webapp/WEB-INF/web.xml?rev=373562&r1=373561&r2=373562&view=diff
==============================================================================
--- geronimo/daytrader/trunk/web/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/web/src/webapp/WEB-INF/web.xml Mon Jan 30 10:23:04 2006
@@ -3,360 +3,369 @@
 	xmlns="http://java.sun.com/xml/ns/j2ee"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
-      <display-name>TradeWeb</display-name>
-      <filter id="Filter_1">
+      <display-name>DayTraderWeb</display-name>
+      <filter>
          <display-name>OrdersAlertFilter</display-name>
          <filter-name>OrdersAlertFilter</filter-name>
          <filter-class>org.apache.geronimo.samples.daytrader.web.OrdersAlertFilter</filter-class>
       </filter>
-      <filter-mapping id="FilterMapping_1">
+      <filter-mapping>
          <filter-name>OrdersAlertFilter</filter-name>
          <servlet-name>TradeAppServlet</servlet-name>
       </filter-mapping>
-      <listener id="Listener_1">
+      <listener>
          <listener-class>org.apache.geronimo.samples.daytrader.web.TradeWebContextListener</listener-class>
       </listener>
-      <servlet id="Servlet_1">
+      <servlet>
          <display-name>TradeAppServlet</display-name>
          <servlet-name>TradeAppServlet</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeAppServlet</servlet-class>
          <load-on-startup>1</load-on-startup>         
       </servlet>
-      <servlet id="Servlet_2">
+      <servlet>
          <display-name>register</display-name>
          <servlet-name>register</servlet-name>
          <jsp-file>/register.jsp</jsp-file>
       </servlet>
-      <servlet id="Servlet_3">
+      <servlet>
          <display-name>TestServlet</display-name>
          <servlet-name>TestServlet</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.TestServlet</servlet-class>
       </servlet>
-      <servlet id="Servlet_4">
+      <servlet>
          <display-name>welcome</display-name>
          <servlet-name>welcome</servlet-name>
          <jsp-file>/welcome.jsp</jsp-file>
       </servlet>
-      <servlet id="Servlet_5">
+      <servlet>
          <display-name>order</display-name>
          <servlet-name>order</servlet-name>
          <jsp-file>/order.jsp</jsp-file>
       </servlet>
-      <servlet id="Servlet_6">
+      <servlet>
          <display-name>tradehome</display-name>
          <servlet-name>tradehome</servlet-name>
          <jsp-file>/tradehome.jsp</jsp-file>
       </servlet>
-      <servlet id="Servlet_7">
+      <servlet>
          <display-name>TradeConfigServlet</display-name>
          <servlet-name>TradeConfigServlet</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeConfigServlet</servlet-class>
       </servlet>
-      <servlet id="Servlet_8">
+      <servlet>
          <display-name>TradeScenarioServlet</display-name>
          <servlet-name>TradeScenarioServlet</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeScenarioServlet</servlet-class>
-         <init-param id="InitParam_1">
+         <init-param>
             <description>Sets the default RuntimeMode. Legal values
                 include EJB and Direct</description>
             <param-name>runTimeMode</param-name>
-            <param-value>EJB</param-value>
+            <param-value>DIRECT</param-value>
          </init-param>
-         <init-param id="InitParam_2">
+         <init-param>
             <description>Sets the default Order Processing Mode. Legal
                 values include Synchronous, Asynchronous_1-Phase and Asynchronous_2-Phase</description>
             <param-name>orderProcessingMode</param-name>
             <param-value>Synchronous</param-value>            
          </init-param>         
-         <init-param id="InitParam_3">
+         <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.</description>
             <param-name>accessMode</param-name>
             <param-value>Standard</param-value>
          </init-param>        
-         <init-param id="InitParam_4">
+         <init-param>
             <description>Sets the WebServices endpoint when using
                 WebServices accessMode when driving with TradeScenarioServlet.</description>
             <param-name>webServicesEndpoint</param-name>
             <param-value>http://localhost:8080/daytrader/services/TradeWSServices</param-value>
          </init-param>        
-         <init-param id="InitParam_5">
+         <init-param>
             <description>Sets the default workloadMix used with
                 TradeScenario servlet. Legal values include Standard and High-Volume</description>
             <param-name>workloadMix</param-name>
             <param-value>Standard</param-value>
          </init-param>
-         <init-param id="InitParam_6">
+         <init-param>
             <description>Sets the default WebInterface. Legal values
                 include JSP and JSP-images</description>
             <param-name>WebInterface</param-name>
             <param-value>JSP</param-value>
          </init-param>
-         <init-param id="InitParam_7">
+         <init-param>
             <description>Sets the population of Trade users when driving
                 with TradeScenarioServlet.</description>
             <param-name>maxUsers</param-name>
-            <param-value>500</param-value>
+            <param-value>5</param-value>
          </init-param>
-         <init-param id="InitParam_8">
+         <init-param>
             <description>Sets the population of Stock quotes used when
                 driving with TradeScenarioServlet.</description>
             <param-name>maxQuotes</param-name>
-            <param-value>1000</param-value>
+            <param-value>10</param-value>
          </init-param>        
-         <init-param id="InitParam_9">
+         <init-param>
             <description>Sets the number of iterations on web/ejb
                 primitives.</description>
             <param-name>primIterations</param-name>
             <param-value>1</param-value>
          </init-param>
-         <init-param id="InitParam_10">
+         <init-param>
             <description>Sets the data caching type</description>
             <param-name>No Caching</param-name>
             <param-value>2</param-value>
          </init-param>
          <load-on-startup>1</load-on-startup>
       </servlet>
-      <servlet id="Servlet_9">
+      <servlet>
+         <display-name>ExplicitGC</display-name>
+         <servlet-name>ExplicitGC</servlet-name>
+         <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ExplicitGC</servlet-class>
+      </servlet>
+      <servlet>
          <display-name>PingServlet</display-name>
          <servlet-name>PingServlet</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet</servlet-class>
       </servlet>
-      <servlet id="Servlet_10">
+      <servlet>
          <display-name>PingServletWriter</display-name>
          <servlet-name>PingServletWriter</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServletWriter</servlet-class>
       </servlet>
-      <servlet id="Servlet_11">
+      <servlet>
          <display-name>PingServlet2Servlet</display-name>
          <servlet-name>PingServlet2Servlet</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Servlet</servlet-class>
       </servlet>
-      <servlet id="Servlet_12">
+      <servlet>
          <display-name>PingServlet2ServletRcv</display-name>
          <servlet-name>PingServlet2ServletRcv</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2ServletRcv</servlet-class>
       </servlet>
-      <servlet id="Servlet_13">
+      <servlet>
          <display-name>PingServlet2Jsp</display-name>
          <servlet-name>PingServlet2Jsp</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Jsp</servlet-class>
       </servlet>
-      <servlet id="Servlet_14">
+      <servlet>
          <display-name>PingSession1</display-name>
          <servlet-name>PingSession1</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingSession1</servlet-class>
       </servlet>
-      <servlet id="Servlet_15">
+      <servlet>
          <display-name>PingSession2</display-name>
          <servlet-name>PingSession2</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingSession2</servlet-class>
       </servlet>
-      <servlet id="Servlet_16">
+      <servlet>
          <display-name>PingSession3</display-name>
          <servlet-name>PingSession3</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingSession3</servlet-class>
       </servlet>
-      <servlet id="Servlet_17">
+      <servlet>
          <display-name>PingJDBCRead</display-name>
          <servlet-name>PingJDBCRead</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingJDBCRead</servlet-class>
       </servlet>
-      <servlet id="Servlet_18">
+      <servlet>
          <display-name>PingJDBCWrite</display-name>
          <servlet-name>PingJDBCWrite</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingJDBCWrite</servlet-class>
       </servlet>
-      <servlet id="Servlet_19">
+      <servlet>
          <display-name>PingServlet2Session</display-name>
          <servlet-name>PingServlet2Session</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session</servlet-class>
       </servlet>
-      <servlet id="Servlet_20">
+      <servlet>
          <display-name>PingServlet2EntityLocal</display-name>
          <servlet-name>PingServlet2EntityLocal</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2EntityLocal</servlet-class>
       </servlet>
-      <servlet id="Servlet_29">
+      <servlet>
          <display-name>PingServlet2EntityRemote</display-name>
          <servlet-name>PingServlet2EntityRemote</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2EntityRemote</servlet-class>
       </servlet>      
-      <servlet id="Servlet_21">
+      <servlet>
          <display-name>PingServlet2Session2Entity</display-name>
          <servlet-name>PingServlet2Session2Entity</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2Entity</servlet-class>
       </servlet>
-      <servlet id="Servlet_22">
+      <servlet>
          <display-name>PingServlet2Session2EntityCollection</display-name>
          <servlet-name>PingServlet2Session2EntityCollection</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2EntityCollection</servlet-class>
       </servlet>
-      <servlet id="Servlet_23">
+      <servlet>
          <display-name>PingServlet2Session2CMROne2One</display-name>
          <servlet-name>PingServlet2Session2CMROne2One</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2CMROne2One</servlet-class>
       </servlet>
-      <servlet id="Servlet_24">
+      <servlet>
          <display-name>PingServlet2Session2CMROne2Many</display-name>
          <servlet-name>PingServlet2Session2CMROne2Many</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Session2CMROne2Many</servlet-class>
       </servlet>
-      <servlet id="Servlet_25">
+      <servlet>
          <display-name>PingServlet2MDBQueue</display-name>
          <servlet-name>PingServlet2MDBQueue</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2MDBQueue</servlet-class>
       </servlet>     
-      <servlet id="Servlet_26">
+      <servlet>
          <display-name>PingServlet2MDBTopic</display-name>
          <servlet-name>PingServlet2MDBTopic</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2MDBTopic</servlet-class>
       </servlet>     
-      <servlet id="Servlet_27">
+      <servlet>
          <display-name>PingServlet2JNDI</display-name>
          <servlet-name>PingServlet2JNDI</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2JNDI</servlet-class>
       </servlet>           
-      <servlet id="Servlet_28">
+      <servlet>
          <display-name>PingServlet2TwoPhase</display-name>
          <servlet-name>PingServlet2TwoPhase</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2TwoPhase</servlet-class>
       </servlet>  
-      <servlet id="Servlet_31">
+      <servlet>
          <display-name>PingServlet2Include</display-name>
          <servlet-name>PingServlet2Include</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2Include</servlet-class>
       </servlet>
-      <servlet id="Servlet_32">
+      <servlet>
          <display-name>PingServlet2IncludeRcv</display-name>
          <servlet-name>PingServlet2IncludeRcv</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2IncludeRcv</servlet-class>
       </servlet>
-      <servlet id="Servlet_30">
+      <servlet>
          <display-name>org_apache_geronimo_samples_daytrader_TradeWSAction</display-name>
          <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
          <servlet-class>org.apache.geronimo.samples.daytrader.TradeWSAction</servlet-class>
       </servlet>                  
-      <servlet-mapping id="ServletMapping_1">
+      <servlet-mapping>
          <servlet-name>TradeAppServlet</servlet-name>
          <url-pattern>/app</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_2">
+      <servlet-mapping>
          <servlet-name>TestServlet</servlet-name>
          <url-pattern>/TestServlet</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_3">
+      <servlet-mapping>
          <servlet-name>TradeConfigServlet</servlet-name>
          <url-pattern>/config</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_4">
+      <servlet-mapping>
          <servlet-name>TradeScenarioServlet</servlet-name>
          <url-pattern>/scenario</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_99">
+      <servlet-mapping>
          <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
          <url-pattern>/services/TradeWSServices</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_5">
+      <servlet-mapping>
+         <servlet-name>ExplicitGC</servlet-name>
+         <url-pattern>/servlet/ExplicitGC</url-pattern>
+      </servlet-mapping>
+      <servlet-mapping>
          <servlet-name>PingServlet</servlet-name>
          <url-pattern>/servlet/PingServlet</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_6">
+      <servlet-mapping>
          <servlet-name>PingServletWriter</servlet-name>
          <url-pattern>/servlet/PingServletWriter</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_7">
+      <servlet-mapping>
          <servlet-name>PingServlet2Servlet</servlet-name>
          <url-pattern>/servlet/PingServlet2Servlet</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_8">
+      <servlet-mapping>
          <servlet-name>PingServlet2ServletRcv</servlet-name>
          <url-pattern>/servlet/PingServlet2ServletRcv</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_9">
+      <servlet-mapping>
          <servlet-name>PingServlet2Jsp</servlet-name>
          <url-pattern>/servlet/PingServlet2Jsp</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_10">
+      <servlet-mapping>
          <servlet-name>PingSession1</servlet-name>
          <url-pattern>/servlet/PingSession1</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_11">
+      <servlet-mapping>
          <servlet-name>PingSession2</servlet-name>
          <url-pattern>/servlet/PingSession2</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_12">
+      <servlet-mapping>
          <servlet-name>PingSession3</servlet-name>
          <url-pattern>/servlet/PingSession3</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_13">
+      <servlet-mapping>
          <servlet-name>PingJDBCRead</servlet-name>
          <url-pattern>/servlet/PingJDBCRead</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_14">
+      <servlet-mapping>
          <servlet-name>PingJDBCWrite</servlet-name>
          <url-pattern>/servlet/PingJDBCWrite</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_15">
+      <servlet-mapping>
          <servlet-name>PingServlet2Session</servlet-name>
          <url-pattern>/servlet/PingServlet2Session</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_16">
+      <servlet-mapping>
          <servlet-name>PingServlet2EntityLocal</servlet-name>
          <url-pattern>/servlet/PingServlet2EntityLocal</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_25">
+      <servlet-mapping>
          <servlet-name>PingServlet2EntityRemote</servlet-name>
          <url-pattern>/servlet/PingServlet2EntityRemote</url-pattern>
       </servlet-mapping>      
-      <servlet-mapping id="ServletMapping_17">
+      <servlet-mapping>
          <servlet-name>PingServlet2Session2Entity</servlet-name>
          <url-pattern>/servlet/PingServlet2Session2Entity</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_18">
+      <servlet-mapping>
          <servlet-name>PingServlet2Session2EntityCollection</servlet-name>
          <url-pattern>/servlet/PingServlet2Session2EntityCollection</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_19">
+      <servlet-mapping>
          <servlet-name>PingServlet2Session2CMROne2One</servlet-name>
          <url-pattern>/servlet/PingServlet2Session2CMROne2One</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_20">
+      <servlet-mapping>
          <servlet-name>PingServlet2Session2CMROne2Many</servlet-name>
          <url-pattern>/servlet/PingServlet2Session2CMROne2Many</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_21">
+      <servlet-mapping>
          <servlet-name>PingServlet2MDBQueue</servlet-name>
          <url-pattern>/servlet/PingServlet2MDBQueue</url-pattern>
       </servlet-mapping>
-      <servlet-mapping id="ServletMapping_22">
+      <servlet-mapping>
          <servlet-name>PingServlet2MDBTopic</servlet-name>
          <url-pattern>/servlet/PingServlet2MDBTopic</url-pattern>
       </servlet-mapping>      
-      <servlet-mapping id="ServletMapping_23">
+      <servlet-mapping>
          <servlet-name>PingServlet2JNDI</servlet-name>
          <url-pattern>/servlet/PingServlet2JNDI</url-pattern>
       </servlet-mapping>           
-      <servlet-mapping id="ServletMapping_24">
+      <servlet-mapping>
          <servlet-name>PingServlet2TwoPhase</servlet-name>
          <url-pattern>/servlet/PingServlet2TwoPhase</url-pattern>
       </servlet-mapping>                 
-      <servlet-mapping id="ServletMapping_26">
+      <servlet-mapping>
          <servlet-name>PingServlet2Include</servlet-name>
          <url-pattern>/servlet/PingServlet2Include</url-pattern>
       </servlet-mapping>                 
-      <session-config id="SessionConfig_1">
+      <session-config>
          <session-timeout>30</session-timeout>
       </session-config>
-      <welcome-file-list id="WelcomeFileList_1">
+      <welcome-file-list>
          <welcome-file>index.html</welcome-file>
       </welcome-file-list>
-      <error-page id="ExceptionTypeErrorPage_1">
+      <error-page>
          <exception-type>java.lang.Exception</exception-type>
          <location>/error.jsp</location>
       </error-page>
-      <error-page id="ErrorCodeErrorPage_1">
+      <error-page>
          <error-code>500</error-code>
          <location>/error.jsp</location>
       </error-page>
@@ -406,13 +415,13 @@
          <local>org.apache.geronimo.samples.daytrader.ejb.LocalAccount</local>
          <ejb-link>AccountEJB</ejb-link>
       </ejb-local-ref>
-      <message-destination-ref id="MessageDestinationRef_1">
+      <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>daytrader-ejb-${pom.currentVersion}.jar#TradeBrokerQueue</message-destination-link>
       </message-destination-ref>
-      <message-destination-ref id="MessageDestinationRef_2">
+      <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>

Modified: geronimo/daytrader/trunk/web/src/webapp/web_prmtv.html
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/web/src/webapp/web_prmtv.html?rev=373562&r1=373561&r2=373562&view=diff
==============================================================================
--- geronimo/daytrader/trunk/web/src/webapp/web_prmtv.html (original)
+++ geronimo/daytrader/trunk/web/src/webapp/web_prmtv.html Mon Jan 30 10:23:04 2006
@@ -38,6 +38,10 @@
       page of static HTML.</FONT></TD>
     </TR>
     <TR>
+      <TD align="center"><FONT size="-1"><A href="servlet/ExplicitGC" target="_self"><FONT face="Times New Roman">Explicit GC</FONT></A></FONT></TD>
+      <TD><FONT size="-1">Invoke Garbage Collection on AppServer.  Reports heap statistics after the GC has completed.</FONT></TD>
+    </TR>
+    <TR>
       <TD align="center"><FONT size="-1"><A href="servlet/PingServlet" target="_self"><FONT face="Times New Roman">PingServlet</FONT></A></FONT></TD>
       <TD><FONT size="-1">PingServlet tests fundamental dynamic HTML creation through server side
       servlet processing.</FONT></TD>