You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/06/30 05:56:50 UTC
svn commit: r959182 - in
/geronimo/samples/branches/3.0-M1/samples/daytrader: ./ assemblies/
assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/
assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/ bin/
Author: xiaming
Date: Wed Jun 30 03:56:49 2010
New Revision: 959182
URL: http://svn.apache.org/viewvc?rev=959182&view=rev
Log:
GERONIMO-5399 Enable daytrader-web-jpa for jboss 5
Added:
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml.jboss5
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml (with props)
Removed:
geronimo/samples/branches/3.0-M1/samples/daytrader/README.jboss
geronimo/samples/branches/3.0-M1/samples/daytrader/bin/
Modified:
geronimo/samples/branches/3.0-M1/samples/daytrader/README
geronimo/samples/branches/3.0-M1/samples/daytrader/README.jboss5
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/README
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/README
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/README?rev=959182&r1=959181&r2=959182&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/README (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/README Wed Jun 30 03:56:49 2010
@@ -1,10 +1,12 @@
-(C) Copyright 2006,2008 The Apache Software Foundation.
+(C) Copyright 2006,2010 The Apache Software Foundation.
----------------------------------------------------------------------
The code in this directory contains the code for the benchmark sample called
Day Trader. This sample was contributed by IBM to the Apache Geronimo project
under the ASF license to further functional and performance testing of Geronimo.
+Note that this is a web only release of daytrader.
+
-----------
| BUILD |
-----------
@@ -15,8 +17,12 @@ from the dayTrader root directory (the d
mvn clean install
-This will build the daytrader-jms, daytrader-derby-datasource, daytrader-jetty
-and daytrader-tomcat plugins.
+This will build these plugins:
+ daytrader-derby-datasource -- shared datasource dor other application plugins
+ daytrader-web-jdbc-jetty -- Use JDBC way to access the database, built for jetty assembly
+ daytrader-web-jdbc-tomcat -- Use JDBC way to access the database, built for tomcat assembly
+ daytrader-web-jpa-jetty -- Use application managed persistence context to access the database, built for jetty assembly
+ daytrader-web-jpa-tomcat -- Use application managed persistence context to access the database, built for tomcat assembly
-------------
@@ -25,97 +31,19 @@ and daytrader-tomcat plugins.
Plug-ins
--------
-After building daytrader, you can go to admin console to install the
-daytrader-jetty or daytrader-tomcat plugin, which will automatically install and
-use the daytrader-derby-datasource. Alternatively, you can install them
-via the "deploy/list-plugins" command, for example:
-
- gsh deploy/list-plugins -u system -w manager -r file:/<your-local-maven-repo> org.apache.geronimo.daytrader/daytrader-tomcat/2.2-SNAPSHOT/car
-
-For app clients, you'll have to install them using deploy install-plugin
-commands for now, before we publish the app client plugins on a public repo,
-for example:
-
- gsh deploy/install-plugin -u system -w manager $DAYTRADER_HOME/daytrader-tomcat/target/daytrader-ws-client-2.2-SNAPSHOT.car
- gsh deploy/install-plugin -u system -w manager $DAYTRADER_HOME/daytrader-tomcat/target/daytrader-streamer-client-2.2-SNAPSHOT.car
-
-You will need to create the database and populate the initial data into the
-database. Make sure Geronimo is started and the GERONIMO_HOME environment
-variable is defined.
-
-1. If you want to use the embedded Apache Derby database, you can populate
-tables and data by visiting http://localhost:8080/daytrader/ in your browser.
-
-2. If you want to use a DB2 database as a back-end database provider, please
-copy DB2 jdbc drivers to server's repository and then build and install the
-daytrader-db2-datasource plugin before installing the daytrader-jetty/tomcat
-plugin.
-
-3. If you want to use an Oracle database as a back-end database provider,
-please copy the ojdbc14.jar file from your oracle server to
-$GERONIMO_HOME\repository\oracle\ojdbc14\10g and rename the ojdbc14.jar to a
-maven-recognizable format like ojdbc14-10g.jar. Then build and install the
-daytrader-oracle-datasource plugin before installing the daytrader-jetty/tomcat
-plugin.
-
-
-Deployer
---------
-1. Create the sample's database tables according to your database provider:
- - If you use the embedded Apache Derby database provider, please perform the
- following steps:
- a. Ensure you have JAVA_HOME and GERONIMO_HOME environment variables set
- b. Execute these commands from a command prompt:
- cd $DAYTRADER_HOME/bin/dbscripts/derby
- createDerbyDB.[bat|sh]
- - If you use another back-end database provider, please perform the following
- steps:
- To create the database tables:
- a. Set up a database or reuse an existing database. For this sample, a
- database named "tradedb" is used.
- b. Create a user with a user name of "trade" and a password of "trade".
- Grant appropriate permissions to this user.
- c. Load the database schema for this user by running the following at a
- DBM command window:
- - For IBM DB2 Express-C and Universal Database (UDB):
- db2 connect to tradedb
- db2 -tvf bin\dbscripts\db2\Table.ddl
- - For Oracle:
- sqlplus trade/trade@tradedb @bin\dbscripts\oracle\Table.ddl
- To prep the datasource:
- a. Download your DBM's JDBC driver from an authorized source.
- b. Copy this driver to the Geronimo repository, and rename it to a
- maven-recognizable format. For example,
- - For IBM DB2 Express-C and Universal Database (UDB):
- $GERONIMO_HOME/repository/
- - For Oracle:
- $GERONIMO_HOME/repository/oracle/ojdbc14/10g/ojdbc14-10g.jar
- c. Modify the database resource adapter configuration in your XML plan
- (see below) to your database environment. For example, UserName,
- Password, PortNumber, DatabaseName, ServerName.
-
-2. Use the deployer tool to install the application:
- - Execute these commands from a command prompt:
- cd $GERONIMO_HOME/bin
- deploy.[bat|sh] deploy $DAYTRADER_HOME/modules/ear/target/daytrader-ear-2.2-SNAPSHOT.ear $DAYTRADER_HOME/plans/<My plan>
- where <My plan> is
- For Apache Derby: dayTrader-derby-plan.xml
- For IBM DB2 v9.1: dayTrader-db2-9.1-XA-plan.xml
- For Oracle: dayTrader-oracle-XA-plan.xml
- For MS SQL Server: dayTrader-sqlserver-plan.xml
-
-3. Use the admin console to install the application:
- - Under Applications -> Deploy new
- a. Select the EAR file indicated above as your archive.
- b. Select the XML file indicated above as your plan.
- c. Ensure the checkbox is selected to "start app after install".
-
+1. Log on the admin console
+2. Click plugins to add a new plugin repository url:
+ http://geronimo.apache.org/plugins/samples-3.0-M1/
+3. Choose the new-added plugin repository to list all installable plugins there
+4. Choose the proper daytrader plugin to install
+5. Click WAR applications and you will see the installed daytrader.
+6. Click the web context path and start playing with daytrader.
---------
| RUN |
---------
1. Access the dayTrader application at:
- http://<hostname>:<port>/daytrader.
+ http://<hostname>:<port>/<daytrader-web-context>.
2. Before you begin using DayTraader, theres are a couple setup steps:
- Populate the database with a set of fictional users, stocks, prices, etc.
by selecting:
@@ -127,30 +55,15 @@ Deployer
'Trading & Portfolios'
Or run the sample test scenario to verify it is installed and working:
'Configuration -> Test DayTrader Scenario'
-
-There are two optional application clients you can run, the streamer client and
-web services client. To run these (from $GERONIMO_HOME/bin):
- TradeStreamerAppClient:
- client.[bat|sh] org.apache.geronimo.daytrader/daytrader-streamer-client/2.2-SNAPSHOT/car -waitForMain
- WSAppClient:
- client.[bat|sh] org.apache.geronimo.daytrader/daytrader-ws-client/2.2-SNAPSHOT/car -waitForMain
-
+4. Run daytrader with non-derby databases
+ Now daytrader supports 7 kind of RDBMS: DB2, Oracle, Informix, SQLServer, MySQL, PostgreSQL, and Derby
+ You need to build the proper database plugins by yourself:
+ I. Update the pom.xml according to your local JDBC driver setting
+ II. Build the plugin with maven: mvn install
+ III. Install the datasource via admin console from the local repository
---------------
| UNINSTALL |
---------------
-To uninstall DayTrader, issue the following commands:
-1. If you installed DayTrader as a plugin:
- - If you installed the DayTrader :: Tomcat plugin:
- deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader-tomcat/2.2-SNAPSHOT/car
- - If you installed the DayTrader :: Jetty plugin:
- deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader-tomcat/2.2-SNAPSHOT/car
- - To remove the DayTrader :: JMS plugin (Tomcat or Jetty):
- deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader-jms/2.2-SNAPSHOT/car
- - To remove the DayTrader :: Derby DataSource (Tomcat or Jetty):
- deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader-derby-datasource/2.2-SNAPSHOT/car
-
-2. If you installed DayTrader as an application (EAR) using the deployer:
- deploy.[bat|sh] undeploy org.apache.geronimo.daytrader/daytrader/2.2-SNAPSHOT/car
-
+To uninstall DayTrader, use the admin console.
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/README.jboss5
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/README.jboss5?rev=959182&r1=959181&r2=959182&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/README.jboss5 (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/README.jboss5 Wed Jun 30 03:56:49 2010
@@ -1,33 +1,9 @@
-(C) Copyright 2009 The Apache Software Foundation.
+(C) Copyright 2009,2010 The Apache Software Foundation.
----------------------------------------------------------------------
-These are instructions for building and using daytrader with JBoss 5 standard configuration:
+These are instructions for building and using daytrader web jpa assemblies with JBoss 5 standard configuration:
-1. Create a JMS definition file "daytrader-jboss5-destinations-service.xml", and copy to
-$JBOSS_INST_HOME/server/standard/deploy/ directory. The file has the fiollowing contents:
-
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=jms/TradeStreamerTopic"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="JNDIName">TradeStreamerTopic</attribute>
- </mbean>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=jms/TradeBrokerQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- <attribute name="JNDIName">TradeBrokerQueue</attribute>
- </mbean>
-</server>
-
-
-
-
-2. Create a datasource for daytrader.
+1. Create a datasource for daytrader.
For example, If using MySQL, create a mysql database called tradedb and load it with
the derby.sql. Create a user named daytrader and grant the proper privileges as follows:
@@ -53,6 +29,20 @@ Then create a JBoss mysql datasource fil
<type-mapping>mySQL</type-mapping>
</metadata>
</local-tx-datasource>
+ <local-tx-datasource>
+ <!-- Don't change this datasource jndi name -->
+ <jndi-name>jdbc/NoTxTradeDataSource</jndi-name>
+ <connection-url>jdbc:mysql://localhost:3306/tradedb</connection-url>
+ <driver-class>com.mysql.jdbc.Driver</driver-class>
+ <user-name>daytrader</user-name>
+ <password>daytrader</password>
+ <exception-sorter-class-name>
+ org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
+ </exception-sorter-class-name>
+ <metadata>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+ </local-tx-datasource>
</datasources>
then copy to $JBOSS_INST_HOME/server/standard/deploy/ directory.
@@ -67,7 +57,17 @@ Sample of DB2 datasource:
<driver-class>com.ibm.db2.jcc.DB2Driver</driver-class>
<user-name>trade</user-name>
<password>trade</password>
- <check-valid-connection-sql>select * from sysibm.tables</check-valid-connection-sql>
+ <metadata>
+ <type-mapping>DB2</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+ <local-tx-datasource>
+ <jndi-name>jdbc/NoTxTradeDataSource</jndi-name>
+ <use-java-context>false</use-java-context>
+ <connection-url>jdbc:db2://localhost:50000/tradedb</connection-url>
+ <driver-class>com.ibm.db2.jcc.DB2Driver</driver-class>
+ <user-name>trade</user-name>
+ <password>trade</password>
<metadata>
<type-mapping>DB2</type-mapping>
</metadata>
@@ -80,7 +80,18 @@ Sample of Oracle datasource:
<local-tx-datasource>
<jndi-name>jdbc/TradeDataSource</jndi-name>
<connection-url>jdbc:oracle:thin:@localhost:1521:tradedb</connection-url>
- <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
+ <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
+ <user-name>trade</user-name>
+ <password>trade</password>
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+ <metadata>
+ <type-mapping>Oracle10g</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+ <local-tx-datasource>
+ <jndi-name>jdbc/NoTxTradeDataSource</jndi-name>
+ <connection-url>jdbc:oracle:thin:@localhost:1521:tradedb</connection-url>
+ <driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
<user-name>trade</user-name>
<password>trade</password>
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
@@ -94,84 +105,25 @@ Sample of Oracle datasource:
3. Rename these files manually:
- # $DAYTRADER_SRC_HOME/modules/ejb/src/main/resources/META-INF/persistence.xml
- --> $DAYTRADER_SRC_HOME/modules/ejb/src/main/resources/META-INF/persistence.xml.bak
-
- # $DAYTRADER_SRC_HOME/modules/ear/src/main/resources/META-INF/persistence.xml.jboss5
- --> $DAYTRADER_SRC_HOME/modules/ear/src/main/resources/META-INF/persistence.xml
+ # $DAYTRADER_SRC_HOME/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml
+ --> $DAYTRADER_SRC_HOME/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml.bak
+ # $DAYTRADER_SRC_HOME/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml.jboss5
+ --> $DAYTRADER_SRC_HOME/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml
-
-4. Use proper datasource jndi name according to your database vendor. Modify these files:
- $DAYTRADER_SRC_HOME/modules/ear/src/main/resources/META-INF/persistence.xml
- $DAYTRADER_SRC_HOME/modules/ejb/src/main/resources/META-INF/jboss.xml
- $DAYTRADER_SRC_HOME/modules/web/src/main/webapp/WEB-INF/jboss-web.xml
-
-
-5. Modify $DAYTRADER_SRC_HOME/modules/ejb/pom.xml to comment out OpenJPA PCEnhancer Ant task:
- <!--<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <path id="enhance.path.ref">
- <fileset dir="${project.build.outputDirectory}">
- <include name="**/*.class"/>
- </fileset>
- </path>
- <pathconvert property="enhance.files"
- refid="enhance.path.ref"
- pathsep=" "/>
- <java classname="org.apache.openjpa.enhance.PCEnhancer">
- <arg line="-p persistence.xml"/>
- <arg line="${enhance.files}"/>
- <classpath>
- <path refid="maven.dependency.classpath"/>
- <path refid="maven.compile.classpath"/>
- </classpath>
- </java>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>-->
+4. Use proper datasource jndi name according to your database vendor. Modify these files:
+ $DAYTRADER_SRC_HOME/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml
-
-6. Modify $DAYTRADER_SRC_HOME/modules/ear/pom.xml to comment out daytrader streamer client module
-Since not figure out how to make it work in jboss 5 :-/
-
- <!--<dependency>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer</artifactId>
- <version>${pom.version}</version>
- </dependency>-->
-
-
- <!--<javaModule>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer</artifactId>
- <bundleFileName>streamer.jar</bundleFileName>
- <includeInApplicationXml>true</includeInApplicationXml>
- </javaModule>-->
-
-
-
-7. Build it to ear ball:
+5. Build it to ear ball:
mvn clean install
-
-8. Finally, copy the $DAYTRADER_SRC_HOME/modules/ear/target/daytrader-ear-2.2-SNAPSHOT.ear
+6. Finally, copy the $DAYTRADER_SRC_HOME/assemblies/web/daytrader-web-jpa/target/daytrader-web-jpa-<version>.war
to your $JBOSS_INST_HOME/server/standard/deploy/ directory.
Good luck!
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/README
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/README?rev=959182&r1=959181&r2=959182&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/README (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/README Wed Jun 30 03:56:49 2010
@@ -1,13 +1,10 @@
-(C) Copyright 2006-2009 The Apache Software Foundation.
+(C) Copyright 2006,2010 The Apache Software Foundation.
----------------------------------------------------------------------
The assemblies have been split into two categories:
-javaee - Packaged EAR that can only be deployed to a JavaEE 5 or later
- application server, like Apache Geronimo or JBoss.
-
-web - Packaged WARs of daytrader which can be deployed on web-only containers,
- like Tomcat 6, Jetty and Geronimo Little-G.
+web-jdbc - Direct JDBC access to the database
+web-jpa - Appliaction managed persistence programming model
Plans appropriate for each environment have been included in a subdirectory
under each set of assemblies above.
Added: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml.jboss5
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml.jboss5?rev=959182&view=auto
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml.jboss5 (added)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/persistence.xml.jboss5 Wed Jun 30 03:56:49 2010
@@ -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.
+-->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+
+
+ <persistence-unit transaction-type="RESOURCE_LOCAL" name="daytrader">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <!-- If using DB2, comment out this line -->
+ <!--<jta-data-source>jdbc/TradeDataSource</jta-data-source> -->
+ <!-- If using mySQL or Oracle, comment out this line -->
+ <jta-data-source>java:jdbc/TradeDataSource</jta-data-source>
+ <non-jta-data-source>java:jdbc/NoTxTradeDataSource</non-jta-data-source>
+
+ <class>org.apache.geronimo.samples.daytrader.AccountDataBean</class>
+ <class>org.apache.geronimo.samples.daytrader.AccountProfileDataBean</class>
+ <class>org.apache.geronimo.samples.daytrader.HoldingDataBean</class>
+ <class>org.apache.geronimo.samples.daytrader.OrderDataBean</class>
+ <class>org.apache.geronimo.samples.daytrader.QuoteDataBean</class>
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+
+ <properties>
+ <!-- According to your database type, you can set dialect properly -->
+ <!--<property name="hibernate.dialect" value="org.hibernate.dialect.DB2Dialect"/>-->
+ <!--<property name="hibernate.dialect" value="org.hibernate.dialect.OracleDialect"/>-->
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect"/>
+ <!-- This Hibernate property will update database schema according to EJB3 annotation definitions
+ Possible value: validate, update, create, create-drop -->
+ <!--<property name="hibernate.hbm2ddl.auto" value="update"/>-->
+ </properties>
+ </persistence-unit>
+</persistence>
Added: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml?rev=959182&view=auto
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml (added)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml Wed Jun 30 03:56:49 2010
@@ -0,0 +1,59 @@
+<?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.
+-->
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
+<jboss-web>
+
+ <resource-ref>
+ <res-ref-name>jdbc/TradeDataSource</res-ref-name>
+ <!-- If using DB2, comment out this line -->
+ <!--<jndi-name>jdbc/TradeDataSource</jndi-name>-->
+ <!-- If using MySql or Oracle, use this line -->
+ <jndi-name>java:jdbc/TradeDataSource</jndi-name>
+ </resource-ref>
+ <resource-ref>
+ <res-ref-name>jdbc/NoTxTradeDataSource</res-ref-name>
+ <!-- If using DB2, comment out this line -->
+ <!--<jndi-name>jdbc/NoTxTradeDataSource</jndi-name>-->
+ <!-- If using MySql or Oracle, use this line -->
+ <jndi-name>java:jdbc/NoTxTradeDataSource</jndi-name>
+ </resource-ref>
+
+ <!--<resource-ref>
+ <res-ref-name>jms/QueueConnectionFactory</res-ref-name>
+ <jndi-name>ConnectionFactory</jndi-name>
+ </resource-ref>
+
+ <resource-ref>
+ <res-ref-name>jms/TopicConnectionFactory</res-ref-name>
+ <jndi-name>ConnectionFactory</jndi-name>
+ </resource-ref>
+
+ <message-destination-ref>
+ <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
+ <jndi-name>TradeBrokerQueue</jndi-name>
+ </message-destination-ref>
+
+ <message-destination-ref>
+ <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
+ <jndi-name>TradeStreamerTopic</jndi-name>
+ </message-destination-ref>-->
+
+</jboss-web>
Propchange: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml