From b1708d2110d96926290a4ab3ceab201b4a476d92 Mon Sep 17 00:00:00 2001
From: Jirka Kremser <jkremser@redhat.com>
Date: Tue, 28 Apr 2015 17:14:54 +0200
Subject: [PATCH] Removing the permgen JVM options for JDK 8 and higher (Linux
 part). The warning will still be there on Windows.

---
 .../src/main/bin-resources/bin/internal/rhq-installer.sh     | 5 ++++-
 .../src/main/bin-resources/bin/internal/rhq-server.sh        | 5 ++++-
 .../main/bin-resources/bin/internal/rhq-storage-installer.sh | 5 ++++-
 .../src/main/bin-resources/bin/rhq-data-migration.sh         | 5 ++++-
 .../server/appserver/src/main/bin-resources/bin/rhqctl       | 5 ++++-
 publish.sh                                                   | 3 ++-
 release.sh                                                   | 3 ++-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh
index bffdd4fed27..a22bc09c820 100755
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh
@@ -179,7 +179,10 @@ fi
 # ----------------------------------------------------------------------
 
 if [ -z "$RHQ_SERVER_INSTALLER_JAVA_OPTS" ]; then
-   RHQ_SERVER_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+   RHQ_SERVER_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+   [[ $("$JAVA_HOME/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}') > "1.8" ]] || {
+      RHQ_SERVER_INSTALLER_JAVA_OPTS="$RHQ_SERVER_INSTALLER_JAVA_OPTS -XX:PermSize=128M -XX:MaxPermSize=128M"
+   }
 fi
 
 # Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_INSTALLER_JAVA_OPTS.
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh
index 4a732ff601e..511971c3592 100755
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh
@@ -349,7 +349,10 @@ export JAVA
 # ----------------------------------------------------------------------
 
 if [ -z "$RHQ_SERVER_JAVA_OPTS" ]; then
-   RHQ_SERVER_JAVA_OPTS="-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
+   RHQ_SERVER_JAVA_OPTS="-Xms1024M -Xmx1024M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
+   [[ $("$JAVA_HOME/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}') > "1.8" ]] || {
+      RHQ_SERVER_JAVA_OPTS="$RHQ_SERVER_JAVA_OPTS -XX:PermSize=256M -XX:MaxPermSize=256M"
+   }
 fi
 
 if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh
index e3178444583..168315dbbf4 100755
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh
@@ -179,7 +179,10 @@ fi
 # ----------------------------------------------------------------------
 
 if [ -z "$RHQ_STORAGE_INSTALLER_JAVA_OPTS" ]; then
-   RHQ_STORAGE_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+   RHQ_STORAGE_INSTALLER_JAVA_OPTS="-Xms512M -Xmx512M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+   [[ $("$JAVA_HOME/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}') > "1.8" ]] || {
+      RHQ_STORAGE_INSTALLER_JAVA_OPTS="$RHQ_STORAGE_INSTALLER_JAVA_OPTS -XX:PermSize=128M -XX:MaxPermSize=128M"
+   }
 fi
 
 # Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS.
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh
index 68306b892e4..d6097087c0c 100755
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh
@@ -181,7 +181,10 @@ fi
 # ----------------------------------------------------------------------
 
 if [ -z "$RHQ_DATA_MIGRATION_JAVA_OPTS" ]; then
-   RHQ_DATA_MIGRATION_JAVA_OPTS="-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+   RHQ_DATA_MIGRATION_JAVA_OPTS="-Xms512M -Xmx512M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+   [[ $("$JAVA_HOME/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}') > "1.8" ]] || {
+      RHQ_DATA_MIGRATION_JAVA_OPTS="$RHQ_DATA_MIGRATION_JAVA_OPTS -XX:PermSize=128M -XX:MaxPermSize=128M"
+   }
 fi
 
 # Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS.
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl
index 12406231225..f3aeb267110 100755
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl
@@ -181,7 +181,10 @@ fi
 # ----------------------------------------------------------------------
 
 if [ -z "$RHQ_CONTROL_JAVA_OPTS" ]; then
-   RHQ_CONTROL_JAVA_OPTS=" -Xmx512M -XX:MaxPermSize=128M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+   RHQ_CONTROL_JAVA_OPTS=" -Xmx512M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true"
+   [[ $("$JAVA_HOME/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}') > "1.8" ]] || {
+      RHQ_CONTROL_JAVA_OPTS="$RHQ_CONTROL_JAVA_OPTS -XX:MaxPermSize=128M"
+   }
 fi
 
 # Add the JVM opts that we always want to specify, whether or not the user set RHQ_CCM_JAVA_OPTS.
diff --git a/publish.sh b/publish.sh
index 266f1d87694..89a2f40d39f 100755
--- a/publish.sh
+++ b/publish.sh
@@ -206,7 +206,8 @@ set_local_and_environment_variables()
    print_function_information $FUNCNAME
 
    # Set various environment variables.
-   MAVEN_OPTS="-Xms512M -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M"
+   MAVEN_OPTS="-Xms512M -Xmx1024M"
+   [[ $("$JAVA_HOME/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}') > "1.8" ]] || MAVEN_OPTS="$MAVEN_OPTS -XX:PermSize=128M -XX:MaxPermSize=256M"
    export MAVEN_OPTS
 
    # Set various local variables
diff --git a/release.sh b/release.sh
index fbf39f964c5..ce2c53854a9 100755
--- a/release.sh
+++ b/release.sh
@@ -269,7 +269,8 @@ set_local_and_environment_variables()
    print_function_information $FUNCNAME
 
    # Set environment variables
-   MAVEN_OPTS="-Xms512M -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M"
+   MAVEN_OPTS="-Xms512M -Xmx1024M"
+   [[ $("$JAVA_HOME/bin/java" -version 2>&1 | awk -F '"' '/version/ {print $2}') > "1.8" ]] || MAVEN_OPTS="$MAVEN_OPTS -XX:PermSize=128M -XX:MaxPermSize=256M"
    export MAVEN_OPTS