geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r808973 [1/7] - in /geronimo/daytrader/trunk: ./ assemblies/ assemblies/daytrader-web-jdbc/ assemblies/daytrader-web-jdbc/src/ assemblies/daytrader-web-jdbc/src/main/ assemblies/daytrader-web-jdbc/src/main/java/ assemblies/daytrader-web-jdb...
Date Fri, 28 Aug 2009 18:07:54 GMT
Author: dwoods
Date: Fri Aug 28 18:07:49 2009
New Revision: 808973

URL: http://svn.apache.org/viewvc?rev=808973&view=rev
Log:
reorg - Part 2

Added:
    geronimo/daytrader/trunk/assemblies/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/java/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/LICENSE
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/NOTICE
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/context.xml   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingHtml.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJsp.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingServlet2Jsp.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/account.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/accountImg.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/config.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/configure.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/contentHome.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/dbscripts/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/dbscripts/db2/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/dbscripts/db2/Table.ddl
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/dbscripts/derby/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/dbscripts/derby/Table.ddl
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/dbscripts/oracle/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/dbscripts/oracle/Table.ddl
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/displayQuote.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/docs/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/docs/benchmarking.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/docs/documentation.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/docs/glossary.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/docs/rtCharacterisitics.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/docs/tradeFAQ.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/docs/tradeversion.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/error.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/footer.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/header.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/DayTraderHead_blue.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/DayTraderHead_red.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/SOAPconfig.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/about.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/account.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/arrowdown.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/arrowup.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/bottomRedBar.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/configuration.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/copyRight.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/dayTraderLogo.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/faq.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/graph.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/home.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/homeBanner.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/line.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/logout.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/lower_banner.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/menuHome.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/portfolio.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/primitives.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/quotes.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/reports.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/spacer.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/ticker-anim.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/topRedBar.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/topline.jpg   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/tradeOverview.png   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/images/tradingAndPortfolios.gif   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/index.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/leftMenu.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/marketSummary.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/order.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/orderImg.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/portfolio.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/portfolioImg.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/quote.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/quoteImg.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/register.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/registerImg.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/runStats.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/sample.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/style.css   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehome.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/tradehomeImg.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/web_prmtv.html   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcome.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/welcomeImg.jsp   (with props)
    geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/test/
    geronimo/daytrader/trunk/assemblies/dojo-ui-ear/
      - copied from r808906, geronimo/daytrader/trunk/modules/dojo-ui-ear/
    geronimo/daytrader/trunk/assemblies/dojo-ui-web/
      - copied from r808906, geronimo/daytrader/trunk/modules/dojo-ui-web/
    geronimo/daytrader/trunk/assemblies/pom.xml   (with props)
    geronimo/daytrader/trunk/modules/ejb3/
    geronimo/daytrader/trunk/modules/ejb3/pom.xml   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/
    geronimo/daytrader/trunk/modules/ejb3/src/main/
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTBroker3MDB.java   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DTStreamer3MDB.java   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBBean.java   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBLocal.java   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/DirectSLSBRemote.java   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBBean.java   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBLocal.java   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/TradeSLSBRemote.java   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/resources/
    geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/
    geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/LICENSE
    geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/NOTICE
    geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/ejb-jar.xml   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml   (with props)
    geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jboss.xml.old
    geronimo/daytrader/trunk/modules/ejb3/src/main/resources/META-INF/jbosscmp-jdbc.xml.old
    geronimo/daytrader/trunk/modules/ejb3/src/test/
    geronimo/daytrader/trunk/modules/pom.xml   (with props)
    geronimo/daytrader/trunk/modules/soap/
    geronimo/daytrader/trunk/modules/soap/pom.xml   (with props)
    geronimo/daytrader/trunk/modules/soap/src/
    geronimo/daytrader/trunk/modules/soap/src/main/
    geronimo/daytrader/trunk/modules/soap/src/main/java/
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/Convert.java   (with props)
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWSAction.java   (with props)
    geronimo/daytrader/trunk/modules/soap/src/main/java/org/apache/geronimo/samples/daytrader/soap/TradeWebSoapProxy.java   (with props)
    geronimo/daytrader/trunk/modules/soap/src/test/
    geronimo/daytrader/trunk/plugins/pom.xml   (with props)
Removed:
    geronimo/daytrader/trunk/modules/core/LICENSE
    geronimo/daytrader/trunk/modules/core/NOTICE
    geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/ejb3/
    geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/soap/
    geronimo/daytrader/trunk/modules/core/src/main/resources/META-INF/ejb-jar.xml
    geronimo/daytrader/trunk/modules/core/src/test/example/
    geronimo/daytrader/trunk/modules/dojo-ui-ear/
    geronimo/daytrader/trunk/modules/dojo-ui-web/
    geronimo/daytrader/trunk/modules/json-proxy/LICENSE
    geronimo/daytrader/trunk/modules/json-proxy/NOTICE
    geronimo/daytrader/trunk/modules/streamer/LICENSE
    geronimo/daytrader/trunk/modules/streamer/NOTICE
    geronimo/daytrader/trunk/modules/web/LICENSE
    geronimo/daytrader/trunk/modules/web/NOTICE
    geronimo/daytrader/trunk/modules/wsappclient/LICENSE
    geronimo/daytrader/trunk/modules/wsappclient/NOTICE
