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 12:03:15 UTC
svn commit: r1550105 - in
/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin:
client instance karaf shell start status stop
Author: jbonofre
Date: Wed Dec 11 11:03:15 2013
New Revision: 1550105
URL: http://svn.apache.org/r1550105
Log:
[KARAF-2624] on AIX, use -Xdump:heap Java argument instead of IBM_JAVA_HEAPDUMP_TEXT=true environment variable
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client?rev=1550105&r1=1550104&r2=1550105&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client Wed Dec 11 11:03:15 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/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance?rev=1550105&r1=1550104&r2=1550105&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance Wed Dec 11 11:03:15 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/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf?rev=1550105&r1=1550104&r2=1550105&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf Wed Dec 11 11:03:15 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
}
@@ -290,7 +289,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/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell?rev=1550105&r1=1550104&r2=1550105&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell Wed Dec 11 11:03:15 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/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start?rev=1550105&r1=1550104&r2=1550105&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start Wed Dec 11 11:03:15 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/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status?rev=1550105&r1=1550104&r2=1550105&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status Wed Dec 11 11:03:15 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/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop?rev=1550105&r1=1550104&r2=1550105&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop Wed Dec 11 11:03:15 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
}