You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/02/21 19:07:10 UTC
svn commit: r805632 - in /websites/production/openejb: ./
content/examples-trunk/webapps/rest-example/pom.xml content/jpa-concepts.html
Author: dblevins
Date: Tue Feb 21 18:07:10 2012
New Revision: 805632
Log:
Publishing merge to openejb site by dblevins
Modified:
websites/production/openejb/ (props changed)
websites/production/openejb/content/examples-trunk/webapps/rest-example/pom.xml
websites/production/openejb/content/jpa-concepts.html
Propchange: websites/production/openejb/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 21 18:07:10 2012
@@ -1 +1 @@
-1291570
+1291911
Propchange: websites/production/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 21 18:07:10 2012
@@ -1 +1 @@
-/websites/staging/openejb/trunk:790824-805583
+/websites/staging/openejb/trunk:790824-805631
Modified: websites/production/openejb/content/examples-trunk/webapps/rest-example/pom.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/webapps/rest-example/pom.xml (original)
+++ websites/production/openejb/content/examples-trunk/webapps/rest-example/pom.xml Tue Feb 21 18:07:10 2012
@@ -92,6 +92,34 @@
</webapps>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.openejb</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <artifactId>spi-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-scan-xml</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputFilename>${project.build.directory}/${project.build.finalName}/WEB-INF/org/apache/xbean/scan.xml</outputFilename>
+ </configuration>
+ <dependencies>
+ <dependency> <!-- mandatory for the scanning since we enhanced our entities -->
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency> <!-- to get the jee6 profile -->
+ <groupId>org.apache.openejb</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <artifactId>spi-helper-jee6-profile</artifactId>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
Modified: websites/production/openejb/content/jpa-concepts.html
==============================================================================
--- websites/production/openejb/content/jpa-concepts.html (original)
+++ websites/production/openejb/content/jpa-concepts.html Tue Feb 21 18:07:10 2012
@@ -161,7 +161,7 @@ Cache)</li>
PersistenceContext/Cache)</li>
</ul>
-<p>Comparing <code>EntityManager</code> and <code>EntityManagerFactory</code></p>
+<p>Comparing <code>RESOURCE_LOCAL</code> and <code>TRANSACTION</code> persistence contexts</p>
<p>With <persistence-unit transaction-type="<strong>RESOURCE_LOCAL</strong>"> <strong>you</strong> are
responsible for EntityManager (PersistenceContext/Cache) creating and