You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/06/02 17:11:52 UTC
svn commit: r662459 - in /geronimo/samples/branches/2.1/samples: ./
CustomerService/ SampleDatasource/ customer-service/
customer-service/CustomerService-ear/
customer-service/CustomerService-ear/src/
customer-service/CustomerService-ear/src/main/ cust...
Author: jbohn
Date: Mon Jun 2 08:11:50 2008
New Revision: 662459
URL: http://svn.apache.org/viewvc?rev=662459&view=rev
Log:
merge 661872 from trunk - naming conventions 1
Added:
geronimo/samples/branches/2.1/samples/customer-service/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/pom.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/pom.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/src/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/src/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/src/main/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/src/main/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/src/main/resources/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/src/main/resources/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/src/main/resources/CustomerService.sql
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/src/main/resources/CustomerService.sql
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/src/main/resources/CustomerServicePool.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/src/main/resources/CustomerServicePool.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/src/main/resources/META-INF/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/src/main/resources/META-INF/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ear/src/main/resources/META-INF/geronimo-application.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/pom.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/pom.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/java/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/java/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/java/com/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/java/com/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/java/com/service/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/java/com/service/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/ejb/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/ejb/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/ejb/Customer.java
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/ejb/Customer.java
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionBean.java
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionBean.java
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionLocal.java
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/java/com/service/customer/ejb/ProcessCustomerSessionLocal.java
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/resources/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/resources/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/resources/META-INF/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/resources/META-INF/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/resources/META-INF/openejb-jar.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/resources/META-INF/persistence.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/resources/META-INF/persistence.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-ejb/src/main/resources/customer.properties
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-ejb/src/main/resources/customer.properties
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-jetty/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-jetty/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-jetty/pom.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-jetty/pom.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-jetty/src/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-jetty/src/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-jetty/src/main/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-jetty/src/main/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-jetty/src/main/plan/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-jetty/src/main/plan/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-jetty/src/main/plan/plan.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-jetty/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-tomcat/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-tomcat/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-tomcat/pom.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-tomcat/pom.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-tomcat/src/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-tomcat/src/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-tomcat/src/main/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-tomcat/src/main/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-tomcat/src/main/plan/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-tomcat/src/main/plan/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-tomcat/src/main/plan/plan.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/pom.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/pom.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/java/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/java/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/java/com/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/java/com/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/java/com/service/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/java/com/service/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/java/com/service/customer/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/java/com/service/customer/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/java/com/service/customer/web/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/java/com/service/customer/web/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/java/com/service/customer/web/CustomerServiceJavaBean.java
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/java/com/service/customer/web/CustomerServiceJavaBean.java
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/WEB-INF/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/WEB-INF/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/WEB-INF/geronimo-web.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/WEB-INF/web.xml
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/customers/
- copied from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/customers/
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/customers/index.jsp
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/customers/index.jsp
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/header.html
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/header.html
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/index.html
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/index.html
geronimo/samples/branches/2.1/samples/customer-service/CustomerService-war/src/main/webapp/index.jsp
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/CustomerService-war/src/main/webapp/index.jsp
geronimo/samples/branches/2.1/samples/customer-service/pom.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/customer-service/pom.xml
geronimo/samples/branches/2.1/samples/sample-datasource/
- copied from r661872, geronimo/samples/trunk/samples/sample-datasource/
geronimo/samples/branches/2.1/samples/sample-datasource/pom.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/sample-datasource/pom.xml
geronimo/samples/branches/2.1/samples/sample-datasource/src/
- copied from r661872, geronimo/samples/trunk/samples/sample-datasource/src/
geronimo/samples/branches/2.1/samples/sample-datasource/src/main/
- copied from r661872, geronimo/samples/trunk/samples/sample-datasource/src/main/
geronimo/samples/branches/2.1/samples/sample-datasource/src/main/plan/
- copied from r661872, geronimo/samples/trunk/samples/sample-datasource/src/main/plan/
geronimo/samples/branches/2.1/samples/sample-datasource/src/main/plan/plan.xml
- copied unchanged from r661872, geronimo/samples/trunk/samples/sample-datasource/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/sample-datasource/src/main/resources/
- copied from r661872, geronimo/samples/trunk/samples/sample-datasource/src/main/resources/
Removed:
geronimo/samples/branches/2.1/samples/CustomerService/
geronimo/samples/branches/2.1/samples/SampleDatasource/
Modified:
geronimo/samples/branches/2.1/samples/pom.xml
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=662459&r1=662458&r2=662459&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Mon Jun 2 08:11:50 2008
@@ -52,8 +52,8 @@
</properties>
<modules>
- <module>SampleDatasource</module>
- <module>CustomerService</module>
+ <module>sample-datasource</module>
+ <module>customer-service</module>
<module>bank</module>
<module>calculator-stateless-pojo</module>
<module>dbtester</module>