tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1023160 - in /openejb/trunk/openejb3: ./ assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/ container/openejb-core/src/main/resources/ container/openejb-core/src/main/resources/META-INF/org...
Date Sat, 16 Oct 2010 00:28:18 GMT
Author: dblevins
Date: Sat Oct 16 00:28:17 2010
New Revision: 1023160

URL: http://svn.apache.org/viewvc?rev=1023160&view=rev
Log:
svn merge -r 1022392:1022393 https://svn.apache.org/repos/asf/openejb/branches/openejb-3.1.x

http://svn.apache.org/viewvc?view=revision&revision=1022393
------------------------------------------------------------------------
r1022393 | dblevins | 2010-10-14 00:15:53 -0700 (Thu, 14 Oct 2010) | 3 lines

Yanked the quotes from the 'DefaultUser "guest"' line
Took the opportunity to document the -XX:SoftRefLRUPolicyMSPerMB vm setting relating to the
GarbageCollection option

------------------------------------------------------------------------

Modified:
    openejb/trunk/openejb3/   (props changed)
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
    openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
  (props changed)
    openejb/trunk/openejb3/container/openejb-osgi/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
    openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
  (props changed)

Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:28:17 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1:779593
-/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393
 /openejb/branches/openejb-jcdi:984659-985270

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml?rev=1023160&r1=1023159&r2=1023160&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
(original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml
Sat Oct 16 00:28:17 2010
@@ -275,8 +275,19 @@
     # machine as per the rules of java.lang.ref.SoftReference and can be
     # claimed by the JVM to free memory.  Instances garbage collected
     # will have their @PreDestroy methods called during finalization.
+    #
+    # In the OpenJDK VM the -XX:SoftRefLRUPolicyMSPerMB flag can adjust
+    # how aggressively SoftReferences are collected.  The default
+    # OpenJDK setting is 1000, resulting in inactive pooled instances
+    # living one second of lifetime per free megabyte in the heap, which
+    # is very aggressive.  The setting should be increased to get the
+    # most out of the GarbageCollection feature of the pool.  Much
+    # higher settings are safe.  Even a setting as high as 3600000 (1
+    # hour per free MB in the heap) does not affect the ability for the
+    # VM to garbage collect SoftReferences in the event that memory is
+    # needed to avoid an OutOfMemoryException.
 
-    GarbageCollection = true
+    GarbageCollection = false
 
     # The frequency in which the container will sweep the pool and
     # evict expired instances.  Eviction is how the IdleTimeout,

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml?rev=1023160&r1=1023159&r2=1023160&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
Sat Oct 16 00:28:17 2010
@@ -268,8 +268,19 @@
     # machine as per the rules of java.lang.ref.SoftReference and can be
     # claimed by the JVM to free memory.  Instances garbage collected
     # will have their @PreDestroy methods called during finalization.
+    #
+    # In the OpenJDK VM the -XX:SoftRefLRUPolicyMSPerMB flag can adjust
+    # how aggressively SoftReferences are collected.  The default
+    # OpenJDK setting is 1000, resulting in inactive pooled instances
+    # living one second of lifetime per free megabyte in the heap, which
+    # is very aggressive.  The setting should be increased to get the
+    # most out of the GarbageCollection feature of the pool.  Much
+    # higher settings are safe.  Even a setting as high as 3600000 (1
+    # hour per free MB in the heap) does not affect the ability for the
+    # VM to garbage collect SoftReferences in the event that memory is
+    # needed to avoid an OutOfMemoryException.
 
-    GarbageCollection = true
+    GarbageCollection = false
 
     # The frequency in which the container will sweep the pool and
     # evict expired instances.  Eviction is how the IdleTimeout,
@@ -460,7 +471,7 @@
           types="SecurityService"
           class-name="org.apache.openejb.core.security.SecurityServiceImpl">
   
-    DefaultUser "guest"         
+    DefaultUser guest         
   </ServiceProvider>
 
   <ServiceProvider

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=1023160&r1=1023159&r2=1023160&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Sat Oct 16 00:28:17 2010
@@ -270,8 +270,19 @@
     # machine as per the rules of java.lang.ref.SoftReference and can be
     # claimed by the JVM to free memory.  Instances garbage collected
     # will have their @PreDestroy methods called during finalization.
-    
-    GarbageCollection = true
+    #
+    # In the OpenJDK VM the -XX:SoftRefLRUPolicyMSPerMB flag can adjust
+    # how aggressively SoftReferences are collected.  The default
+    # OpenJDK setting is 1000, resulting in inactive pooled instances
+    # living one second of lifetime per free megabyte in the heap, which
+    # is very aggressive.  The setting should be increased to get the
+    # most out of the GarbageCollection feature of the pool.  Much
+    # higher settings are safe.  Even a setting as high as 3600000 (1
+    # hour per free MB in the heap) does not affect the ability for the
+    # VM to garbage collect SoftReferences in the event that memory is
+    # needed to avoid an OutOfMemoryException.
+
+    GarbageCollection = false
 
     # The frequency in which the container will sweep the pool and
     # evict expired instances.  Eviction is how the IdleTimeout,
@@ -469,7 +480,7 @@
           types="SecurityService"
           class-name="org.apache.openejb.core.security.SecurityServiceImpl">
   
-    DefaultUser "guest"         
+    DefaultUser guest         
   </ServiceProvider>
 
   <ServiceProvider

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf?rev=1023160&r1=1023159&r2=1023160&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
Sat Oct 16 00:28:17 2010
@@ -133,15 +133,6 @@
 
   IdleTimeout = 0 minutes
 
-  # Allows Garbage Collection to be used as a mechanism for shrinking
-  # the pool.  When set to true all instances in the pool, excluding
-  # the minimum, are eligible for garbage collection by the virtual
-  # machine as per the rules of java.lang.ref.SoftReference and can be
-  # claimed by the JVM to free memory.  Instances garbage collected
-  # will have their @PreDestroy methods called during finalization.
-
-  GarbageCollection = true
-
 </Container>
 
 

Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:28:17 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
-/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375
+/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393
 /openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270

Modified: openejb/trunk/openejb3/container/openejb-osgi/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-osgi/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=1023160&r1=1023159&r2=1023160&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-osgi/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
(original)
+++ openejb/trunk/openejb3/container/openejb-osgi/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Sat Oct 16 00:28:17 2010
@@ -270,8 +270,19 @@
     # machine as per the rules of java.lang.ref.SoftReference and can be
     # claimed by the JVM to free memory.  Instances garbage collected
     # will have their @PreDestroy methods called during finalization.
-
-    GarbageCollection = true
+    #
+    # In the OpenJDK VM the -XX:SoftRefLRUPolicyMSPerMB flag can adjust
+    # how aggressively SoftReferences are collected.  The default
+    # OpenJDK setting is 1000, resulting in inactive pooled instances
+    # living one second of lifetime per free megabyte in the heap, which
+    # is very aggressive.  The setting should be increased to get the
+    # most out of the GarbageCollection feature of the pool.  Much
+    # higher settings are safe.  Even a setting as high as 3600000 (1
+    # hour per free MB in the heap) does not affect the ability for the
+    # VM to garbage collect SoftReferences in the event that memory is
+    # needed to avoid an OutOfMemoryException.
+    
+    GarbageCollection = false
 
     # The frequency in which the container will sweep the pool and
     # evict expired instances.  Eviction is how the IdleTimeout,

Propchange: openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 16 00:28:17 2010
@@ -1,3 +1,3 @@
 /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
-/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375
+/openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393
 /openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270



Mime
View raw message