Modified:
    geronimo/daytrader/trunk/daytrader-webonly/pom.xml
    geronimo/daytrader/trunk/modules/core/pom.xml
    geronimo/daytrader/trunk/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/TradeAction.java
    geronimo/daytrader/trunk/modules/json-proxy/pom.xml
    geronimo/daytrader/trunk/modules/streamer/pom.xml
    geronimo/daytrader/trunk/modules/web/pom.xml
    geronimo/daytrader/trunk/modules/wsappclient/pom.xml
    geronimo/daytrader/trunk/pom.xml

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README Fri Aug 28 18:07:49 2009
@@ -0,0 +1,13 @@
+(C) Copyright 2009 The Apache Software Foundation.
+----------------------------------------------------------------------
+
+This is a version of daytrader which is able to running on Tomcat 6. 
+By default, it uses Derby database. You can change src/main/webapp/META-INF/context.xml
+to use other database vendor. Remember that copying database jdbc drivers to tomcat lib
+directory.
+
+After building, just deploy the .war in the target directory to tomcat with context root /daytrader.
+
+Of course, it works as well as on Little-G with Tomcat 6. Before deploying it 
+to Little-G, you need to deploy a datasource first. Refer to daytrader-datasource-plan.xml
+for an example.

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/README
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.apache.geronimo.daytrader.assemblies</groupId>
+    <artifactId>daytrader-web-jdbc</artifactId>    
+    <packaging>war</packaging>
+    <name>DayTrader :: Web + JDBC Assembly</name>
+    <description>A version of Daytrader for basic Web constainers</description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>core</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.daytrader.modules</groupId>
+            <artifactId>web</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <!-- we need to include this in the image for logging to work -->
+            <!-- <scope>provided</scope> -->
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <!-- <version>1.1.1</version>  -->
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <resources>
+                        <resource implementation="org.apache.maven.model.Resource">
+                            <filtering>false</filtering>
+                            <directory>
+                                ${basedir}/src/main/webapp/WEB-INF
+                            </directory>
+                            <includes>
+                                <include>web.xml</include>
+                                <include>geronimo-web.xml</include>
+                            </includes>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/LICENSE?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/LICENSE (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/LICENSE Fri Aug 28 18:07:49 2009
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/NOTICE?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/NOTICE (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/NOTICE Fri Aug 28 18:07:49 2009
@@ -0,0 +1,9 @@
+Apache Geronimo 
+Copyright 2003-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at IBM and donated to the 
+ASF under the Apache 2.0 license.  The former work was referred to 
+as Trade 6.

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/context.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/context.xml (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/context.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<Context path="" debug="5" reloadable="true" crossContext="true">
+
+    <!-- maxActive: Maximum number of dB connections in pool. Make sure you
+         configure your mysqld max_connections large enough to handle
+         all of your db connections. Set to -1 for no limit.
+         -->
+
+    <!-- maxIdle: Maximum number of idle dB connections to retain in pool.
+         Set to -1 for no limit.  See also the DBCP documentation on this
+         and the minEvictableIdleTimeMillis configuration parameter.
+         -->
+
+    <!-- maxWait: Maximum time to wait for a dB connection to become available
+         in ms, in this example 10 seconds. An Exception is thrown if
+         this timeout is exceeded.  Set to -1 to wait indefinitely.
+         -->
+
+    <!-- username and password: MySQL dB username and password for dB connections  -->
+
+    <!-- driverClassName: Class name for the old mm.mysql JDBC driver is
+         org.gjt.mm.mysql.Driver - we recommend using Connector/J though.
+         Class name for the official MySQL Connector/J driver is com.mysql.jdbc.Driver.
+         -->
+    
+    <!-- url: The JDBC connection url for connecting to your MySQL dB.
+         The autoReconnect=true argument to the url makes sure that the
+         mm.mysql JDBC Driver will automatically reconnect if mysqld closed the
+         connection.  mysqld by default closes idle connections after 8 hours.
+         -->
+
+  <!-- MySQL
+	<Resource name="jdbc/TradeDataSource" auth="Container" type="javax.sql.DataSource"
+               maxActive="100" maxIdle="30" maxWait="10000"
+               username="admin" password="password" driverClassName="com.mysql.jdbc.Driver"
+               url="jdbc:mysql://localhost:3306/tradedb?autoReconnect=true"/>-->
+               
+	<!-- <Resource name="jdbc/TradeDataSource" auth="Container" type="javax.sql.DataSource"
+               maxActive="100" maxIdle="30" maxWait="10000"
+               username="admin" password="password" driverClassName="org.apache.derby.jdbc.ClientDriver"
+               url="jdbc:derby://localhost:1528/tradedb?create=true"/> -->
+               
+   <!-- DB2, install db2jcc.jar and db2jcc_license_cu.jar to tomcathome/lib -->
+   <!-- <Resource name="jdbc/TradeDataSource" auth="Container" type="javax.sql.DataSource"
+               maxActive="100" maxIdle="30" maxWait="10000"
+               username="db2admin" password="password" driverClassName="com.ibm.db2.jcc.DB2Driver"
+               url="jdbc:db2://localhost:50000/tradedb" connectionProperties="driverType=4;"/> -->
+
+	<Resource name="jdbc/TradeDataSource" auth="Container" type="javax.sql.DataSource"
+               maxActive="100" maxIdle="30" maxWait="10000" driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+               url="jdbc:derby:tradedb;create=true"/>     
+               
+
+</Context>
+

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/META-INF/context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingHtml.html
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingHtml.html?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingHtml.html (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingHtml.html Fri Aug 28 18:07:49 2009
@@ -0,0 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<HTML>
+<HEAD>
+<TITLE>PingHTML.html</TITLE>
+</HEAD>
+<BODY>
+<HR>
+<P><FONT size="+2" color="#000066">PING HTML:</FONT></P>
+<P><FONT size="+1" color="#000066">Hello World</FONT></P>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingHtml.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingHtml.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJsp.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJsp.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJsp.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJsp.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<html>
+<head>
+<META HTTP-EQUIV="pragma" CONTENT="no-cache">
+<META http-equiv="Content-Style-Type" content="text/css">
+<!-- Don't cache on netscape! -->
+<title>PingJsp</title>
+</head>
+<body>
+<%! int hitCount = 0;
+    String initTime = new java.util.Date().toString();
+ %>
+<HR>
+<BR>
+<FONT size="+2" color="#000066">PING JSP:<BR>
+</FONT><FONT size="+1" color="#000066">Init time: <%= initTime %></FONT>
+<% hitCount++; %>
+<P><B>Hit Count: <%= hitCount %></B></P>
+</body>
+</html>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJsp.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,128 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<html>
+<head>
+	<title>PingJspEL</title>
+</head>
+<body>
+<%@ page import="org.apache.geronimo.samples.daytrader.*" session="false" %>
+
+<%!
+int hitCount = 0;
+String initTime = new java.util.Date().toString();
+%>
+ 
+<%
+// 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));
+ 
+QuoteDataBean quoteData1 = QuoteDataBean.getRandomInstance();
+pageContext.setAttribute("quoteData1", quoteData1);
+QuoteDataBean quoteData2 = QuoteDataBean.getRandomInstance();
+pageContext.setAttribute("quoteData2", quoteData2);
+QuoteDataBean quoteData3 = QuoteDataBean.getRandomInstance();
+pageContext.setAttribute("quoteData3", quoteData3);
+QuoteDataBean quoteData4 = QuoteDataBean.getRandomInstance();
+pageContext.setAttribute("quoteData4", quoteData4);
+
+QuoteDataBean quoteData[] = new QuoteDataBean[4];
+quoteData[0] = quoteData1;
+quoteData[1] = quoteData2;
+quoteData[2] = quoteData3;
+quoteData[3] = quoteData4;
+pageContext.setAttribute("quoteData", quoteData);
+%>
+  
+<HR>
+<BR>
+  <FONT size="+2" color="#000066">PING JSP EL:<BR></FONT><FONT size="+1" color="#000066">Init time: <%= initTime %></FONT>
+  <P>
+    <B>Hit Count: <%= hitCount++ %></B>
+   </P>
+<HR>
+
+<P>
+
+someint1 = <%= someint1 %><br/>
+someint2 = <%= someint2 %><br/>
+somefloat1 = <%= somefloat1 %><br/>
+somefloat2 = <%= somefloat2 %><br/>
+
+<P>
+
+<HR>
+
+<table border="1">
+	<thead>
+		<th>EL Type</th>
+		<th>EL Expressions</th>
+		<th>Result</th>
+	</thead>
+	<tr>
+		<td>Integer Arithmetic</td>
+		<td>\${someint1 + someint2 - someint1 * someint2 mod someint1}</td>
+		<td>${someint1 + someint2 - someint1 * someint2 mod someint1}</td>
+	</tr>
+	<tr>
+		<td>Floating Point Arithmetic</td>
+		<td>\${somefloat1 + somefloat2 - somefloat1 * somefloat2 / somefloat1}</td>
+		<td>${somefloat1 + somefloat2 - somefloat1 * somefloat2 / somefloat1}</td>
+	</tr>
+	<tr>
+		<td>Logical Operations</td>
+		<td>\${(someint1 < someint2) && (someint1 <= someint2) || (someint1 == someint2) && !Boolean.FALSE}</td>
+		<td>${(someint1 < someint2) && (someint1 <= someint2) || (someint1 == someint2) && !Boolean.FALSE}</td>
+	</tr>
+	<tr>
+		<td>Indexing Operations</td>
+		<td>
+			\${quoteData3.symbol}<br/>
+			\${quoteData[2].symbol}<br/>
+			\${quoteData4["symbol"]}<br/>
+			\${header["host"]}<br/>
+			\${header.host}<br/>
+		</td>
+		<td>
+			${quoteData3.symbol}<br/>
+			${quoteData[1].symbol}<br/>
+			${quoteData4["symbol"]}<br/>
+			${header["host"]}<br/>
+			${header.host}
+		</td>
+	</tr>
+	<tr>
+		<td>Variable Scope Tests</td>
+		<td>
+			\${(quoteData3 == null) ? "null" : quoteData3}<br/>
+			\${(noSuchVariableAtAnyScope == null) ? "null" : noSuchVariableAtAnyScope}
+		</td>
+		<td>
+			${(quoteData3 == null) ? "null" : quoteData3}<br/>
+			${(noSuchVariableAtAnyScope == null) ? "null" : noSuchVariableAtAnyScope}
+		</td>
+	</tr>
+</table>
+</body>
+</html>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingJspEL.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingServlet2Jsp.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingServlet2Jsp.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingServlet2Jsp.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingServlet2Jsp.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,37 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<META HTTP-EQUIV="pragma" CONTENT="no-cache">
+<META http-equiv="Content-Style-Type" content="text/css">
+<!-- Don't cache on netscape! -->
+<title>PingJsp</title>
+</head>
+<BODY>
+<%! String initTime = (new java.util.Date()).toString(); 
+ %>
+<jsp:useBean id="ab" type="org.apache.geronimo.samples.daytrader.web.prims.PingBean" scope="request" />
+<HR>
+<FONT size="+2" color="#000066"><BR>
+Ping Servlet2JSP:<BR>
+</FONT><FONT size="+1" color="#000066">Init time: <%= initTime %></FONT><BR>
+<BR>
+<B>Message from Servlet: </B> <%= ab.getMsg() %>
+
+</BODY>
+</html>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/PingServlet2Jsp.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+             xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+             xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        
+        <sys:environment>
+            <sys:moduleId>
+                <sys:groupId>org.apache.geronimo.daytrader.assemblies</sys:groupId>
+                <sys:artifactId>daytrader-web-jdbc</sys:artifactId>
+                <sys:version>2.2</sys:version>
+                <sys:type>war</sys:type>
+            </sys:moduleId>
+        
+            <sys:dependencies>
+                <sys:dependency>
+                    <sys:groupId>org.apache.geronimo.daytrader.plugins</sys:groupId>
+                    <sys:artifactId>daytrader-derby-datasource</sys:artifactId>
+                </sys:dependency>
+            </sys:dependencies>
+        </sys:environment>
+    
+    <context-root>/daytrader</context-root>
+
+     <naming:resource-ref>
+        <naming:ref-name>jdbc/TradeDataSource</naming:ref-name>
+        <naming:resource-link>jdbc/TradeDataSource</naming:resource-link>
+    </naming:resource-ref>
+
+</web-app>
+
+

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml Fri Aug 28 18:07:49 2009
@@ -0,0 +1,480 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+    <display-name>DayTrader Web JDBC</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>
+        <filter-name>OrdersAlertFilter</filter-name>
+        <servlet-name>TradeAppServlet</servlet-name>
+    </filter-mapping>
+    
+    <listener>
+        <listener-class>org.apache.geronimo.samples.daytrader.web.TradeWebContextListener</listener-class>
+    </listener>
+    
+    <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>
+    
+<!-- JavaEE Only
+    <servlet>
+        <display-name>TestServlet</display-name>
+        <servlet-name>TestServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.TestServlet</servlet-class>
+    </servlet>
+-->
+    
+    <servlet>
+        <display-name>register</display-name>
+        <servlet-name>register</servlet-name>
+        <jsp-file>/register.jsp</jsp-file>
+    </servlet>   
+    <servlet>
+        <display-name>welcome</display-name>
+        <servlet-name>welcome</servlet-name>
+        <jsp-file>/welcome.jsp</jsp-file>
+    </servlet>
+    <servlet>
+        <display-name>order</display-name>
+        <servlet-name>order</servlet-name>
+        <jsp-file>/order.jsp</jsp-file>
+    </servlet>
+    <servlet>
+        <display-name>tradehome</display-name>
+        <servlet-name>tradehome</servlet-name>
+        <jsp-file>/tradehome.jsp</jsp-file>
+    </servlet>
+    
+    <servlet>
+        <display-name>TradeConfigServlet</display-name>
+        <servlet-name>TradeConfigServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.TradeConfigServlet</servlet-class>
+    </servlet>
+    
+   <servlet>
+        <display-name>TradeScenarioServlet</display-name>
+        <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>
+            <param-name>runTimeMode</param-name>
+            <param-value>DIRECT</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>
+            <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.
+            </description>
+            <param-name>accessMode</param-name>
+            <param-value>Standard</param-value>
+        </init-param>
+        <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>
+            <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>
+            <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>
+            <description>Sets the population of Trade users when driving with TradeScenarioServlet.</description>
+            <param-name>maxUsers</param-name>
+            <param-value>200</param-value>
+        </init-param>
+        <init-param>
+            <description>Sets the population of Stock quotes used when driving with TradeScenarioServlet.</description>
+            <param-name>maxQuotes</param-name>
+            <param-value>400</param-value>
+        </init-param>
+        <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>
+            <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>
+    
+<!-- JavaEE Only
+    <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.soap.TradeWSAction</servlet-class>
+    </servlet>
+-->
+    
+    <!-- Web container primitives -->
+    <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>
+        <display-name>PingServletWriter</display-name>
+        <servlet-name>PingServletWriter</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServletWriter</servlet-class>
+    </servlet>
+    <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>
+        <display-name>PingServlet2ServletRcv</display-name>
+        <servlet-name>PingServlet2ServletRcv</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2ServletRcv</servlet-class>
+    </servlet>
+    <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>
+        <display-name>PingServlet2IncludeRcv</display-name>
+        <servlet-name>PingServlet2IncludeRcv</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2IncludeRcv</servlet-class>
+    </servlet>
+    <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>
+        <display-name>PingSession1</display-name>
+        <servlet-name>PingSession1</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingSession1</servlet-class>
+    </servlet>
+    <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>
+        <display-name>PingSession3</display-name>
+        <servlet-name>PingSession3</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingSession3</servlet-class>
+    </servlet>
+    <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>
+        <display-name>PingJDBCWrite</display-name>
+        <servlet-name>PingJDBCWrite</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingJDBCWrite</servlet-class>
+    </servlet>
+    <servlet>
+        <display-name>PingServlet2JNDI</display-name>
+        <servlet-name>PingServlet2JNDI</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.PingServlet2JNDI</servlet-class>
+    </servlet>
+    <!-- End of Web container primitives -->
+    
+    <!-- EJB container primitives (EJB3) -->   
+<!-- JavaEE Only
+    <servlet>
+        <servlet-name>ejb3.PingServlet2Session</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2Entity</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Entity</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2Session2Entity</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2Entity</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2Session2EntityCollection</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2EntityCollection</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2Session2CMROne2One</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2CMROne2One</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2Session2CMROne2Many</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2CMROne2Many</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2Session2JDBC</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2JDBC</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2Session2JDBCCollection</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2Session2JDBCCollection</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2MDBQueue</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2MDBQueue</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2MDBTopic</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2MDBTopic</servlet-class>
+    </servlet>
+    <servlet>
+        <servlet-name>ejb3.PingServlet2TwoPhase</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.daytrader.web.prims.ejb3.PingServlet2TwoPhase</servlet-class>
+    </servlet>
+-->
+    <!-- End of EJB container primitives (EJB3) -->
+    
+
+    <servlet-mapping>
+        <servlet-name>TradeAppServlet</servlet-name>
+        <url-pattern>/app</url-pattern>
+    </servlet-mapping>
+<!-- JavaEE Only
+    <servlet-mapping>
+        <servlet-name>TestServlet</servlet-name>
+        <url-pattern>/TestServlet</url-pattern>
+    </servlet-mapping>
+-->
+    <servlet-mapping>
+        <servlet-name>TradeConfigServlet</servlet-name>
+        <url-pattern>/config</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>TradeScenarioServlet</servlet-name>
+        <url-pattern>/scenario</url-pattern>
+    </servlet-mapping>
+<!-- JavaEE Only
+    <servlet-mapping>
+        <servlet-name>org_apache_geronimo_samples_daytrader_TradeWSAction</servlet-name>
+        <url-pattern>/services/TradeWSServices</url-pattern>
+    </servlet-mapping>
+-->
+    
+    
+    <!-- Web container primitives (Servlet Mappings) -->
+    <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>
+        <servlet-name>PingServletWriter</servlet-name>
+        <url-pattern>/servlet/PingServletWriter</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingServlet2Servlet</servlet-name>
+        <url-pattern>/servlet/PingServlet2Servlet</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingServlet2ServletRcv</servlet-name>
+        <url-pattern>/servlet/PingServlet2ServletRcv</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingServlet2Include</servlet-name>
+        <url-pattern>/servlet/PingServlet2Include</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingServlet2IncludeRcv</servlet-name>
+        <url-pattern>/servlet/PingServlet2IncludeRcv</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingServlet2Jsp</servlet-name>
+        <url-pattern>/servlet/PingServlet2Jsp</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingSession1</servlet-name>
+        <url-pattern>/servlet/PingSession1</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingSession2</servlet-name>
+        <url-pattern>/servlet/PingSession2</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingSession3</servlet-name>
+        <url-pattern>/servlet/PingSession3</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingJDBCRead</servlet-name>
+        <url-pattern>/servlet/PingJDBCRead</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PingJDBCWrite</servlet-name>
+        <url-pattern>/servlet/PingJDBCWrite</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+	<servlet-name>PingServlet2JNDI</servlet-name>
+	<url-pattern>/servlet/PingServlet2JNDI</url-pattern>
+    </servlet-mapping>
+    <!-- End of Web container primitives (Servlet Mappings) -->
+
+    
+    <!-- EJB container primitives (Servlet Mappings) -->   
+<!-- JavaEE only
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2Session</servlet-name>
+        <url-pattern>/ejb3/PingServlet2Session</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2Entity</servlet-name>
+        <url-pattern>/ejb3/PingServlet2Entity</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2Session2Entity</servlet-name>
+        <url-pattern>/ejb3/PingServlet2Session2Entity</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2Session2EntityCollection</servlet-name>
+        <url-pattern>/ejb3/PingServlet2Session2EntityCollection</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2Session2CMROne2One</servlet-name>
+        <url-pattern>/ejb3/PingServlet2Session2CMROne2One</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2Session2CMROne2Many</servlet-name>
+        <url-pattern>/ejb3/PingServlet2Session2CMROne2Many</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2Session2JDBC</servlet-name>
+        <url-pattern>/ejb3/PingServlet2Session2JDBC</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2Session2JDBCCollection</servlet-name>
+        <url-pattern>/ejb3/PingServlet2Session2JDBCCollection</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2MDBQueue</servlet-name>
+        <url-pattern>/ejb3/PingServlet2MDBQueue</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2MDBTopic</servlet-name>
+        <url-pattern>/ejb3/PingServlet2MDBTopic</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ejb3.PingServlet2TwoPhase</servlet-name>
+        <url-pattern>/ejb3/PingServlet2TwoPhase</url-pattern>
+    </servlet-mapping>
+-->
+    <!-- End of EJB container primitives (Servlet Mappings) -->
+    
+
+    <session-config>
+        <session-timeout>30</session-timeout>
+    </session-config>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    <error-page>
+        <exception-type>java.lang.Exception</exception-type>
+        <location>/error.jsp</location>
+    </error-page>
+    <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+    
+    <resource-ref>
+        <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+<!-- JavaEE only
+    <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>
+    
+    <ejb-ref>
+        <ejb-ref-name>ejb/TradeSLSBBean</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <remote>org.apache.geronimo.samples.daytrader.ejb3.TradeSLSBRemote</remote>
+        <ejb-link>TradeSLSBBean</ejb-link>
+    </ejb-ref>
+    <ejb-ref>
+        <ejb-ref-name>ejb/DirectSLSBBean</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <remote>org.apache.geronimo.samples.daytrader.ejb3.DirectSLSBRemote</remote>
+        <ejb-link>DirectSLSBBean</ejb-link>
+    </ejb-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>dt-ejb.jar#jms/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>dt-ejb.jar#jms/TradeStreamerTopic</message-destination-link>
+    </message-destination-ref>
+    
+    <service-ref>
+        <description>WSDL Service Trade</description>
+        <service-ref-name>service/Trade</service-ref-name>
+        <service-interface>org.apache.geronimo.samples.daytrader.client.ws.Trade</service-interface>
+        <wsdl-file>WEB-INF/wsdl/TradeServices.wsdl</wsdl-file>
+        <jaxrpc-mapping-file>WEB-INF/TradeServicesClient_mapping.xml</jaxrpc-mapping-file>
+        <service-qname xmlns:pfx="http://daytrader.samples.geronimo.apache.org">pfx:Trade</service-qname>
+        <port-component-ref>
+            <service-endpoint-interface>org.apache.geronimo.samples.daytrader.client.ws.TradeWSServices</service-endpoint-interface>
+        </port-component-ref>
+    </service-ref>
+-->
+</web-app>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/account.jsp
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/account.jsp?rev=808973&view=auto
==============================================================================
--- geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/account.jsp (added)
+++ geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/account.jsp Fri Aug 28 18:07:49 2009
@@ -0,0 +1,320 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META http-equiv="Content-Style-Type" content="text/css">
+<TITLE>Trade Account information</TITLE>
+<LINK rel="stylesheet" href="style.css" type="text/css" />
+</HEAD>
+<BODY bgcolor="#ffffff" link="#000099" vlink="#000099">
+<%@ page
+	import="java.util.Collection,java.util.Iterator,java.math.BigDecimal,org.apache.geronimo.samples.daytrader.*,org.apache.geronimo.samples.daytrader.util.*"
+	session="true" isThreadSafe="true" isErrorPage="false"%>
+<jsp:useBean id="results" scope="request" type="java.lang.String" />
+<jsp:useBean id="accountData"
+	type="org.apache.geronimo.samples.daytrader.AccountDataBean"
+	scope="request" />
+<jsp:useBean id="accountProfileData"
+	type="org.apache.geronimo.samples.daytrader.AccountProfileDataBean"
+	scope="request" />
+<jsp:useBean id="orderDataBeans" type="java.util.Collection"
+	scope="request" />
+<TABLE height="54">
+	<TBODY>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10" colspan=5><B><FONT
+				color="#ffffff">DayTrader Account</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+		<TR align="left">
+			<TD><B><A href="app?action=home">Home</A></B><B> </B></TD>
+			<TD><B><A href="app?action=account">Account</A></B><B> </B></TD>
+			<TD><B><A href="app?action=portfolio">Portfolio</A></B><B> </B></TD>
+			<TD><B><A href="app?action=quotes&amp;symbols=s:0,s:1,s:2,s:3,s:4">Quotes/Trade</A></B></TD>
+			<TD><B><A href="app?action=logout">Logoff</A></B></TD>
+			<TD></TD>
+		</TR>
+		<TR>
+			<TD align="right" colspan="6">
+			<HR>
+			<FONT color="#ff0000" size="-2"><%=new java.util.Date()%></FONT></TD>
+		</TR>
+		<%
+boolean showAllOrders = request.getParameter("showAllOrders") == null ? false
+                    : true;
+            Collection closedOrders = (Collection) request
+                    .getAttribute("closedOrders");
+            if ((closedOrders != null) && (closedOrders.size() > 0)) {
+
+                %>
+		<TR>
+			<TD colspan="6" bgcolor="#ff0000"><BLINK><B><FONT color="#ffffff">Alert:
+			The following Order(s) have completed.</FONT></B></BLINK></TD>
+		</TR>
+		<TR align="center">
+			<TD colspan="6">
+			<TABLE border="1" style="font-size: smaller">
+				<TBODY>
+					<%
+Iterator it = closedOrders.iterator();
+                while (it.hasNext()) {
+                    OrderDataBean closedOrderData = (OrderDataBean) it.next();
+%>
+					<TR align="center">
+						<TD><A href="docs/glossary.html">order ID</A></TD>
+						<TD><A href="docs/glossary.html">order status</A></TD>
+						<TD><A href="docs/glossary.html">creation date</A></TD>
+						<TD><A href="docs/glossary.html">completion date</A></TD>
+						<TD><A href="docs/glossary.html">txn fee</A></TD>
+						<TD><A href="docs/glossary.html">type</A></TD>
+						<TD><A href="docs/glossary.html">symbol</A></TD>
+						<TD><A href="docs/glossary.html">quantity</A></TD>
+					</TR>
+					<TR align="center">
+						<TD><%=closedOrderData.getOrderID()%></TD>
+						<TD><%=closedOrderData.getOrderStatus()%></TD>
+						<TD><%=closedOrderData.getOpenDate()%></TD>
+						<TD><%=closedOrderData.getCompletionDate()%></TD>
+						<TD><%=closedOrderData.getOrderFee()%></TD>
+						<TD><%=closedOrderData.getOrderType()%></TD>
+						<TD><%=FinancialUtils.printQuoteLink(closedOrderData
+                                    .getSymbol())%></TD>
+						<TD><%=closedOrderData.getQuantity()%></TD>
+					</TR>
+					<%
+}
+%>
+
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<%
+}
+%>
+	</TBODY>
+</TABLE>
+<TABLE width="620">
+	<TBODY>
+		<TR>
+			<TD valign="top" width="643">
+			<TABLE width="100%">
+				<TBODY>
+					<TR>
+						<TD colspan="8"><FONT color="#ff0000"><%=results%></FONT></TD>
+					</TR>
+					<TR>
+						<TD colspan="8" align="left" bgcolor="#cccccc"><B>Account
+						Information</B></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">account
+						created:</A></TD>
+						<TD align="left" valign="bottom" colspan="2"><%=accountData.getCreationDate()%></TD>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">last
+						login: </A></TD>
+						<TD align="left" valign="bottom" colspan="3"><%=accountData.getLastLogin()%></TD>
+						<TD align="left" valign="bottom"></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">account
+						ID</A></TD>
+						<TD valign="bottom"><%=accountData.getAccountID()%></TD>
+						<TD valign="bottom"></TD>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">total
+						logins: </A></TD>
+						<TD valign="bottom"><%=accountData.getLoginCount()%></TD>
+						<TD valign="bottom"></TD>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">cash
+						balance: </A></TD>
+						<TD valign="bottom"><%=accountData.getBalance()%></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">user
+						ID:</A></TD>
+						<TD valign="bottom"><%=accountData.getProfileID()%></TD>
+						<TD valign="bottom"></TD>
+						<TD align="right" valign="bottom"><A href="docs/glossary.html">total
+						logouts: </A></TD>
+						<TD valign="bottom"><%=accountData.getLogoutCount()%></TD>
+						<TD valign="bottom"></TD>
+						<TD valign="bottom" align="right"><A href="docs/glossary.html">opening
+						balance: </A></TD>
+						<TD valign="bottom"><%=accountData.getOpenBalance()%></TD>
+					</TR>
+					<TR>
+						<TD colspan="8"></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			<TABLE width="100%">
+				<TBODY>
+
+					<TR>
+						<TD colspan="5" bgcolor="#cccccc"><B>Total Orders: </B><%=orderDataBeans.size()%></TD>
+						<TD bgcolor="#cccccc" align="right"><B><A
+							href="app?action=account&amp;showAllOrders=true">show all orders</A></B></TD>
+					</TR>
+					<TR align="center">
+						<TD colspan="6">
+						<TABLE border="1" style="font-size: smaller">
+							<CAPTION align="bottom"><B>Recent Orders</B></CAPTION>
+							<TBODY>
+								<TR align="center">
+									<TD><A href="docs/glossary.html">order ID</A></TD>
+									<TD><A href="docs/glossary.html">order Status</A></TD>
+									<TD><A href="docs/glossary.html">creation date</A></TD>
+									<TD><A href="docs/glossary.html">completion date</A></TD>
+									<TD><A href="docs/glossary.html">txn fee</A></TD>
+									<TD><A href="docs/glossary.html">type</A></TD>
+									<TD><A href="docs/glossary.html">symbol</A></TD>
+									<TD><A href="docs/glossary.html">quantity</A></TD>
+									<TD><A href="docs/glossary.html">price</A></TD>
+									<TD><A href="docs/glossary.html">total</A></TD>
+								</TR>
+								<%Iterator it = orderDataBeans.iterator();
+            int count = 0;
+            while (it.hasNext()) {
+                if ((showAllOrders == false) && (count++ >= 5))
+                    break;
+                OrderDataBean orderData = (OrderDataBean) it.next();
+
+                %>
+								<TR bgcolor="#fafcb6" align="center">
+									<TD><%=orderData.getOrderID()%></TD>
+									<TD><%=orderData.getOrderStatus()%></TD>
+									<TD><%=orderData.getOpenDate()%></TD>
+									<TD><%=orderData.getCompletionDate()%></TD>
+									<TD><%=orderData.getOrderFee()%></TD>
+									<TD><%=orderData.getOrderType()%></TD>
+									<TD><%=FinancialUtils.printQuoteLink(orderData.getSymbol())%></TD>
+									<TD><%=orderData.getQuantity()%></TD>
+									<TD><%=orderData.getPrice()%></TD>
+									<TD><%=orderData.getPrice().multiply(
+                                new BigDecimal(orderData.getQuantity()))%></TD>
+								</TR>
+								<%}
+
+            %>
+							</TBODY>
+						</TABLE>
+						</TD>
+					</TR>
+					<TR>
+						<TD colspan="6"></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+            <FORM>
+			<TABLE width="100%">
+				<TBODY>
+					<TR>
+						<TD colspan="6" bgcolor="#cccccc"><B>Account Profile</B></TD>
+					</TR>
+					<TR>
+						<TD align="right" valign="top" width="113"><A
+							href="docs/glossary.html">user ID:</A></TD>
+						<TD align="left" valign="top" colspan="2" width="228"><INPUT
+							size="30" type="text" maxlength="30" readonly name="userID"
+							value="<%= accountProfileData.getUserID() %>"></TD>
+						<TD align="right" valign="top" width="73" colspan="2"><A
+							href="docs/glossary.html">full name: </A></TD>
+						<TD align="left" valign="top"><INPUT size="30" type="text"
+							maxlength="30" name="fullname"
+							value="<%= accountProfileData.getFullName() %>"></TD>
+					</TR>
+					<TR>
+						<TD align="right" width="113"><A href="docs/glossary.html">password:
+						</A></TD>
+						<TD colspan="2" width="228"><INPUT size="30" type="password"
+							maxlength="30" name="password"
+							value="<%= accountProfileData.getPassword() %>"></TD>
+						<TD align="right" width="73" colspan="2"><A
+							href="docs/glossary.html">address: </A></TD>
+						<TD><INPUT size="30" type="text" maxlength="30" name="address"
+							value="<%= accountProfileData.getAddress() %>"></TD>
+					</TR>
+					<TR>
+						<TD align="right" width="113"><A href="docs/glossary.html">confirm
+						password: </A><BR>
+						</TD>
+						<TD colspan="2" align="left" width="228"><INPUT size="30"
+							type="password" maxlength="30" name="cpassword"
+							value="<%= accountProfileData.getPassword() %>"></TD>
+						<TD align="right" width="73" colspan="2"><A
+							href="docs/glossary.html">credit card: </A></TD>
+						<TD align="left"><INPUT size="30" type="text" maxlength="30"
+							name="creditcard"
+							value="<%= accountProfileData.getCreditCard() %>" readonly></TD>
+					</TR>
+					<TR>
+						<TD align="right" width="113"><A href="docs/glossary.html">email
+						address: </A></TD>
+						<TD colspan="2" align="left" width="228"><INPUT size="30"
+							type="text" maxlength="30" name="email"
+							value="<%= accountProfileData.getEmail() %>"></TD>
+						<TD align="right" width="73" colspan="2"></TD>
+						<TD align="center"><INPUT type="submit" name="action"
+							value="update_profile"></TD>
+					</TR>
+					<TR>
+						<TD width="113"></TD>
+						<TD colspan="5"></TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+            </FORM>
+			</TD>
+		</TR>
+	</TBODY>
+</TABLE>
+<TABLE height="54" style="font-size: smaller">
+	<TBODY>
+		<TR>
+			<TD colspan="2">
+			<HR>
+			</TD>
+		</TR>
+		<TR>
+			<TD colspan="2">
+			<TABLE width="100%" style="font-size: smaller">
+				<TBODY>
+					<TR>
+						<TD>Note: Click any <A href="docs/glossary.html">symbol</A> for a
+						quote or to trade.</TD>
+						<TD align="right">
+						<FORM action=""><INPUT type="submit" name="action" value="quotes">
+						<INPUT size="20" type="text" name="symbols"
+							value="s:0, s:1, s:2, s:3, s:4"></FORM>
+						</TD>
+					</TR>
+				</TBODY>
+			</TABLE>
+			</TD>
+		</TR>
+		<TR>
+			<TD bgcolor="#c93333" align="left" width="640" height="10"><B><FONT
+				color="#ffffff">DayTrader Account</FONT></B></TD>
+			<TD align="center" bgcolor="#000000" width="100" height="10"><FONT
+				color="#ffffff"><B>DayTrader</B></FONT></TD>
+		</TR>
+	</TBODY>
+</TABLE>
+</BODY>
+</HTML>

Propchange: geronimo/daytrader/trunk/assemblies/daytrader-web-jdbc/src/main/webapp/account.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message