You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2007/09/20 14:40:06 UTC

svn commit: r577720 - in /geronimo/server/trunk: configs/openjpa/ configs/openjpa/src/plan/ modules/ modules/geronimo-openjpa/ modules/geronimo-openjpa/src/ modules/geronimo-openjpa/src/main/ modules/geronimo-openjpa/src/main/java/ modules/geronimo-ope...

Author: kevan
Date: Thu Sep 20 05:40:04 2007
New Revision: 577720

URL: http://svn.apache.org/viewvc?rev=577720&view=rev
Log:
GERONIMO-3326 merge from branches/2.0. Avoids a ClassLoader memory leak by telling OpenJPA to clean up Class references

Added:
    geronimo/server/trunk/modules/geronimo-openjpa/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/
    geronimo/server/trunk/modules/geronimo-openjpa/LICENSE.txt
      - copied unchanged from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-openjpa/NOTICE.txt
      - copied unchanged from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-openjpa/pom.xml
      - copied unchanged from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/pom.xml
    geronimo/server/trunk/modules/geronimo-openjpa/src/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/
    geronimo/server/trunk/modules/geronimo-openjpa/src/main/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/main/
    geronimo/server/trunk/modules/geronimo-openjpa/src/main/java/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/main/java/
    geronimo/server/trunk/modules/geronimo-openjpa/src/main/java/org/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/main/java/org/
    geronimo/server/trunk/modules/geronimo-openjpa/src/main/java/org/apache/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/main/java/org/apache/
    geronimo/server/trunk/modules/geronimo-openjpa/src/main/java/org/apache/geronimo/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-openjpa/src/main/java/org/apache/geronimo/openjpa/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/main/java/org/apache/geronimo/openjpa/
    geronimo/server/trunk/modules/geronimo-openjpa/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java
      - copied unchanged from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/main/java/org/apache/geronimo/openjpa/ConfigurationMonitorGBean.java
    geronimo/server/trunk/modules/geronimo-openjpa/src/test/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/test/
    geronimo/server/trunk/modules/geronimo-openjpa/src/test/org/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/test/org/
    geronimo/server/trunk/modules/geronimo-openjpa/src/test/org/apache/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/test/org/apache/
    geronimo/server/trunk/modules/geronimo-openjpa/src/test/org/apache/geronimo/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/test/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-openjpa/src/test/org/apache/geronimo/openjpa/
      - copied from r562311, geronimo/server/branches/2.0/modules/geronimo-openjpa/src/test/org/apache/geronimo/openjpa/
Modified:
    geronimo/server/trunk/configs/openjpa/pom.xml
    geronimo/server/trunk/configs/openjpa/src/plan/plan.xml
    geronimo/server/trunk/modules/pom.xml

Modified: geronimo/server/trunk/configs/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/pom.xml?rev=577720&r1=577719&r2=577720&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openjpa/pom.xml (original)
+++ geronimo/server/trunk/configs/openjpa/pom.xml Thu Sep 20 05:40:04 2007
@@ -44,6 +44,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openjpa</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
         </dependency>

Modified: geronimo/server/trunk/configs/openjpa/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/src/plan/plan.xml?rev=577720&r1=577719&r2=577720&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openjpa/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openjpa/src/plan/plan.xml Thu Sep 20 05:40:04 2007
@@ -19,4 +19,5 @@
 <!-- $Rev$ $Date$ -->
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <gbean name="OpenJPAConfigurationMonitor" class="org.apache.geronimo.openjpa.ConfigurationMonitorGBean"/>
 </module>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?rev=577720&r1=577719&r2=577720&view=diff
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Thu Sep 20 05:40:04 2007
@@ -81,6 +81,7 @@
         <module>geronimo-naming-builder</module>
         <module>geronimo-openejb</module>
         <module>geronimo-openejb-builder</module>
+        <module>geronimo-openjpa</module>
         <module>geronimo-security</module>
         <module>geronimo-security-builder</module>
         <module>geronimo-service-builder</module>