You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/11 18:17:53 UTC

svn commit: r1550194 - in /karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin: admin client shell

Author: jbonofre
Date: Wed Dec 11 17:17:52 2013
New Revision: 1550194

URL: http://svn.apache.org/r1550194
Log:
[KARAF-2624] Use -Xdump:heap Java argument instead of IBM_JAVA_HEAPDUMP_TEXT environment variable

Modified:
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin?rev=1550194&r1=1550193&r2=1550194&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin Wed Dec 11 17:17:52 2013
@@ -72,7 +72,6 @@ detectOS() {
     # For AIX, set an environment variable
     if $aix; then
          export LDR_CNTRL=MAXDATA=0xB0000000@DSA
-         export IBM_JAVA_HEAPDUMP_TEXT=true
          echo $LDR_CNTRL
     fi
 }
@@ -266,7 +265,7 @@ setupDefaults() {
         if $os400; then
             DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
         elif $aix; then
-            DEFAULT_JAVA_OPTS="-Xverify:none -Xlp $DEFAULT_JAVA_OPTS"
+            DEFAULT_JAVA_OPTS="-Xverify:none -Xdump:heap -Xlp $DEFAULT_JAVA_OPTS"
         else
             DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS"
         fi

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client?rev=1550194&r1=1550193&r2=1550194&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client Wed Dec 11 17:17:52 2013
@@ -72,7 +72,6 @@ detectOS() {
     # For AIX, set an environment variable
     if $aix; then
          export LDR_CNTRL=MAXDATA=0xB0000000@DSA
-         export IBM_JAVA_HEAPDUMP_TEXT=true
          echo $LDR_CNTRL
     fi
 }
@@ -248,7 +247,7 @@ setupDefaults() {
         if $os400; then
             DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
         elif $aix; then
-            DEFAULT_JAVA_OPTS="-Xverify:none -Xlp $DEFAULT_JAVA_OPTS"
+            DEFAULT_JAVA_OPTS="-Xverify:none -Xdump:heap -Xlp $DEFAULT_JAVA_OPTS"
         else
             DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS"
         fi

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell?rev=1550194&r1=1550193&r2=1550194&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell Wed Dec 11 17:17:52 2013
@@ -71,7 +71,6 @@ detectOS() {
     # For AIX, set an environment variable
     if $aix; then
          export LDR_CNTRL=MAXDATA=0xB0000000@DSA
-         export IBM_JAVA_HEAPDUMP_TEXT=true
          echo $LDR_CNTRL
     fi
 }
@@ -265,7 +264,7 @@ setupDefaults() {
         if $os400; then
             DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS"
         elif $aix; then
-            DEFAULT_JAVA_OPTS="-Xverify:none -Xlp $DEFAULT_JAVA_OPTS"
+            DEFAULT_JAVA_OPTS="-Xverify:none -Xdump:heap -Xlp $DEFAULT_JAVA_OPTS"
         else
             DEFAULT_JAVA_OPTS="-Xverify:none $DEFAULT_JAVA_OPTS"
         fi