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/25 08:33:49 UTC
svn commit: r957816 [1/12] - in /geronimo/samples/branches/3.0-M1: ./
samples/ samples/all-samples/all-samples-jetty/
samples/all-samples/all-samples-tomcat/ samples/daytrader/
samples/daytrader/assemblies/ samples/daytrader/assemblies/javaee/
samples/...
Author: xiaming
Date: Fri Jun 25 06:33:41 2010
New Revision: 957816
URL: http://svn.apache.org/viewvc?rev=957816&view=rev
Log:
GERONIMO-5399 sort out which works, which not, and update pom and DD files; lift sample-datasource up a level out of javaee5 category.
Added:
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-war/ (props changed)
- copied from r956773, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-web/
geronimo/samples/branches/3.0-M1/samples/sample-datasource/
geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml (with props)
geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/
geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/
geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/
geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml (with props)
geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/
geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml (with props)
Removed:
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-web/
geronimo/samples/branches/3.0-M1/samples/javaee5/sample-datasource/
Modified:
geronimo/samples/branches/3.0-M1/pom.xml
geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-war/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/dayTrader-informix-xa-plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/dayTrader-mysql-xa-plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/dayTrader-sqlserver-xa-plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/daytrader-postgre-xa-plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/modules/core/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/modules/ejb3/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/modules/entities/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/modules/json-proxy/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/modules/soap/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/modules/streamer/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/modules/web/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-db2-datasource/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-derby-datasource/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-oracle-datasource/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml
geronimo/samples/branches/3.0-M1/samples/daytrader/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/readme.txt
geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-client/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-ejb/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-war/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/bank/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/readme.txt
geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-client/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/customer/customer-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/customer/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/dbtester-war/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/dbtester/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/inventory-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/inventory/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/jaxws-calculator-war/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jaxws-calculator/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/jms-resources.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jms-mdb/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/jsp-examples-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/jsp-examples/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-realm/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/ldap-sample-app/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/myphonebook/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/mytime-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/mytime/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/sendmail/sendmail-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/servlet-examples/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/servlet-examples/servlet-examples-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/servlet-examples/servlet-examples-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/servlet-examples/servlet-examples-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/servlet-examples/servlet-examples-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee5/timereport/timereport-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/converter-javaee6/converter-javaee6-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/converter-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/cviewer-javaee6/cviewer-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/cviewer-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/ejbtimer-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java
geronimo/samples/branches/3.0-M1/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java
geronimo/samples/branches/3.0-M1/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/webapp/selectFile.jsp
geronimo/samples/branches/3.0-M1/samples/javaee6/fileupload-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jarresource-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/jpa20demo-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/restfulorder-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/3.0-M1/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/branches/3.0-M1/samples/pom.xml
Modified: geronimo/samples/branches/3.0-M1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/pom.xml Fri Jun 25 06:33:41 2010
@@ -50,6 +50,7 @@
<siteId>geronimo-samples</siteId>
<projectName>Apache Geronimo Samples</projectName>
<jetty>jetty8</jetty>
+ <tomcat>tomcat7</tomcat>
</properties>
<url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
Modified: geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -30,7 +30,6 @@
<version>3.0-M1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples</groupId>
<artifactId>all-samples-jetty</artifactId>
<name>Geronimo Samples :: all-samples :: plugin for jetty</name>
<packaging>car</packaging>
@@ -38,6 +37,7 @@
<description>Geronimo Samples. All Samples Plugin for Jetty - will install all the samples via a single plugin install</description>
<dependencies>
+ <!--Java EE 5 Samples Plugins-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sample-datasource</artifactId>
@@ -45,7 +45,7 @@
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>bank-jetty</artifactId>
<version>${version}</version>
@@ -64,7 +64,7 @@
<artifactId>customer-jetty</artifactId>
<version>${version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -80,7 +80,7 @@
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jaxws-calculator-jetty</artifactId>
<version>${version}</version>
@@ -92,7 +92,7 @@
<artifactId>jms-mdb-jetty</artifactId>
<version>${version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -108,7 +108,7 @@
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>myphonebook-jetty</artifactId>
<version>${version}</version>
@@ -120,7 +120,7 @@
<artifactId>mytime-jetty</artifactId>
<version>${version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -142,12 +142,97 @@
<version>${version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-jetty</artifactId>
<version>${version}</version>
<type>car</type>
+ </dependency>-->
+
+ <!--Java EE 6 Samples Plugins-->
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>cviewer-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>converter-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>fileupload-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
+ <!--<dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>webfragment-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jpa20demo-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>ejbtimer-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>singletonejb-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>restfulorder-javaee6-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>-->
+
+ <!--Daytrader-->
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-web-jdbc-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-web-jpa-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <!--<dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>-->
</dependencies>
<build>
Modified: geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/all-samples/all-samples-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -38,6 +38,7 @@
<description>Geronimo Samples. All Samples Plugin for Tomcat - will install all the samples via a single plugin install</description>
<dependencies>
+ <!--Java EE 5 Samples Plugins-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sample-datasource</artifactId>
@@ -52,7 +53,7 @@
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>bank-tomcat</artifactId>
<version>${version}</version>
@@ -71,7 +72,7 @@
<artifactId>customer-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -87,7 +88,7 @@
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jaxws-calculator-tomcat</artifactId>
<version>${version}</version>
@@ -99,7 +100,7 @@
<artifactId>jms-mdb-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -115,7 +116,7 @@
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>myphonebook-tomcat</artifactId>
<version>${version}</version>
@@ -127,7 +128,7 @@
<artifactId>mytime-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
@@ -149,12 +150,96 @@
<version>${version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
+ </dependency>-->
+ <!--Java EE 6 Samples Plugins-->
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>cviewer-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>converter-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>fileupload-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>webfragment-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jpa20demo-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>ejbtimer-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>singletonejb-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>restfulorder-javaee6-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>-->
+
+ <!--Daytrader-->
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-web-jdbc-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-web-jpa-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <!--<dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>-->
</dependencies>
<build>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml Fri Jun 25 06:33:41 2010
@@ -77,12 +77,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -97,21 +97,21 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml Fri Jun 25 06:33:41 2010
@@ -21,12 +21,13 @@
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>daytrader</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <artifactId>javaee</artifactId>
+ <version>3.0-M1-SNAPSHOT</version>
</parent>
+
<artifactId>dojo-ui-ear</artifactId>
- <name>DayTrader :: Dojo Interface and Proxy Ear</name>
+ <name>DayTrader :: Assemblies - Dojo Interface and Proxy Ear</name>
<packaging>ear</packaging>
<description>Daytrader EAR</description>
<scm>
@@ -36,15 +37,15 @@
</scm>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>dojo-ui-web</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <artifactId>dojo-ui-war</artifactId>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.daytrader</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
<artifactId>json-proxy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
</dependencies>
@@ -52,21 +53,20 @@
<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 Dojo UI</displayName>
<description>Dojo User Interface for Daytrader</description>
<version>5</version>
<modules>
<webModule>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>dojo-ui-web</artifactId>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <artifactId>dojo-ui-war</artifactId>
<contextRoot>/dojotrader</contextRoot>
<bundleFileName>dojo-ui.war</bundleFileName>
</webModule>
<webModule>
- <groupId>org.apache.geronimo.daytrader</groupId>
+ <groupId>org.apache.geronimo.samples.daytrader.modules</groupId>
<artifactId>json-proxy</artifactId>
<contextRoot>/daytraderProxy</contextRoot>
<bundleFileName>json-proxy.war</bundleFileName>
Propchange: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-war/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 25 06:33:41 2010
@@ -0,0 +1,3 @@
+*.iml
+target
+velocity.log
Propchange: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-war/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-war/pom.xml?rev=957816&r1=956773&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-war/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/dojo-ui-war/pom.xml Fri Jun 25 06:33:41 2010
@@ -21,12 +21,13 @@
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>daytrader</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.samples.daytrader.assemblies</groupId>
+ <artifactId>javaee</artifactId>
+ <version>3.0-M1-SNAPSHOT</version>
</parent>
- <artifactId>dojo-ui-web</artifactId>
- <name>DayTrader :: Dojo User Interface</name>
+
+ <artifactId>dojo-ui-war</artifactId>
+ <name>DayTrader :: Assemblies - Dojo User Interface</name>
<packaging>war</packaging>
<description>Daytrader Dojo UI</description>
<scm>
@@ -38,16 +39,16 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/dayTrader-informix-xa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/dayTrader-informix-xa-plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/dayTrader-informix-xa-plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/javaee/plans/dayTrader-informix-xa-plan.xml Fri Jun 25 06:33:41 2010
@@ -1,374 +1,374 @@
-<?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.
--->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <environment>
- <moduleId>
- <groupId>org.apache.geronimo.daytrader</groupId>
- <artifactId>daytrader</artifactId>
- <version>2.2-SNAPSHOT</version>
- <type>car</type>
- </moduleId>
- <!--
- **
- ** The following section describes what other modules this application has dependencies on. Since we will be
- ** accessing our tables using the internal Derby database we need the system-database dependency. Also, JPA is
- ** used as a persistence mechanism so we have a dependency on the openjpa module as well.
- **
- ** The dependency on Yoko is required but should be supplied by default. This is just silly.
- -->
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openjpa</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-corba-yoko</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>com.informix</groupId>
- <artifactId>ifxjdbc</artifactId>
- <version>3.50</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.informix</groupId>
- <artifactId>ifxjdbcx</artifactId>
- <version>3.50</version>
- <type>jar</type>
- </dependency>
- </dependencies>
- </environment>
-
- <!--
- **
- ** DayTrader Web War Module Definition
- **
- -->
- <module>
- <web>web.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
- <service-ref>
- <service-ref-name>service/Trade</service-ref-name>
- <port>
- <port-name>TradeWSServices</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/daytrader/services/TradeWSServices</uri>
- </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 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>2.1.1.2</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>2.1.1.2</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>2.1.1.2</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>2.1.1.2</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">
- <dep:groupId>org.tranql</dep:groupId>
- <dep:artifactId>tranql-connector-informix-xa</dep:artifactId>
- <dep:type>rar</dep:type>
- </external-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-
-
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jdbc/TradeDataSource</name>
- <config-property-setting name="IfxHost">localhost</config-property-setting>
- <config-property-setting name="ServerName">ol_ids_1150_1</config-property-setting>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <config-property-setting name="PortNumber">1526</config-property-setting>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="IfxSQLHostType"/>
- <config-property-setting name="IfxSQLHostFile"/>
- <config-property-setting name="IfxProtocolTrace"/>
- <config-property-setting name="IfxProtocolTraceFile"/>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>100</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- <connectiondefinition-instance>
- <name>jdbc/NoTxTradeDataSource</name>
- <config-property-setting name="IfxHost">localhost</config-property-setting>
- <config-property-setting name="ServerName">ol_ids_1150_1</config-property-setting>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <config-property-setting name="PortNumber">1526</config-property-setting>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="IfxSQLHostType"/>
- <config-property-setting name="IfxSQLHostFile"/>
- <config-property-setting name="IfxProtocolTrace"/>
- <config-property-setting name="IfxProtocolTraceFile"/>
- <connectionmanager>
- <no-transaction/>
- <single-pool>
- <max-size>10</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
- </connector>
- </ext-module>
-
-
- <ext-module>
- <connector>TradeJMS</connector>
- <external-path 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-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-
- <resourceadapter>
- <!-- how to connect to the JMS Server -->
- <resourceadapter-instance>
- <resourceadapter-name>TradeJMSResources</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
- <config-property-setting name="UserName">not needed</config-property-setting>
- <config-property-setting name="Password">not needed</config-property-setting>
- <workmanager>
- <gbean-link>DefaultWorkManager</gbean-link>
- </workmanager>
- </resourceadapter-instance>
- <!-- defines a ConnectionFactory -->
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/QueueConnectionFactory</name>
- <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>50</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>0</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jms/TopicConnectionFactory</name>
- <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>50</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>0</idle-timeout-minutes>
- <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>
-
- <adminobject>
- <adminobject-interface>javax.jms.Queue</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
- <adminobject-instance>
- <message-destination-name>jms/TradeBrokerQueue</message-destination-name>
- <config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
- </adminobject-instance>
- </adminobject>
-
- </connector>
- </ext-module>
-</application>
+<?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.
+-->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+ <environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.daytrader</groupId>
+ <artifactId>daytrader</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </moduleId>
+ <!--
+ **
+ ** The following section describes what other modules this application has dependencies on. Since we will be
+ ** accessing our tables using the internal Derby database we need the system-database dependency. Also, JPA is
+ ** used as a persistence mechanism so we have a dependency on the openjpa module as well.
+ **
+ ** The dependency on Yoko is required but should be supplied by default. This is just silly.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openjpa</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>com.informix</groupId>
+ <artifactId>ifxjdbc</artifactId>
+ <version>3.50</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.informix</groupId>
+ <artifactId>ifxjdbcx</artifactId>
+ <version>3.50</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </environment>
+
+ <!--
+ **
+ ** DayTrader Web War Module Definition
+ **
+ -->
+ <module>
+ <web>web.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <service-ref>
+ <service-ref-name>service/Trade</service-ref-name>
+ <port>
+ <port-name>TradeWSServices</port-name>
+ <protocol>http</protocol>
+ <host>localhost</host>
+ <port>8080</port>
+ <uri>/daytrader/services/TradeWSServices</uri>
+ </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 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>2.1.1.2</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>2.1.1.2</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>2.1.1.2</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>2.1.1.2</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">
+ <dep:groupId>org.tranql</dep:groupId>
+ <dep:artifactId>tranql-connector-informix-xa</dep:artifactId>
+ <dep:type>rar</dep:type>
+ </external-path>
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+
+
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jdbc/TradeDataSource</name>
+ <config-property-setting name="IfxHost">localhost</config-property-setting>
+ <config-property-setting name="ServerName">ol_ids_1150_1</config-property-setting>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <config-property-setting name="PortNumber">1526</config-property-setting>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="IfxSQLHostType"/>
+ <config-property-setting name="IfxSQLHostFile"/>
+ <config-property-setting name="IfxProtocolTrace"/>
+ <config-property-setting name="IfxProtocolTraceFile"/>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>100</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ <connectiondefinition-instance>
+ <name>jdbc/NoTxTradeDataSource</name>
+ <config-property-setting name="IfxHost">localhost</config-property-setting>
+ <config-property-setting name="ServerName">ol_ids_1150_1</config-property-setting>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <config-property-setting name="PortNumber">1526</config-property-setting>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="IfxSQLHostType"/>
+ <config-property-setting name="IfxSQLHostFile"/>
+ <config-property-setting name="IfxProtocolTrace"/>
+ <config-property-setting name="IfxProtocolTraceFile"/>
+ <connectionmanager>
+ <no-transaction/>
+ <single-pool>
+ <max-size>10</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+ </connector>
+ </ext-module>
+
+
+ <ext-module>
+ <connector>TradeJMS</connector>
+ <external-path 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-path>
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+
+ <resourceadapter>
+ <!-- how to connect to the JMS Server -->
+ <resourceadapter-instance>
+ <resourceadapter-name>TradeJMSResources</resourceadapter-name>
+ <config-property-setting name="ServerUrl">tcp://localhost:61616</config-property-setting>
+ <config-property-setting name="UserName">not needed</config-property-setting>
+ <config-property-setting name="Password">not needed</config-property-setting>
+ <workmanager>
+ <gbean-link>DefaultWorkManager</gbean-link>
+ </workmanager>
+ </resourceadapter-instance>
+ <!-- defines a ConnectionFactory -->
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jms/QueueConnectionFactory</name>
+ <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>50</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ <connection-definition>
+ <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jms/TopicConnectionFactory</name>
+ <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>50</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+ <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>
+
+ <adminobject>
+ <adminobject-interface>javax.jms.Queue</adminobject-interface>
+ <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>jms/TradeBrokerQueue</message-destination-name>
+ <config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+
+ </connector>
+ </ext-module>
+</application>