Merge remote-tracking branch 'origin/master' into feature/bz1070242-r…

…emote-agent-install

etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java

@@ -41,7 +41,7 @@ public class RhqIrcBotListener extends ListenerAdapter<RhqIrcBot> {
     private static final Pattern JIRA_PATTERN = Pattern.compile("(?i)(" + JIRA_PROJECT + "\\d{1,5})");
     private static final Pattern COMMIT_PATTERN = Pattern.compile("(?i)(\\!commit|cm)[ ]*([0-9a-f]{3,40})");
     private static final Pattern ECHO_PATTERN = Pattern.compile("(?i)echo[ ]+(.+)");
-    private static final String COMMIT_LINK = "https://git.fedorahosted.org/cgit/rhq/rhq.git/commit/?id=%s";
+    private static final String COMMIT_LINK = "https://github.com/rhq-project/rhq/commit/%s";
     private static final String PTO_LINK = "https://mail.corp.redhat.com/home/ccrouch@redhat.com/JBoss%20ON%20OOO?fmt=rss&view=day&start=0day&end=0day";
     private static final DateFormat monthFormat = new SimpleDateFormat("MMM");
     private static final DateFormat dayInMonthFormat = new SimpleDateFormat("d");

modules/core/dbutils/src/main/java/org/rhq/core/db/Oracle12DatabaseType.java

@@ -24,7 +24,7 @@
 package org.rhq.core.db;
 
 /**
- * Oracle11 database which extends the Oracle10 database.
+ * Oracle12 database which extends the Oracle10 database.
  *
  * @author John Mazzitelli
  * @author Heiko W. Rupp

modules/enterprise/agent/ant-run.xml

@@ -195,7 +195,11 @@ Ant Script that provides ways to package the Agent.
        <fileset dir="${basedir}/src/etc/java-service-wrapper/windows-x86_32" />
     </copy>
 
-    <copy todir="${agent.distro.dir}/plugins" flatten="true" overwrite="true">
+    <copy todir="${agent.distro.dir}/bin/wrapper/windows-x86_64">
+       <fileset dir="${basedir}/src/etc/java-service-wrapper/windows-x86_64" />
+    </copy>
+
+   	<copy todir="${agent.distro.dir}/plugins" flatten="true" overwrite="true">
        <fileset refid="plugins.fileset"/>
     </copy>
     <!--

modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf

@@ -70,9 +70,8 @@ wrapper.java.additional.3=-Xmx128m
 wrapper.java.additional.4=-Di18nlog.dump-stack-traces=false
 wrapper.java.additional.5=-Dsigar.nativeLogging=false
 wrapper.java.additional.6="-Djava.endorsed.dirs=%RHQ_AGENT_HOME%/lib/endorsed"
-# We use the 32-bit JSW, which requires a 32-bit JRE, which can cause issues with the default java.io.tmpdir
-# setting.  So, override the default and use a tmpdir local to the RHQ server, which we know will be accessible to the
-# service account user.
+# A 32-bit JRE can cause issues with the default java.io.tmpdir setting.  So, override the default
+# and use a tmpdir local to the RHQ server, which we know will be accessible to the service account user.
 wrapper.java.additional.7="-Djava.io.tmpdir=%RHQ_AGENT_HOME%/temp"
 
 # To use the file preferences as opposed to the registry, uncomment the next two lines.
@@ -92,7 +91,7 @@ wrapper.debug=FALSE
 # Format of output for the console.  (See docs for formats)
 wrapper.console.format=M
 
-# Log Level for console output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL)
+# Log Level for console output. (NONE,DEBUG,INFO,STATUS,ERROR,FATAL)
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging. (quotes not needed)
@@ -101,8 +100,8 @@ wrapper.logfile=%RHQ_AGENT_WRAPPER_LOG_DIR_PATH%/rhq-agent-wrapper.log
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM
 
-# Log Level for log file output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL)
-wrapper.logfile.loglevel=INFO
+# Log Level for log file output. (NONE,DEBUG,INFO,STATUS,ERROR,FATAL)
+wrapper.logfile.loglevel=STATUS
 
 # Maximum size that the log file will be allowed to grow to before
 #  the log is rolled. Size is specified in bytes.  The default value

modules/enterprise/agent/src/etc/rhq-agent-wrapper.bat

@@ -81,10 +81,18 @@ set RHQ_AGENT_WRAPPER_DIR_PATH=%RHQ_AGENT_BIN_DIR_PATH%\wrapper
 if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_WRAPPER_DIR_PATH: %RHQ_AGENT_WRAPPER_DIR_PATH%
 
 rem ----------------------------------------------------------------------
-rem The Windows OS platform name is also the wrapper subdirectory name.
+rem If this is 64 bit windows and a 64-Bit JVM then run the 64 bit wrapper,
+rem otherwise 32-bit.
 rem ----------------------------------------------------------------------
 
 set RHQ_AGENT_OS_PLATFORM=windows-x86_32
+if /I "%PROCESSOR_ARCHITECTURE:~-2%"=="64" set RHQ_AGENT_OS_PLATFORM=windows-x86_64
+if /I "%PROCESSOR_ARCHITEW6432:~-2%"=="64" set RHQ_AGENT_OS_PLATFORM=windows-x86_64
+rem For 64 bit OS, ensure it's a 64 bit JVM
+"%RHQ_JAVA_EXE_FILE_PATH%" -version 2>>&1 | findstr /I /C:"64-Bit" >>nul:
+if errorlevel 1 (
+    set RHQ_AGENT_OS_PLATFORM=windows-x86_32
+)
 if defined RHQ_AGENT_DEBUG echo RHQ_AGENT_OS_PLATFORM: %RHQ_AGENT_OS_PLATFORM%
 
 rem ----------------------------------------------------------------------

modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java

@@ -100,8 +100,21 @@ public ListGridRecord copyValues(AlertDefinition from) {
                 record.setLinkText(MSG.view_alert_definition_for_type());
             } else {
                 boolean isAutogroup = groupAlertDefinition.getGroup().getAutoGroupParentResource() != null;
-                record.setAttribute(FIELD_PARENT, (isAutogroup ? "#Resource/AutoGroup/" : "#ResourceGroup/")
-                    + groupAlertDefinition.getGroup().getId() + "/Alerts/Definitions/" + groupAlertDefinition.getId());
+                if (isAutogroup) {
+                    record.setAttribute(FIELD_PARENT, "#Resource/AutoGroup/"
+                        + groupAlertDefinition.getGroup().getId() + "/Alerts/Definitions/" + groupAlertDefinition.getId()); 
+                }
+                else {
+                    boolean isAutoCluster = groupAlertDefinition.getGroup().getClusterResourceGroup() != null;
+                    if (isAutoCluster) {
+                        record.setAttribute(FIELD_PARENT,  "#ResourceGroup/AutoCluster/"
+                            + groupAlertDefinition.getGroup().getId() + "/Alerts/Definitions/" + groupAlertDefinition.getId());
+                    }
+                    else {
+                        record.setAttribute(FIELD_PARENT, "#ResourceGroup/"
+                            + groupAlertDefinition.getGroup().getId() + "/Alerts/Definitions/" + groupAlertDefinition.getId()); 
+                    }
+                }
                 record.setLinkText(MSG.view_alert_definition_for_group());
             }
             record.setAttribute(FIELD_READONLY, (readOnly) ? MSG.common_val_yes() : MSG.common_val_no());

modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java

@@ -363,7 +363,28 @@ private void loadTreeTypes(final ClusterFlyweight root) {
 
                 public void onTypesLoaded(Map<Integer, ResourceType> types) {
                     ResourceGroupTreeView.this.typeMap = types;
-                    loadTree(root);
+                    ResourceGroupEnhancedTreeNode rootNode = loadTree(root);
+                    ResourceGroupEnhancedTreeNode selectedNode = null;
+                    if (currentGroup != null) {
+                        if (currentGroup.getClusterKey() != null) {
+                            // a child cluster node leaf was selected
+                            selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().find(
+                                ResourceGroupEnhancedTreeNode.CLUSTER_KEY, currentGroup.getClusterKey());
+                        } else {
+                            // the top root node, representing the group itself, was selected
+                            selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().findById(
+                                String.valueOf(currentGroup.getId()));
+                        }
+                    }
+                    if (selectedNode != null) {
+                        TreeNode[] parents = treeGrid.getTree().getParents(selectedNode);
+                        treeGrid.getTree().openFolders(parents);
+                        treeGrid.getTree().openFolder(selectedNode);
+                        treeGrid.selectRecord(selectedNode);
+                    } else {
+                        treeGrid.getTree().openFolder(rootNode);
+                        treeGrid.selectRecord(rootNode);
+                    }
                 }
             });
     }
@@ -394,7 +415,7 @@ private void renderAutoCluster(ResourceGroup backingGroup) {
         }
     }
 
-    private void loadTree(ClusterFlyweight root) {
+    private ResourceGroupEnhancedTreeNode loadTree(ClusterFlyweight root) {
         ClusterKey rootKey = new ClusterKey(root.getGroupId());
         ResourceGroupEnhancedTreeNode fakeRoot = new ResourceGroupEnhancedTreeNode("fakeRootNode");
         fakeRoot.setID(FAKE_ROOT_ID);
@@ -420,8 +441,7 @@ private void loadTree(ClusterFlyweight root) {
         org.rhq.coregui.client.util.TreeUtility.printTree(tree);
 
         treeGrid.setData(tree);
-        treeGrid.getTree().openFolder(rootNode);
-        treeGrid.selectRecord(rootNode);
+        return rootNode;
     }
 
     public void loadTree(ResourceGroupEnhancedTreeNode parentNode, ClusterFlyweight parentClusterGroup,

modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat

@@ -137,10 +137,18 @@ set RHQ_SERVER_WRAPPER_DIR_PATH=%RHQ_SERVER_BIN_DIR_PATH%\..\wrapper
 if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_DIR_PATH: %RHQ_SERVER_WRAPPER_DIR_PATH%
 
 rem ----------------------------------------------------------------------
-rem The Windows OS platform name is also the wrapper subdirectory name.
+rem If this is 64 bit windows and a 64-Bit JVM then run the 64 bit wrapper,
+rem otherwise 32-bit.
 rem ----------------------------------------------------------------------
 
 set RHQ_SERVER_OS_PLATFORM=windows-x86_32
+if /I "%PROCESSOR_ARCHITECTURE:~-2%"=="64" set RHQ_SERVER_OS_PLATFORM=windows-x86_64
+if /I "%PROCESSOR_ARCHITEW6432:~-2%"=="64" set RHQ_SERVER_OS_PLATFORM=windows-x86_64
+rem For 64 bit OS, ensure it's a 64 bit JVM
+"%RHQ_JAVA_EXE_FILE_PATH%" -version 2>>&1 | findstr /I /C:"64-Bit" >>nul:
+if errorlevel 1 (
+    set RHQ_SERVER_OS_PLATFORM=windows-x86_32
+)
 if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_OS_PLATFORM: %RHQ_SERVER_OS_PLATFORM%
 
 rem ----------------------------------------------------------------------

modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat

@@ -158,11 +158,19 @@ set RHQ_STORAGE_WRAPPER_DIR_PATH=%RHQ_SERVER_BIN_DIR_PATH%\..\wrapper
 if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_WRAPPER_DIR_PATH: %RHQ_STORAGE_WRAPPER_DIR_PATH%
 
 rem ----------------------------------------------------------------------
-rem The Windows OS platform name is also the wrapper subdirectory name.
+rem If this is 64 bit windows and a 64-Bit JVM then run the 64 bit wrapper,
+rem otherwise 32-bit.
 rem ----------------------------------------------------------------------
 
 set RHQ_STORAGE_OS_PLATFORM=windows-x86_32
-if defined RHQ_STORAGE_DEBUG echo RHQ_STORAGE_OS_PLATFORM: %RHQ_STORAGE_OS_PLATFORM%
+if /I "%PROCESSOR_ARCHITECTURE:~-2%"=="64" set RHQ_STORAGE_OS_PLATFORM=windows-x86_64
+if /I "%PROCESSOR_ARCHITEW6432:~-2%"=="64" set RHQ_STORAGE_OS_PLATFORM=windows-x86_64
+rem For 64 bit OS, ensure it's a 64 bit JVM
+"%RHQ_JAVA_EXE_FILE_PATH%" -version 2>>&1 | findstr /I /C:"64-Bit" >>nul:
+if errorlevel 1 (
+    set RHQ_STORAGE_OS_PLATFORM=windows-x86_32
+)
+if defined RHQ_STORAGE_DEBUG echo RHQ_V_OS_PLATFORM: %RHQ_STORAGE_OS_PLATFORM%
 
 rem ----------------------------------------------------------------------
 rem Determine the wrapper executable that this script will run.

modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf

@@ -86,20 +86,21 @@ wrapper.java.additional.19=-Djava.security.manager
 wrapper.java.additional.20="-Djava.security.policy==%RHQ_SERVER_HOME%/bin/internal/rhq-server.security-policy"
 wrapper.java.additional.21="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION=on"
 wrapper.java.additional.22="-Dorg.apache.coyote.http11.Http11Protocol.COMPRESSION_MIME_TYPES=text/javascript,text/css,text/html"
-# We use the 32-bit JSW, which requires a 32-bit JRE, which can cause issues with the default java.io.tmpdir
-# setting.  So, override the default and use a tmpdir local to the RHQ server, which we know will be accessible to the
-# service account user.
+# A 32-bit JRE can cause issues with the default java.io.tmpdir setting.  So, override the default
+# and use a tmpdir local to the RHQ server, which we know will be accessible to the service account user.
 wrapper.java.additional.23="-Djava.io.tmpdir=%RHQ_SERVER_HOME%/temp"
+# This is required to prevent logger initialization conflict between JSW and EAP (see AS7-1547)
+wrapper.java.additional.24=-Dorg.tanukisoftware.wrapper.WrapperManager.mbean=false
 
 # use these if your JVM supports it
 # - note that if you enable these you will need to update numbering in rhq-server-wrapper.inc, if it exists
-#wrapper.java.additional.24=-XX:+TieredCompilation
-#wrapper.java.additional.25=-XX:+UseCompressedOops
+#wrapper.java.additional.25=-XX:+TieredCompilation
+#wrapper.java.additional.26=-XX:+UseCompressedOops
 # Don't need these now, but this is commented out in case we need to add an endorsed dir in the future
-#wrapper.java.additional.26="-Djava.endorsed.dirs=%RHQ_SERVER_HOME%/jbossas/lib/endorsed"
+#wrapper.java.additional.27="-Djava.endorsed.dirs=%RHQ_SERVER_HOME%/jbossas/lib/endorsed"
 
 # For string interning (uncomment this out if running Java 7 or higher)
-#wrapper.java.additional.27=-XX:StringTableSize=1000003
+#wrapper.java.additional.28=-XX:StringTableSize=1000003
 
 # We want to make sure the Server starts in the JBossAS bin directory
 wrapper.working.dir=%RHQ_SERVER_HOME%/jbossas/bin
@@ -113,7 +114,7 @@ wrapper.debug=FALSE
 # Format of output for the console.  (See docs for formats)
 wrapper.console.format=M
 
-# Log Level for console output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL)
+# Log Level for console output. (NONE,DEBUG,INFO,STATUS,ERROR,FATAL)
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging. (quotes not needed)
@@ -122,8 +123,8 @@ wrapper.logfile=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%/rhq-server-wrapper.log
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM
 
-# Log Level for log file output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL)
-wrapper.logfile.loglevel=ERROR
+# Log Level for log file output. (NONE,DEBUG,INFO,STATUS,ERROR,FATAL)
+wrapper.logfile.loglevel=STATUS
 
 # Maximum size that the log file will be allowed to grow to before
 #  the log is rolled. Size is specified in bytes.  The default value

modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc

@@ -8,12 +8,12 @@
 # a strict number ordering (that continues from rhq-server-wrapper.conf)
 # and currently must start with:
 #
-# wrapper.java.additional.24=
+# wrapper.java.additional.25=
 #
 # For example, to set a non-default temp directory for Java:
 #   Note: use forward slashes for directories:
 #
-# wrapper.java.additional.24="-Djava.io.tmpdir=c:/temp"
+# wrapper.java.additional.25="-Djava.io.tmpdir=c:/temp"
 #
 #*****************************************************************************
 

modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf

@@ -94,7 +94,7 @@ wrapper.debug=FALSE
 # Format of output for the console.  (See docs for formats)
 wrapper.console.format=M
 
-# Log Level for console output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL)
+# Log Level for console output. (NONE,DEBUG,INFO,STATUS,ERROR,FATAL)
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging. (quotes not needed)
@@ -103,8 +103,8 @@ wrapper.logfile=%RHQ_STORAGE_WRAPPER_LOG_DIR_PATH%/rhq-storage-wrapper.log
 # Format of output for the log file.  (See docs for formats)
 wrapper.logfile.format=LPTM
 
-# Log Level for log file output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL)
-wrapper.logfile.loglevel=ERROR
+# Log Level for log file output. (NONE,DEBUG,INFO,STATUS,ERROR,FATAL)
+wrapper.logfile.loglevel=STATUS
 
 # Maximum size that the log file will be allowed to grow to before
 #  the log is rolled. Size is specified in bytes.  The default value

modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc

@@ -4,18 +4,18 @@
 #
 
 # reduce memory needs for dev env.
-wrapper.java.additional.23=-Xms512M
-wrapper.java.additional.24=-Xmx512M
-wrapper.java.additional.25=-XX:PermSize=200M
-wrapper.java.additional.26=-XX:MaxPermSize=200M
+wrapper.java.additional.25=-Xms512M
+wrapper.java.additional.26=-Xmx512M
+wrapper.java.additional.27=-XX:PermSize=200M
+wrapper.java.additional.28=-XX:MaxPermSize=200M
 
 # enable remote debugging
-wrapper.java.additional.27=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n
+wrapper.java.additional.29=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n
 
 # enable jprofiler
 #set.PATH=%PATH%;<jprofiler-install-dir>\bin\windows
-#wrapper.java.additional.28=-agentlib:jprofilerti=port=8849
-#wrapper.java.additional.29=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
+#wrapper.java.additional.30=-agentlib:jprofilerti=port=8849
+#wrapper.java.additional.31=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
 
 # disable JVM startup timeout
 wrapper.startup.timeout=0