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:18:35 UTC
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...
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