You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/06/30 17:00:10 UTC
svn commit: r959342 [1/13] - in /geronimo/samples/trunk: ./ samples/
samples/all-samples/all-samples-jetty/
samples/all-samples/all-samples-tomcat/ samples/daytrader/
samples/daytrader/assemblies/ samples/daytrader/assemblies/javaee/
samples/daytrader/...
Author: xiaming
Date: Wed Jun 30 15:00:02 2010
New Revision: 959342
URL: http://svn.apache.org/viewvc?rev=959342&view=rev
Log:
Merge changes back from 3.0-M1 to trunk
Added:
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/db2/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/db2/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/db2/Table.ddl
- copied unchanged from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/db2/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/derby/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/derby/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/derby/Table.ddl
- copied unchanged from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/derby/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/informix/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/informix/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/informix/Table.ddl
- copied unchanged from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/informix/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/mysql/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/mysql/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/mysql/Table.ddl
- copied unchanged from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/mysql/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/oracle/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/oracle/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/oracle/Table.ddl
- copied unchanged from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/oracle/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/other/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/other/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/other/Table.ddl
- copied unchanged from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/other/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/postgre/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/postgre/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/postgre/Table.ddl
- copied unchanged from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/postgre/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/sqlserver/
- copied from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/sqlserver/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/sqlserver/Table.ddl
- copied unchanged from r958169, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/resources/dbscripts/sqlserver/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/META-INF/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/db2/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/db2/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/derby/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/derby/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/informix/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/informix/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/mysql/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/mysql/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/oracle/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/oracle/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/other/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/other/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/postgre/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/postgre/
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/sqlserver/
- copied from r958321, geronimo/samples/branches/3.0-M1/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/resources/dbscripts/sqlserver/
geronimo/samples/trunk/samples/osgi/aries-datasource/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/
geronimo/samples/trunk/samples/osgi/aries-datasource/pom.xml
- copied, changed from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/pom.xml
geronimo/samples/trunk/samples/osgi/aries-datasource/src/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/
geronimo/samples/trunk/samples/osgi/aries-datasource/src/main/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/
geronimo/samples/trunk/samples/osgi/aries-datasource/src/main/history/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/
geronimo/samples/trunk/samples/osgi/aries-datasource/src/main/history/dependencies.xml
- copied unchanged from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/history/dependencies.xml
geronimo/samples/trunk/samples/osgi/aries-datasource/src/main/plan/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/
geronimo/samples/trunk/samples/osgi/aries-datasource/src/main/plan/plan.xml
- copied unchanged from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/aries-datasource/src/main/plan/plan.xml
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/pom.xml
- copied unchanged from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/pom.xml
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/history/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml
- copied unchanged from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/history/dependencies.xml
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/plan/
- copied from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/
geronimo/samples/trunk/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml
- copied unchanged from r958804, geronimo/samples/branches/3.0-M1/samples/osgi/ariestrader-jdbc/src/main/plan/plan.xml
geronimo/samples/trunk/samples/sample-datasource/
- copied from r957816, geronimo/samples/branches/3.0-M1/samples/sample-datasource/
geronimo/samples/trunk/samples/sample-datasource/pom.xml
- copied, changed from r957816, geronimo/samples/branches/3.0-M1/samples/sample-datasource/pom.xml
geronimo/samples/trunk/samples/sample-datasource/src/
- copied from r957816, geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/
geronimo/samples/trunk/samples/sample-datasource/src/main/
- copied from r957816, geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/
geronimo/samples/trunk/samples/sample-datasource/src/main/history/
- copied from r957816, geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/
geronimo/samples/trunk/samples/sample-datasource/src/main/history/dependencies.xml
- copied unchanged from r957816, geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/history/dependencies.xml
geronimo/samples/trunk/samples/sample-datasource/src/main/plan/
- copied from r957816, geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/
geronimo/samples/trunk/samples/sample-datasource/src/main/plan/plan.xml
- copied unchanged from r957816, geronimo/samples/branches/3.0-M1/samples/sample-datasource/src/main/plan/plan.xml
Removed:
geronimo/samples/trunk/samples/daytrader/assemblies/javaee/dojo-ui-web/
Modified:
geronimo/samples/trunk/ (props changed)
geronimo/samples/trunk/pom.xml
geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml
geronimo/samples/trunk/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml
geronimo/samples/trunk/samples/daytrader/assemblies/javaee/plans/dayTrader-informix-xa-plan.xml
geronimo/samples/trunk/samples/daytrader/assemblies/javaee/plans/dayTrader-mysql-xa-plan.xml
geronimo/samples/trunk/samples/daytrader/assemblies/javaee/plans/dayTrader-sqlserver-xa-plan.xml
geronimo/samples/trunk/samples/daytrader/assemblies/javaee/plans/daytrader-postgre-xa-plan.xml
geronimo/samples/trunk/samples/daytrader/assemblies/javaee/pom.xml
geronimo/samples/trunk/samples/daytrader/assemblies/pom.xml
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/pom.xml
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/config.jsp
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/configure.html
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/dbscripts/db2/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/dbscripts/derby/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/dbscripts/informix/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/dbscripts/mysql/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/dbscripts/oracle/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/dbscripts/other/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/dbscripts/postgre/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jdbc/src/main/webapp/dbscripts/sqlserver/Table.ddl
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/pom.xml
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/trunk/samples/daytrader/assemblies/web/daytrader-web-jpa/src/main/webapp/WEB-INF/web.xml
geronimo/samples/trunk/samples/daytrader/modules/beans/pom.xml
geronimo/samples/trunk/samples/daytrader/modules/core/pom.xml
geronimo/samples/trunk/samples/daytrader/modules/core/src/main/java/org/apache/geronimo/samples/daytrader/core/direct/TradeJPADirect.java
geronimo/samples/trunk/samples/daytrader/modules/ejb3/pom.xml
geronimo/samples/trunk/samples/daytrader/modules/entities/pom.xml
geronimo/samples/trunk/samples/daytrader/modules/json-proxy/pom.xml
geronimo/samples/trunk/samples/daytrader/modules/soap/pom.xml
geronimo/samples/trunk/samples/daytrader/modules/streamer/pom.xml
geronimo/samples/trunk/samples/daytrader/modules/util/pom.xml
geronimo/samples/trunk/samples/daytrader/modules/web/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-db2-datasource/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-derby-datasource/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-informix-datasource/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-informix-datasource/src/main/plan/plan.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-mysql-datasource/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-mysql-datasource/src/main/plan/plan.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-oracle-datasource/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-postgre-datasource/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml
geronimo/samples/trunk/samples/daytrader/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/daytrader/plugins/pom.xml
geronimo/samples/trunk/samples/daytrader/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/ (props changed)
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml
geronimo/samples/trunk/samples/javaee5/DataCDInfo/readme.txt
geronimo/samples/trunk/samples/javaee5/app-per-port/ (props changed)
geronimo/samples/trunk/samples/javaee5/app-per-port/app-per-port-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/app-per-port/app-per-port-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/app-per-port/app-per-port-war1-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/app-per-port/pom.xml
geronimo/samples/trunk/samples/javaee5/async-http/ (props changed)
geronimo/samples/trunk/samples/javaee5/bank/ (props changed)
geronimo/samples/trunk/samples/javaee5/bank/bank-client/pom.xml
geronimo/samples/trunk/samples/javaee5/bank/bank-ejb/pom.xml
geronimo/samples/trunk/samples/javaee5/bank/bank-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/bank/bank-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/bank/bank-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/bank/bank-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/bank/bank-war/pom.xml
geronimo/samples/trunk/samples/javaee5/bank/pom.xml
geronimo/samples/trunk/samples/javaee5/calculator/ (props changed)
geronimo/samples/trunk/samples/javaee5/calculator/calculator-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/calculator/calculator-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/calculator/pom.xml
geronimo/samples/trunk/samples/javaee5/csa-activemq/ (props changed)
geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/csa-activemq/pom.xml
geronimo/samples/trunk/samples/javaee5/csa-activemq/readme.txt
geronimo/samples/trunk/samples/javaee5/customer/ (props changed)
geronimo/samples/trunk/samples/javaee5/customer/customer-client/pom.xml
geronimo/samples/trunk/samples/javaee5/customer/customer-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/customer/customer-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/customer/customer-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/customer/customer-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/customer/pom.xml
geronimo/samples/trunk/samples/javaee5/dbtester/ (props changed)
geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/pom.xml
geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp
geronimo/samples/trunk/samples/javaee5/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp
geronimo/samples/trunk/samples/javaee5/dbtester/pom.xml
geronimo/samples/trunk/samples/javaee5/inventory/ (props changed)
geronimo/samples/trunk/samples/javaee5/inventory/inventory-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/inventory/inventory-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/inventory/inventory-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/inventory/pom.xml
geronimo/samples/trunk/samples/javaee5/jaxws-calculator/ (props changed)
geronimo/samples/trunk/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/jaxws-calculator/jaxws-calculator-war/pom.xml
geronimo/samples/trunk/samples/javaee5/jaxws-calculator/pom.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/ (props changed)
geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-ear/src/main/resources/jms-resources.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/jms-mdb/pom.xml
geronimo/samples/trunk/samples/javaee5/jsp-examples/ (props changed)
geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/jsp-examples/pom.xml
geronimo/samples/trunk/samples/javaee5/ldap-sample-app/ (props changed)
geronimo/samples/trunk/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/ldap-sample-app/ldap-sample-app-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/ldap-sample-app/ldap-sample-app-realm/pom.xml
geronimo/samples/trunk/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/ldap-sample-app/ldap-sample-app-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/ldap-sample-app/pom.xml
geronimo/samples/trunk/samples/javaee5/myphonebook/ (props changed)
geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/myphonebook/myphonebook-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/myphonebook/pom.xml
geronimo/samples/trunk/samples/javaee5/mytime/ (props changed)
geronimo/samples/trunk/samples/javaee5/mytime/mytime-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/mytime/mytime-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/mytime/mytime-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/mytime/mytime-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/mytime/pom.xml
geronimo/samples/trunk/samples/javaee5/pom.xml (contents, props changed)
geronimo/samples/trunk/samples/javaee5/sample-datasource/ (props changed)
geronimo/samples/trunk/samples/javaee5/sendmail/ (props changed)
geronimo/samples/trunk/samples/javaee5/sendmail/pom.xml
geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/sendmail/sendmail-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/servlet-examples/ (props changed)
geronimo/samples/trunk/samples/javaee5/servlet-examples/pom.xml
geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/servlet-examples/servlet-examples-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/timereport/ (props changed)
geronimo/samples/trunk/samples/javaee5/timereport/pom.xml
geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/pom.xml
geronimo/samples/trunk/samples/javaee5/timereport/timereport-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee5/timereport/timereport-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/login_error.jsp
geronimo/samples/trunk/samples/javaee5/timereport/timereport-war/src/main/webapp/login/logout.jsp
geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/converter-javaee6/converter-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/converter-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/ejbtimer-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/ejbtimer-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/MessageFilter.java
geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/fileupload/showServlet.java
geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/fileupload-javaee6-war/src/main/webapp/selectFile.jsp
geronimo/samples/trunk/samples/javaee6/fileupload-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/jarresource-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/jarresource-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/jpa20demo-javaee6-war/src/main/resources/META-INF/persistence_openjpa.xml
geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/restfulorder-javaee6/restfulorder-javaee6-war/pom.xml
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/singletonejb-javaee6/singletonejb-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/pom.xml
geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/pom.xml
geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-jetty/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/pom.xml
geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-tomcat/src/main/plan/plan.xml
geronimo/samples/trunk/samples/javaee6/webfragment-javaee6/webfragment-javaee6-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/trunk/samples/osgi/pom.xml
geronimo/samples/trunk/samples/pom.xml
Propchange: geronimo/samples/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jun 30 15:00:02 2010
@@ -0,0 +1 @@
+/geronimo/samples/branches/3.0-M1:957816,958169,958321,958804,958815
Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Wed Jun 30 15:00:02 2010
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
- <artifactId>genesis-java5-flava</artifactId>
+ <artifactId>genesis-java6-flava</artifactId>
<version>2.0</version>
</parent>
@@ -42,7 +42,7 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/samples/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/samples/trunk</developerConnection>
- <url>http://svn.apache.org/repos/asf/geronimo/samples/trunk</url>
+ <url>http://svn.apache.org/viewvc/geronimo/samples/trunk</url>
</scm>
<properties>
@@ -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>
@@ -268,13 +269,22 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <debug>true</debug>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
@@ -297,19 +307,7 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <optimize>true</optimize>
- <debug>false</debug>
- <showDeprecation>false</showDeprecation>
- <showWarnings>false</showWarnings>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
Modified: geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-jetty/pom.xml Wed Jun 30 15:00:02 2010
@@ -30,7 +30,6 @@
<version>3.0-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,114 +37,207 @@
<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>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>bank-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>calculator-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>customer-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>dbtester-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>inventory-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jaxws-calculator-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jms-mdb-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jsp-examples-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>ldap-sample-app-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>myphonebook-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>mytime-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sendmail-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>servlet-examples-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>timereport-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-jetty</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>-->
+
+ <!--Java EE 6 Samples Plugins-->
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>cviewer-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>converter-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>fileupload-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>webfragment-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jpa20demo-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>ejbtimer-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>singletonejb-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>restfulorder-javaee6-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>-->
+
+ <!--Daytrader-->
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-web-jdbc-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-web-jpa-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <!--<dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-jetty</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>-->
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>aries-datasource</artifactId>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
</dependencies>
@@ -160,7 +252,7 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <category>Sample</category>
+ <category>All Samples</category>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/all-samples/all-samples-tomcat/pom.xml Wed Jun 30 15:00:02 2010
@@ -38,121 +38,213 @@
<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>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>bank-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>calculator-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>customer-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>dbtester-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>inventory-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jaxws-calculator-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jms-mdb-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>jsp-examples-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>ldap-sample-app-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>myphonebook-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>mytime-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>sendmail-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>servlet-examples-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>timereport-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-tomcat</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>-->
+ <!--Java EE 6 Samples Plugins-->
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>cviewer-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>converter-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jarresource-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>fileupload-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>webfragment-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>jpa20demo-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>ejbtimer-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>singletonejb-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>restfulorder-javaee6-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>-->
+
+ <!--Daytrader-->
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-web-jdbc-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-web-jpa-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <!--<dependency>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>-->
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>aries-datasource</artifactId>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
</dependencies>
@@ -167,7 +259,7 @@
<value>true</value>
<includeVersion>true</includeVersion>
</useMavenDependencies>
- <category>Sample</category>
+ <category>All Samples</category>
</configuration>
</plugin>
</plugins>
Modified: geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/assemblies/javaee/daytrader-war/pom.xml Wed Jun 30 15:00:02 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/trunk/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml?rev=959342&r1=959341&r2=959342&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml (original)
+++ geronimo/samples/trunk/samples/daytrader/assemblies/javaee/dojo-ui-ear/pom.xml Wed Jun 30 15:00:02 2010
@@ -21,30 +21,27 @@
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-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>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</connection>
- <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/modules/ear</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/modules/ear</url>
- </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 +49,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>