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 16:07:32 UTC

svn commit: r1550166 - in /karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin: karaf start status stop

Author: jbonofre
Date: Wed Dec 11 15:07:32 2013
New Revision: 1550166

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

Modified:
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1550166&r1=1550165&r2=1550166&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf Wed Dec 11 15:07:32 2013
@@ -79,7 +79,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
 }
@@ -280,7 +279,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/distribution/unix-shell/bin/start
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start?rev=1550166&r1=1550165&r2=1550166&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start Wed Dec 11 15:07:32 2013
@@ -60,7 +60,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
 }

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status?rev=1550166&r1=1550165&r2=1550166&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status Wed Dec 11 15:07:32 2013
@@ -60,7 +60,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
 }

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop?rev=1550166&r1=1550165&r2=1550166&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop Wed Dec 11 15:07:32 2013
@@ -60,7 +60,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
 }