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:15:10 UTC
svn commit: r1550193 - in
/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main:
distribution/unix-shell/bin/ filtered-resources/bin/
Author: jbonofre
Date: Wed Dec 11 17:15:10 2013
New Revision: 1550193
URL: http://svn.apache.org/r1550193
Log:
[KARAF-2624] Use -Xdump:heap Java parameter instead of the IBM_JAVA_HEAPDUMP_TEXT environment variable
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1550193&r1=1550192&r2=1550193&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf Wed Dec 11 17:15:10 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
}
@@ -270,7 +269,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.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start?rev=1550193&r1=1550192&r2=1550193&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start Wed Dec 11 17:15:10 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.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status?rev=1550193&r1=1550192&r2=1550193&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/status Wed Dec 11 17:15:10 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.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop?rev=1550193&r1=1550192&r2=1550193&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop Wed Dec 11 17:15:10 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.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin?rev=1550193&r1=1550192&r2=1550193&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/admin Wed Dec 11 17:15:10 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
}
@@ -256,7 +255,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.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client?rev=1550193&r1=1550192&r2=1550193&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client Wed Dec 11 17:15:10 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
}
@@ -238,7 +237,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.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell?rev=1550193&r1=1550192&r2=1550193&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/shell Wed Dec 11 17:15:10 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
}
@@ -255,7 +254,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