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/04/08 09:12:40 UTC

svn commit: r931799 - in /geronimo/samples/branches/2.1/samples/DataCDInfo: ./ DataCDInfo-JTA-ear/ DataCDInfo-JTA-ear/src/main/resources/ DataCDInfo-JTA-ear/src/main/resources/META-INF/ DataCDInfo-JTA-ejb/ DataCDInfo-JTA-ejb/src/main/java/org/apache/ge...

Author: xiaming
Date: Thu Apr  8 07:12:38 2010
New Revision: 931799

URL: http://svn.apache.org/viewvc?rev=931799&view=rev
Log:
DataCDInfo Sample: Fix openjpa log file absolute path issue in persistence.xml and remove redundant dependencies in plugin pom

Modified:
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml   (contents, props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml   (contents, props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml   (contents, props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java   (contents, props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java   (contents, props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml   (contents, props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/pom.xml   (props changed)
    geronimo/samples/branches/2.1/samples/DataCDInfo/readme.txt   (props changed)

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_derby.sql
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/DataCDInfo_tables_mysql.sql
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application-mysql.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/DataCDBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdmin.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoLocal.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoRemote.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml?rev=931799&r1=931798&r2=931799&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml Thu Apr  8 07:12:38 2010
@@ -19,7 +19,7 @@
   <persistence-unit name="DataCDInfoUnit" transaction-type="JTA">
     <description>DataCDInfo Persistence Unit Definition</description>
     <jta-data-source>jdbc/DataCDInfoDS</jta-data-source>
-    <non-jta-data-source>jdbc/NoTxDataCDInfoDS</non-jta-data-source>	
+    <non-jta-data-source>jdbc/NoTxDataCDInfoDS</non-jta-data-source>
     <class>org.apache.geronimo.samples.datacdinfo.beans.OwnerBean</class>
     <class>org.apache.geronimo.samples.datacdinfo.beans.DataCDBean</class>
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
@@ -27,7 +27,13 @@
       <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>       
 <!--      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
 <!--      <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>-->
-<property name="openjpa.Log" value="File=/tmp/org.apache.openjpa.log, DefaultLevel=WARN, Tool=INFO, Runtime=TRACE, SQL=TRACE"/>
+<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO, Runtime=TRACE, SQL=TRACE"/>
+    <!--As an alternative, you can use these properties if comment out non-jta-data-source setting above. -->
+    <!--<property name="openjpa.Connection2UserName" value="cdadmin"/>
+    <property name="openjpa.Connection2Password" value="passme"/>
+    <property name="openjpa.Connection2URL" value="jdbc:oracle:thin:@oracledbserver:1521:orcl2"/>
+    <property name="openjpa.Connection2DriverName" value="oracle.jdbc.driver.OracleDriver"/>-->
+
     </properties>
   </persistence-unit>
 </persistence>

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml?rev=931799&r1=931798&r2=931799&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml Thu Apr  8 07:12:38 2010
@@ -37,13 +37,7 @@
 
     <description>Geronimo Samples DataCDInfo JTA+Struts1 Plugin for Jetty</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>DataCDInfo-JTA-ear</artifactId>
-            <version>${version}</version>
-            <type>ear</type>
-        </dependency>
+    <dependencies>        
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml?rev=931799&r1=931798&r2=931799&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml Thu Apr  8 07:12:38 2010
@@ -38,13 +38,7 @@
     <description>Geronimo Samples DataCDInfo JTA+Struts1 Plugin for Tomcat</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>DataCDInfo-JTA-ear</artifactId>
-            <version>${version}</version>
-            <type>ear</type>
-        </dependency>
-        
+                
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java?rev=931799&r1=931798&r2=931799&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java Thu Apr  8 07:12:38 2010
@@ -37,6 +37,7 @@ import org.apache.geronimo.samples.datac
 public class DataCDInfoAdminServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
 
+	//@EJB(beanName="ejb/DataCDInfoAdmin")
 	@EJB
 	private DataCDInfoAdminLocal admin = null;
 

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java?rev=931799&r1=931798&r2=931799&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java Thu Apr  8 07:12:38 2010
@@ -24,6 +24,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.naming.InitialContext;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;
@@ -34,75 +39,144 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 import javax.transaction.UserTransaction;
 
+import org.apache.geronimo.samples.datacdinfo.core.MySessionBeanLocal;
+
 /**
  * Servlet implementation class ListOwnerServlet
  * 
- * This servlet demo how to use application-managed persistence context
- * to access database. Note that there must inject an UserTransaction resource
- * to manually manage transaction before using EntityManager to query database.
+ * This servlet demo how to use application-managed persistence context to
+ * access database. Note that there must inject an UserTransaction resource to
+ * manually manage transaction before using EntityManager to query database.
  */
 public class ListOwnerServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
-    
-	@PersistenceUnit(unitName="DataCDInfoUnit") 
+
+	@PersistenceUnit(unitName = "DataCDInfoUnit")
 	private EntityManagerFactory emf;
-	@Resource 
+	@Resource
 	private UserTransaction utx;
+	
+	@EJB
+	MySessionBeanLocal mysessionbean;
 
-    /**
-     * @see HttpServlet#HttpServlet()
-     */
-    public ListOwnerServlet() {
-        super();
-        // TODO Auto-generated constructor stub
-    }
+	/**
+	 * @see HttpServlet#HttpServlet()
+	 */
+	public ListOwnerServlet() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
 
 	/**
-	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
+	 *      response)
 	 */
-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	protected void doGet(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
 		// TODO Auto-generated method stub
-		service(request,response);
+		service(request, response);
 	}
 
 	/**
-	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
+	 *      response)
 	 */
-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	protected void doPost(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
 		// TODO Auto-generated method stub
-		service(request,response);
+		service(request, response);
 	}
-	
+
 	protected void service(HttpServletRequest req, HttpServletResponse res)
-	  throws ServletException, IOException {		
-		
+			throws ServletException, IOException {
+
 		List<Object[]> owners = new ArrayList<Object[]>();
-		
+
 		EntityManager em = emf.createEntityManager();
 		try {
 			utx.begin();
 			Query query = em.createNativeQuery("select * from OWNER_TABLE");
 			owners = query.getResultList();
-			utx.commit();			
-		} catch (Exception e){
+			utx.commit();
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 
 		res.setContentType("text/html");
 		PrintWriter out = res.getWriter();
-	    
-	    out.print("<html>");
-	    out.print("<head><title>Registered Owners</title></head>");
-	    out.print("<body>");	    
-
-	    for (Object[] owner : owners)
-	    {
-	      out.print(owner[0].toString() + "/" + owner[1].toString() + "<br>");
-	    }
-	    
-	    //out.print(System.getProperties());
-	    out.print("</body>");
-	    out.print("</html>");
-	  }
+
+		out.print("<html>");
+		out.print("<head><title>Registered Owners</title></head>");
+		out.print("<body>");
+
+		for (Object[] owner : owners) {
+			out.print(owner[0].toString() + "/" + owner[1].toString() + "<br>");
+		}
+
+		try {
+			// printNameSpace(out);
+			out.print("<br><br>Web container context:<br>");
+			InitialContext ctx = new InitialContext();
+			String name = "jca:";
+			printNameSpace2(out, ctx, name);
+			
+			out.print("<br><br>EJB container context:<br>");
+			mysessionbean.setOut(out);
+			mysessionbean.callPrintNameSpace("java:");
+		} catch (NamingException e) {
+			e.printStackTrace();
+		} finally {
+			out.print("</body>");
+			out.print("</html>");
+		}
+
+		// out.print(System.getProperties());
+
+	}
+
+	public void printNameSpace(PrintWriter out) throws NamingException {
+		InitialContext ctx = new InitialContext();
+		NamingEnumeration<NameClassPair> allnames = ctx.list("jca:/");
+
+		if (allnames.hasMoreElements()) {
+			int i = 0;
+			while (allnames.hasMore()) {
+				NameClassPair ncp = allnames.next();
+				out.print(++i + "--" + ncp.getName() + "=" + ncp.getClassName()
+						+ "<br>");
+				NamingEnumeration<NameClassPair> secondnames = ctx.list("jca:/"
+						+ ncp.getName());
+				if (secondnames.hasMoreElements()) {
+					int j = 0;
+					while (secondnames.hasMore()) {
+						NameClassPair ncp2 = secondnames.next();
+						out.print(i + "." + ++j + "--" + ncp2.getName()
+								+ ncp.getClassName() + "<br>");
+					}
+				}
+			}
+		} else {
+			out.print("Nothing found!<br>");
+		}
+
+	}
+
+	public void printNameSpace2(PrintWriter out, InitialContext ctx, String name)
+			throws NamingException {
+		NamingEnumeration<NameClassPair> allnames = ctx.list(name);
+
+		if (allnames.hasMoreElements()) {
+			while (allnames.hasMore()) {
+				NameClassPair ncp = allnames.next();
+				String subname = ncp.getName();
+				String subclassname = ncp.getClassName();
+				if (subclassname.endsWith("NestedWritableContext")) {
+					printNameSpace2(out, ctx, name + "/" + subname);
+				} else {
+					out.print(name + "=" + subclassname + "<br>");
+				}
+			}
+		}
+	}
 
 }

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml?rev=931799&r1=931798&r2=931799&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml Thu Apr  8 07:12:38 2010
@@ -93,4 +93,14 @@
   <security-role>      
       <role-name>superadmin</role-name>
   </security-role>
+  
+  <jav:ejb-local-ref xmlns:jav="http://java.sun.com/xml/ns/javaee">
+    <jav:ejb-ref-name>org.apache.geronimo.samples.datacdinfo.web.DataCDInfoAdminServlet/admin</jav:ejb-ref-name>
+    <jav:local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdminLocal</jav:local>
+    <jav:ejb-link>DataCDInfo-JTA-ejb.jar#ejb/DataCDInfoAdmin</jav:ejb-link>
+    <!--<jav:injection-target>
+      <jav:injection-target-class>org.apache.geronimo.samples.datacdinfo.web.DataCDInfoAdminServlet</jav:injection-target-class>
+      <jav:injection-target-name>admin</jav:injection-target-name>
+    </jav:injection-target>-->
+  </jav:ejb-local-ref>
 </web-app>

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/readme.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/readme.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/DataCDInfo/readme.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Re: svn commit: r931799 - in /geronimo/samples/branches/2.1/samples/DataCDInfo: ./ DataCDInfo-JTA-ear/ DataCDInfo-JTA-ear/src/main/resources/ DataCDInfo-JTA-ear/src/main/resources/META-INF/ DataCDInfo-JTA-ejb/ DataCDInfo-JTA-ejb/src/main/java/org/apache/ge...

Posted by Kevan Miller <ke...@gmail.com>.
On Apr 8, 2010, at 3:12 AM, xiaming@apache.org wrote:

> Author: xiaming
> Date: Thu Apr  8 07:12:38 2010
> New Revision: 931799
> 
> URL: http://svn.apache.org/viewvc?rev=931799&view=rev
> Log:
> DataCDInfo Sample: Fix openjpa log file absolute path issue in persistence.xml and remove redundant dependencies in plugin pom

Forrest,
I'm unable to build samples. Looks like there are files missing from this commit. Could you take a look?

--kevan