Branch: refs/heads/feature/bz1069606-rebase-eap-63 Home: https://github.com/rhq-project/rhq Commit: d3fb7a117a2f11cb16256eea9cb6ed7ded222049 https://github.com/rhq-project/rhq/commit/d3fb7a117a2f11cb16256eea9cb6ed7ded... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths: M modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-plain-navigation.xml
Log Message: ----------- [BZ 1078437] Correct the navigation in content subsystem JSF pages
The /portal prefix is only valid in the <redirect/> navigation cases because in those cases it is represented literally as the URL to go to.
In all other cases it is a logical name that wasn't affected by the move of the JSF UI to the /portal context root.
Commit: be6c299ef5703fbbda2146a11e3249dddd32c836 https://github.com/rhq-project/rhq/commit/be6c299ef5703fbbda2146a11e3249dddd... Author: Jean-Frederic Clere jfclere@redhat.com Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths: M modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java M modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java M modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- [BZ 738826] Start/Stop/Restart operation should support RPM System V init script with different service names.
Commit: faa39e42539d845d6fbbfcc857afa00b92647ed1 https://github.com/rhq-project/rhq/commit/faa39e42539d845d6fbbfcc857afa00b92... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths: M modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/AbstractPluginConfigurationUIBean.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginFactory.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/GenericServerPluginTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginManagerBean.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginManagerLocal.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginManagerRemote.java R modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java R modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java R modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSenderPluginManager.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
Log Message: ----------- [BZ 1068816] ServerPlugins -> ServerPluginManager to have consistent names
Commit: 8d1ede47c80394e9bc7a587d21c1ed6b3baf9417 https://github.com/rhq-project/rhq/commit/8d1ede47c80394e9bc7a587d21c1ed6b3b... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/GroupAlertDefinitionsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AlertTemplateGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/GroupAlertDefinitionGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AlertTemplateGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/GroupAlertDefinitionGWTServiceImpl.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBeanTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java
Log Message: ----------- [1110434] Remote AlertDefinitionManager API does not handle template or group level definitions correctly - Repair the AlertDefinitionManagerRemote API such that enable/disable/remove methods operate on any combination of template,group or resource level alert definitions. - Properly jdoc the remote API methods, and improve some locals jdoc as well - Improve the transactioning to avoid a single umbrella transaction when invoking the API on multiple group and/or template alert definitions. - Convert GUI to use the enhanced remote API methods to benefit from the transactioning improvments and to shrink the generated Async API. - Improve i-test to use remote api and ensure child, resource-level alert defs are being handled properly.
Also: - fix a problem with authz on alert template viewing. It should not require MANAGE_SETTINGS to view alert defs via getAlertDefinitionById(). - fix a long-standing bug where child alert-defs of templates or groups were not properly detached at remove-time of the parent, which could cause GUI failures when visiting the resource-level alert definitions. - remove some unused named queries from AlertDefinition
Commit: 57e5b74c7f849d509095b95d4235e98ae0695d84 https://github.com/rhq-project/rhq/commit/57e5b74c7f849d509095b95d4235e98ae0... Author: Mike Thompson mithomps@redhat.com Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
Log Message: ----------- Remove charts-4.11.css from CoreGUI.html as charts-4.12.0.css is already included.
Commit: abac7aec4676ec0394bcbce318de974f8a277157 https://github.com/rhq-project/rhq/commit/abac7aec4676ec0394bcbce318de974f8a... Author: John Mazzitelli mazz@redhat.com Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java M modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/GroupAlertDefinitionsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AlertTemplateGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/GroupAlertDefinitionGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AlertTemplateGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/GroupAlertDefinitionGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/AbstractPluginConfigurationUIBean.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginFactory.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java M modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-plain-navigation.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/GenericServerPluginTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginManagerBean.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginManagerLocal.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginManagerRemote.java R modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java R modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java R modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSenderPluginManager.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java M modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java M modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java M modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
Compare: https://github.com/rhq-project/rhq/compare/179c3065c4b6...abac7aec4676
rhq-commits@lists.fedorahosted.org
-
John Mazzitelli