You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/06/02 04:39:24 UTC
svn commit: r1130383 [1/3] - in /geronimo/daytrader/trunk: ./
javaee6/assemblies/daytrader-ear/ javaee6/modules/core/
javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/
javaee6/modules/web/src/main/java/org/apache/geroni...
Author: violalu
Date: Thu Jun 2 02:39:22 2011
New Revision: 1130383
URL: http://svn.apache.org/viewvc?rev=1130383&view=rev
Log:
Add daytrader plugin modules first step
Added:
geronimo/daytrader/trunk/plugins/
geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/
geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/src/
geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/src/main/
geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/src/main/resources/
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/src/
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/src/main/
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/src/main/history/
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/src/main/history/dependencies.xml
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-derby-datasource/src/main/resources/
geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/
geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/src/
geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/src/main/
geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-informix-datasource/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-jetty/
geronimo/daytrader/trunk/plugins/daytrader-jetty/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-jetty/src/
geronimo/daytrader/trunk/plugins/daytrader-jetty/src/main/
geronimo/daytrader/trunk/plugins/daytrader-jetty/src/main/history/
geronimo/daytrader/trunk/plugins/daytrader-jetty/src/main/history/dependencies.xml
geronimo/daytrader/trunk/plugins/daytrader-jetty/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-jetty/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-jetty/src/main/resources/
geronimo/daytrader/trunk/plugins/daytrader-jms/
geronimo/daytrader/trunk/plugins/daytrader-jms/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-jms/src/
geronimo/daytrader/trunk/plugins/daytrader-jms/src/main/
geronimo/daytrader/trunk/plugins/daytrader-jms/src/main/history/
geronimo/daytrader/trunk/plugins/daytrader-jms/src/main/history/dependencies.xml
geronimo/daytrader/trunk/plugins/daytrader-jms/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-jms/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-jms/src/main/resources/
geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/
geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/src/
geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/src/main/
geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-mysql-datasource/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/
geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/src/
geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/src/main/
geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-oracle-datasource/src/main/resources/
geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/
geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/src/
geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/src/main/
geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/
geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/src/
geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/src/main/
geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-tomcat/
geronimo/daytrader/trunk/plugins/daytrader-tomcat/pom.xml
geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/
geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/
geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/history/
geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/history/dependencies.xml
geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/plan/
geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/plan/plan.xml
geronimo/daytrader/trunk/plugins/daytrader-tomcat/src/main/resources/
geronimo/daytrader/trunk/plugins/pom.xml
Modified:
geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml
geronimo/daytrader/trunk/javaee6/modules/core/pom.xml
geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java
geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/prims/PingServlet2JNDI.java
geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-db2-xa-plan.xml
geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-derby-xa-plan.xml
geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-informix-xa-plan.xml
geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-mysql-xa-plan.xml
geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-oracle-xa-plan.xml
geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-postgre-xa-plan.xml
geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-plan.xml
geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml
geronimo/daytrader/trunk/pom.xml
Modified: geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml (original)
+++ geronimo/daytrader/trunk/javaee6/assemblies/daytrader-ear/pom.xml Thu Jun 2 02:39:22 2011
@@ -18,23 +18,20 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.daytrader.javaee6</groupId>
- <artifactId>utils</artifactId>
- <version>${project.version}</version>
+ <artifactId>utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.javaee6</groupId>
- <artifactId>core</artifactId>
- <version>${project.version}</version>
+ <artifactId>core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.javaee6</groupId>
- <artifactId>entities</artifactId>
- <version>${project.version}</version>
+ <artifactId>entities</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.daytrader.javaee6</groupId>
<artifactId>web</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
</dependencies>
@@ -42,8 +39,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <!--<version>2.3.1</version>-->
+ <artifactId>maven-ear-plugin</artifactId>
<configuration>
<displayName>DayTrader EAR</displayName>
<description>DayTrader Stock Trading Performance Benchmark Sample</description>
Modified: geronimo/daytrader/trunk/javaee6/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/core/pom.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/core/pom.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/core/pom.xml Thu Jun 2 02:39:22 2011
@@ -25,6 +25,7 @@
<artifactId>entities</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/Beans/TradeAppJSF.java Thu Jun 2 02:39:22 2011
@@ -128,6 +128,7 @@ public class TradeAppJSF {
//Go to tradehome.jsp
FacesContext facesContext = FacesContext.getCurrentInstance();
HttpSession session = (HttpSession) facesContext.getExternalContext().getSession(true);
+
session.setAttribute("uidBean", userID);
session.setAttribute("sessionCreationDate", new java.util.Date());
setResults("Ready to Trade");
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/prims/PingServlet2JNDI.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/prims/PingServlet2JNDI.java?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/prims/PingServlet2JNDI.java (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/prims/PingServlet2JNDI.java Thu Jun 2 02:39:22 2011
@@ -42,7 +42,8 @@ public class PingServlet2JNDI extends Ht
private static String initTime;
private static int hitCount;
- private @Resource DataSource datasource;
+ //@Resource(name="jdbc/TradeDataSource")
+ private DataSource datasource;
/**
* forwards post requests to the doGet method
* Creation date: (11/6/2000 10:52:39 AM)
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml Thu Jun 2 02:39:22 2011
@@ -77,8 +77,8 @@
<error-code>500</error-code>
<location>/error.jsp</location>
</error-page>
-
- <!-- <resource-ref>
+ <!--
+ <resource-ref>
<res-ref-name>jdbc/TradeDataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
@@ -101,11 +101,11 @@
<res-type>javax.jms.TopicConnectionFactory</res-type>
<res-auth>Application</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref> -->
+ </resource-ref>
- <!--
+
<message-destination-ref>
<message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
<message-destination-type>javax.jms.Queue</message-destination-type>
Modified: geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-db2-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-db2-xa-plan.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-db2-xa-plan.xml (original)
+++ geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-db2-xa-plan.xml Thu Jun 2 02:39:22 2011
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa2</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -82,145 +82,7 @@
</module>
- <!--
- **
- ** DayTrader EJB Jar Module Definition
- **
- -->
- <module>
- <ejb>dt-ejb.jar</ejb>
- <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
- <enterprise-beans>
- <message-driven>
- <ejb-name>DTBroker3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
-
- <message-driven>
- <ejb-name>DTStreamer3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- </enterprise-beans>
-
- <!--
- **
- ** The following section can be used to override the settings in the
- ** persistence.xml file. For instance, if you choose to deploy DayTrader
- ** against a DB2 database, the DBDictionary can be specified here.
- **
- -->
-
- <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="daytrader">
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="db2" />
- <!--<property name="openjpa.jdbc.DBDictionary" value="derby" />-->
- </properties>
- </persistence-unit>
- </persistence>
- </openejb-jar>
- </module>
-
-
- <module>
- <java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- <resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">geronimo</config-property-setting>
- <config-property-setting name="Password">geronimo</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-
-
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
-
- </connector>
- </resource>
- </application-client>
- </module>
-
- <module>
- <java>wsappclient.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- </application-client>
- </module>
+
<ext-module>
<connector>TradeDataSource</connector>
Modified: geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-derby-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-derby-xa-plan.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-derby-xa-plan.xml (original)
+++ geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-derby-xa-plan.xml Thu Jun 2 02:39:22 2011
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa2</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -72,145 +72,8 @@
</port>
</service-ref>
</web-app>
- </module>
-
-
- <!--
- **
- ** DayTrader EJB Jar Module Definition
- **
- -->
- <module>
- <ejb>dt-ejb.jar</ejb>
- <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
- <enterprise-beans>
- <message-driven>
- <ejb-name>DTBroker3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- <message-driven>
- <ejb-name>DTStreamer3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- </enterprise-beans>
-
- <!--
- **
- ** The following section can be used to override the settings in the
- ** persistence.xml file. For instance, if you choose to deploy DayTrader
- ** against a DB2 database, the DBDictionary can be specified here.
- **
- -->
-
- <!--<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="daytrader">
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="db2" />
- <property name="openjpa.jdbc.DBDictionary" value="derby" />
- </properties>
- </persistence-unit>
- </persistence>-->
- </openejb-jar>
- </module>
-
-
- <module>
- <java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- <resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">geronimo</config-property-setting>
- <config-property-setting name="Password">geronimo</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
- </connector>
- </resource>
- </application-client>
- </module>
-
- <module>
- <java>wsappclient.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- </application-client>
- </module>
+ </module>
+
<ext-module>
<connector>TradeDataSource</connector>
Modified: geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-informix-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-informix-xa-plan.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-informix-xa-plan.xml (original)
+++ geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-informix-xa-plan.xml Thu Jun 2 02:39:22 2011
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa2</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -79,146 +79,6 @@
</web-app>
</module>
-
- <!--
- **
- ** DayTrader EJB Jar Module Definition
- **
- -->
- <module>
- <ejb>dt-ejb.jar</ejb>
- <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
- <enterprise-beans>
- <message-driven>
- <ejb-name>DTBroker3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
-
- <message-driven>
- <ejb-name>DTStreamer3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- </enterprise-beans>
-
- <!--
- **
- ** The following section can be used to override the settings in the
- ** persistence.xml file. For instance, if you choose to deploy DayTrader
- ** against a Informix database, the DBDictionary can be specified here.
- **
- -->
-
- <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="daytrader">
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="informix" />
- </properties>
- </persistence-unit>
- </persistence>
- </openejb-jar>
- </module>
-
-
- <module>
- <java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- <resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">geronimo</config-property-setting>
- <config-property-setting name="Password">geronimo</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-
-
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
-
- </connector>
- </resource>
- </application-client>
- </module>
-
- <module>
- <java>wsappclient.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- </application-client>
- </module>
-
<ext-module>
<connector>TradeDataSource</connector>
<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
Modified: geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-mysql-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-mysql-xa-plan.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-mysql-xa-plan.xml (original)
+++ geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-mysql-xa-plan.xml Thu Jun 2 02:39:22 2011
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa2</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -73,146 +73,6 @@
</web-app>
</module>
-
- <!--
- **
- ** DayTrader EJB Jar Module Definition
- **
- -->
- <module>
- <ejb>dt-ejb.jar</ejb>
- <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
- <enterprise-beans>
- <message-driven>
- <ejb-name>DTBroker3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
-
- <message-driven>
- <ejb-name>DTStreamer3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- </enterprise-beans>
-
- <!--
- **
- ** The following section can be used to override the settings in the
- ** persistence.xml file. For instance, if you choose to deploy DayTrader
- ** against a MySQL database, the DBDictionary can be specified here.
- **
- -->
-
- <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="daytrader">
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="mysql" />
- </properties>
- </persistence-unit>
- </persistence>
- </openejb-jar>
- </module>
-
-
- <module>
- <java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- <resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">geronimo</config-property-setting>
- <config-property-setting name="Password">geronimo</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-
-
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
-
- </connector>
- </resource>
- </application-client>
- </module>
-
- <module>
- <java>wsappclient.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- </application-client>
- </module>
-
<ext-module>
<connector>TradeDataSource</connector>
<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
Modified: geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-oracle-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-oracle-xa-plan.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-oracle-xa-plan.xml (original)
+++ geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-oracle-xa-plan.xml Thu Jun 2 02:39:22 2011
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa2</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -73,148 +73,7 @@
</port>
</service-ref>
</web-app>
- </module>
-
-
- <!--
- **
- ** DayTrader EJB Jar Module Definition
- **
- -->
- <module>
- <ejb>dt-ejb.jar</ejb>
- <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
- <enterprise-beans>
- <message-driven>
- <ejb-name>DTBroker3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
-
- <message-driven>
- <ejb-name>DTStreamer3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- </enterprise-beans>
-
- <!--
- **
- ** The following section can be used to override the settings in the
- ** persistence.xml file. For instance, if you choose to deploy DayTrader
- ** against a DB2 database, the DBDictionary can be specified here.
- **
- -->
-
- <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="daytrader">
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="oracle" />
- <!-- <property name="openjpa.jdbc.DBDictionary" value="derby" /> -->
- </properties>
- </persistence-unit>
- </persistence>
- </openejb-jar>
- </module>
-
-
- <module>
- <java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- <resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">geronimo</config-property-setting>
- <config-property-setting name="Password">geronimo</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-
-
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
-
- </connector>
- </resource>
- </application-client>
- </module>
-
- <module>
- <java>wsappclient.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- </application-client>
- </module>
+ </module>
<ext-module>
<connector>TradeDataSource</connector>
Modified: geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-postgre-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-postgre-xa-plan.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-postgre-xa-plan.xml (original)
+++ geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-postgre-xa-plan.xml Thu Jun 2 02:39:22 2011
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa2</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -71,147 +71,7 @@
</service-ref>
</web-app>
</module>
-
-
- <!--
- **
- ** DayTrader EJB Jar Module Definition
- **
- -->
- <module>
- <ejb>dt-ejb.jar</ejb>
- <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
- <enterprise-beans>
- <message-driven>
- <ejb-name>DTBroker3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
-
- <message-driven>
- <ejb-name>DTStreamer3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- </enterprise-beans>
-
- <!--
- **
- ** The following section can be used to override the settings in the
- ** persistence.xml file. For instance, if you choose to deploy DayTrader
- ** against a DB2 database, the DBDictionary can be specified here.
- **
- -->
-
- <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="daytrader">
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="postgres" />
- </properties>
- </persistence-unit>
- </persistence>
- </openejb-jar>
- </module>
-
-
- <module>
- <java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- <resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">geronimo</config-property-setting>
- <config-property-setting name="Password">geronimo</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-
-
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
-
- </connector>
- </resource>
- </application-client>
- </module>
-
- <module>
- <java>wsappclient.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- </application-client>
- </module>
-
+
<ext-module>
<connector>TradeDataSource</connector>
<!--external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
Modified: geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-plan.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-plan.xml (original)
+++ geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-plan.xml Thu Jun 2 02:39:22 2011
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa2</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -73,148 +73,7 @@
</port>
</service-ref>
</web-app>
- </module>
-
-
- <!--
- **
- ** DayTrader EJB Jar Module Definition
- **
- -->
- <module>
- <ejb>dt-ejb.jar</ejb>
- <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
- <enterprise-beans>
- <message-driven>
- <ejb-name>DTBroker3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
-
- <message-driven>
- <ejb-name>DTStreamer3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- </enterprise-beans>
-
- <!--
- **
- ** The following section can be used to override the settings in the
- ** persistence.xml file. For instance, if you choose to deploy DayTrader
- ** against a DB2 database, the DBDictionary can be specified here.
- **
- -->
-
- <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="daytrader">
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="sqlserver" />
- <!-- <property name="openjpa.jdbc.DBDictionary" value="derby" /> -->
- </properties>
- </persistence-unit>
- </persistence>
- </openejb-jar>
- </module>
-
-
- <module>
- <java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- <resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">geronimo</config-property-setting>
- <config-property-setting name="Password">geronimo</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-
-
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
-
- </connector>
- </resource>
- </application-client>
- </module>
-
- <module>
- <java>wsappclient.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- </application-client>
- </module>
+ </module>
<ext-module>
<connector>TradeDataSource</connector>
Modified: geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml?rev=1130383&r1=1130382&r2=1130383&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml (original)
+++ geronimo/daytrader/trunk/javaee6/plans/src/main/resources/daytrader-sqlserver-xa-plan.xml Thu Jun 2 02:39:22 2011
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
+ <artifactId>openjpa2</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -70,150 +70,11 @@
<port>8080</port>
<uri>/daytrader/services/TradeWSServices</uri>
</port>
- </service-ref>
+ </service-ref>
</web-app>
</module>
- <!--
- **
- ** DayTrader EJB Jar Module Definition
- **
- -->
- <module>
- <ejb>dt-ejb.jar</ejb>
- <openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
-
- <enterprise-beans>
- <message-driven>
- <ejb-name>DTBroker3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
-
- <message-driven>
- <ejb-name>DTStreamer3MDB</ejb-name>
- <resource-adapter>
- <resource-link>TradeJMSResources</resource-link>
- </resource-adapter>
- </message-driven>
- </enterprise-beans>
-
- <!--
- **
- ** The following section can be used to override the settings in the
- ** persistence.xml file. For instance, if you choose to deploy DayTrader
- ** against a MySQL database, the DBDictionary can be specified here.
- **
- -->
-
- <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
- <persistence-unit name="daytrader">
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="sqlserver" />
- </properties>
- </persistence-unit>
- </persistence>
- </openejb-jar>
- </module>
-
-
- <module>
- <java>streamer.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-streamer-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- <resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">geronimo</config-property-setting>
- <config-property-setting name="Password">geronimo</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>10</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-
-
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeStreamerTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
-
- </connector>
- </resource>
- </application-client>
- </module>
-
- <module>
- <java>wsappclient.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0">
- <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </client-environment>
- <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader-ws-client-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </moduleId>
- </server-environment>
- </application-client>
- </module>
-
<ext-module>
<connector>TradeDataSource</connector>
<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
Added: geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml?rev=1130383&view=auto
==============================================================================
--- geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml (added)
+++ geronimo/daytrader/trunk/plugins/daytrader-db2-datasource/pom.xml Thu Jun 2 02:39:22 2011
@@ -0,0 +1,173 @@
+<?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.
+-->
+
+<!-- $Rev: 1055368 $ $Date: 2011-01-05 17:24:04 +0800 (Wed, 05 Jan 2011) $ -->
+<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">
+ <parent>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>plugins</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <artifactId>daytrader-db2-datasource</artifactId>
+ <packaging>car</packaging>
+ <name>Daytrader :: Plugins :: IBM DB2 DataSource</name>
+ <description>IBM DB2 Datasource plugin for Daytrader. Requires DB2 v9.7 JCC and License files.</description>
+
+ <!--
+ You can build this datasource if you:
+ 1) have the DB2 artifacts installed in a local repo and supply the URL:
+ -Dmaven.repo.drivers=http://my.local.repo
+ 2) have a copy of the DB2 JCC driver and run the following commands :
+ mvn install:install-file -Dfile=${path to db2jcc.jar} \
+ -DgroupId=com.ibm.db2 \
+ -DartifactId=db2jcc \
+ -Dversion=9.7 \
+ -Dpackaging=jar
+
+ mvn install:install-file -Dfile=${path to db2jcc_license_cu.jar} \
+ -DgroupId=com.ibm.db2 \
+ -DartifactId=db2jcc_license_cu \
+ -Dversion=9.7 \
+ -Dpackaging=jar
+ -->
+ <properties>
+ <maven.repo.drivers>http://not.a.real.repository</maven.repo.drivers>
+ </properties>
+ <repositories>
+ <repository>
+ <id>maven.repo.drivers</id>
+ <name>Private JDBC Driver Repository</name>
+ <url>${maven.repo.drivers}</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
+ <type>rar</type>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <type>car</type>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <type>car</type>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer-1_6</artifactId>
+ <type>car</type>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!--You need to install the jdbc driver into local maven repo by self-->
+ <dependency>
+ <groupId>com.ibm.db2</groupId>
+ <artifactId>db2jcc</artifactId>
+ <version>9.7</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.db2</groupId>
+ <artifactId>db2jcc_license_cu</artifactId>
+ <version>9.7</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${connectorDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <module>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
+ <type>rar</type>
+ </module>
+ <instance>
+ <plugin-artifact>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <artifactId>daytrader-db2-datasource</artifactId>
+ </obsoletes>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ </obsoletes>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <artifactId>daytrader-informix-datasource</artifactId>
+ </obsoletes>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-informix-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <artifactId>daytrader-mysql-datasource</artifactId>
+ </obsoletes>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-mysql-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <artifactId>daytrader-oracle-datasource</artifactId>
+ </obsoletes>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <artifactId>daytrader-postgre-datasource</artifactId>
+ </obsoletes>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-postgre-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+ <artifactId>daytrader-sqlserver-datasource</artifactId>
+ </obsoletes>
+ <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car</artifact-alias>
+ </plugin-artifact>
+ </instance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>