Return-Path: 
 <scm-return-41210-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 64568 invoked from network); 8 Apr 2010 07:19:02 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 8 Apr 2010 07:19:02 -0000
Received: (qmail 69300 invoked by uid 500); 8 Apr 2010 07:19:02 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 69262 invoked by uid 500); 8 Apr 2010 07:19:02 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 69254 invoked by uid 99); 8 Apr 2010 07:19:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 07:19:01 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 07:18:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7DBCE23889CB; Thu,  8 Apr 2010 07:18:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r931802 - in
 /geronimo/samples/branches/2.2/samples/DataCDInfo:
 DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/
 DataCDInfo-JTA-ejb/src/main/resources/META-INF/ DataCDInfo-JTA-jetty/
 DataCDInfo-JTA-jetty/src/mai...
Date: Thu, 08 Apr 2010 07:18:35 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100408071835.7DBCE23889CB@eris.apache.org>

Author: xiaming
Date: Thu Apr  8 07:18:34 2010
New Revision: 931802

URL: http://svn.apache.org/viewvc?rev=931802&view=rev
Log:
DataCDInfo Sample: Fix openjpa log file absolute path issue in persistence.xml and remove author tag

Modified:
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java?rev=931802&r1=931801&r2=931802&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoJTAImpl.java Thu Apr  8 07:18:34 2010
@@ -43,9 +43,7 @@ import org.apache.geronimo.samples.datac
 import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidOwnerException;
 import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidPasswordException;
 
-/**
- * @author forrestxm
- * 
+/**
 * 
  * Demo how to use container-managed transaction-scoped persistence context with JTA transaction.
  * 
  */

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml?rev=931802&r1=931801&r2=931802&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml Thu Apr  8 07:18:34 2010
@@ -27,7 +27,7 @@
       <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"/>
     </properties>
   </persistence-unit>
 </persistence>

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml?rev=931802&r1=931801&r2=931802&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml Thu Apr  8 07:18:34 2010
@@ -32,7 +32,6 @@
 
     <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>DataCDInfo-JTA-jetty</artifactId>
-  <version>2.2</version>
     <name>Geronimo Samples :: DataCDInfo JTA + Struts1 Plugin for Jetty</name>
     <packaging>car</packaging>
 
@@ -42,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>DataCDInfo-JTA-ear</artifactId>
-            <version>2.2.1-SNAPSHOT</version>
+            <version>${version}</version>
             <type>ear</type>
         </dependency>
 

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml?rev=931802&r1=931801&r2=931802&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml Thu Apr  8 07:18:34 2010
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
-    <module-id>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>DataCDInfo-JTA-jetty</artifactId>
-        <version>2.2</version>
-        <type>car</type>
-    </module-id>
-    <dependency>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>DataCDInfo-JTA-ear</artifactId>
-        <type>ear</type>
-    </dependency>
-</plugin-artifact>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-jetty</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-ear</artifactId>
+        <type>ear</type>
+    </dependency>
+</plugin-artifact>

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml?rev=931802&r1=931801&r2=931802&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml Thu Apr  8 07:18:34 2010
@@ -1,14 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
-    <module-id>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>DataCDInfo-JTA-jetty</artifactId>
-        <version>2.2</version>
-        <type>car</type>
-    </module-id>
-    <dependency>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>DataCDInfo-war</artifactId>
-        <type>war</type>
-    </dependency>
-</plugin-artifact>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-jetty</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+</plugin-artifact>

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml?rev=931802&r1=931801&r2=931802&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml Thu Apr  8 07:18:34 2010
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
-    <module-id>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>DataCDInfo-JTA-jetty</artifactId>
-        <version>2.2</version>
-        <type>car</type>
-    </module-id>
-    <dependency>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>DataCDInfo-JTA-ear</artifactId>
-        <type>ear</type>
-    </dependency>
-</plugin-artifact>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-jetty</artifactId>
+        <version>2.2.1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-ear</artifactId>
+        <type>ear</type>
+    </dependency>
+</plugin-artifact>

Modified: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt?rev=931802&r1=931801&r2=931802&view=diff
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt (original)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt Thu Apr  8 07:18:34 2010
@@ -1,7 +1,7 @@
-local:active project artifact:
-	artifact = active project artifact:
-	artifact = active project artifact:
-	artifact = org.apache.geronimo.samples:DataCDInfo-JTA-ear:ear:2.2:compile;
-	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
-	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
-	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
+local:active project artifact:
+	artifact = active project artifact:
+	artifact = active project artifact:
+	artifact = org.apache.geronimo.samples:DataCDInfo-JTA-ear:ear:2.2.1-SNAPSHOT:compile;
+	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2.1-SNAPSHOT @ /home/forrestxm/src/gsamples2.2branch/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
+	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2.1-SNAPSHOT @ /home/forrestxm/src/gsamples2.2branch/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
+	project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2.1-SNAPSHOT @ /home/forrestxm/src/gsamples2.2branch/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml