Branch: refs/heads/BZ1069545 Home: https://github.com/rhq-project/rhq Commit: 742bf8d9f53baaafa8fbeb70263174b50041d63a https://github.com/rhq-project/rhq/commit/742bf8d9f53baaafa8fbeb70263174b500... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths: M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/amps-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/dbsetup-schema.xsd M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/AbstractPlugin.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AgentPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.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/InstalledPluginsUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java
Log Message: ----------- [BZ 1076104] Agent plugins don't require explicit purge to disappear from DB.
Commit: 38941df0fa21bce48a44572698d5f2485da0ec8b https://github.com/rhq-project/rhq/commit/38941df0fa21bce48a44572698d5f2485d... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/ServerPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.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/InstalledPluginsUIBean.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/core/plugin/ServerPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java
Log Message: ----------- [BZ 1076104] Server plugins don't require explicit purge do disappear.
Commit: 2aa4cce04b0c2fa01fe6975874b597e3a9817128 https://github.com/rhq-project/rhq/commit/2aa4cce04b0c2fa01fe6975874b597e3a9... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java
Log Message: ----------- Fixing API breakage
Commit: 104f62cc5a93c4c2e36e9f676eb80768e22ff8fc https://github.com/rhq-project/rhq/commit/104f62cc5a93c4c2e36e9f676eb80768e2... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
Log Message: ----------- Cleanup of itests to not influence each other when setting server identity and manipulating plugins.
Also fixed the PluginManagerBeanTest#isPluginReadyForPurge() by realizing that other tests (that now correctly clean up after themselves) may have already deleted the plugins that were marked to be deleted in the test method the isPluginReadyForPurge depends on.
Commit: a5e6b36964b0c113ef4042edbecb459d909252f8 https://github.com/rhq-project/rhq/commit/a5e6b36964b0c113ef4042edbecb459d90... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java
Log Message: ----------- Removed unused method from local SLSB and some small docs updates.
Commit: e86ac440ba248c30a489b0fbf55d2cc7ccff456a https://github.com/rhq-project/rhq/commit/e86ac440ba248c30a489b0fbf55d2cc7cc... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-04 (Fri, 04 Apr 2014)
Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
Log Message: ----------- [BZ 1072543] Unable to collect metrics from EAP 6 datasources when a system properties is used in configuration
max-pool-size and min-pool-size metrics are now recoginzed by common code to resolve a possible expression. BaseComponent.getValues has been changed in a way, that we have more granular method called BaseComponent.getMetricValue which handles single metric request. This method returns new enum called ReadMetricResult which just represents a return code (if not Success, we may want to know logical reason why metric was not collected)
Commit: 21bb0b230d2905eb566474854c0ae2477ccf819f https://github.com/rhq-project/rhq/commit/21bb0b230d2905eb566474854c0ae2477c... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-04 (Fri, 04 Apr 2014)
Changed paths: M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java
Log Message: ----------- [BZ 1080909] DynaGroup expression evaluator is not strict when grouping by resource configuration property
Dynagroup expressions using pluginConfiguration[prop] or resourceConfiguratoin[prop] will now be matched 'strict' to property name. Strict match in means resulting SQL would be 'simple.name = :argX' instead of original 'simple.name LIKE :argX'.
Commit: 02513a8a0c8703bdb4804e31ac0ffd7ec35a2819 https://github.com/rhq-project/rhq/commit/02513a8a0c8703bdb4804e31ac0ffd7ec3... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-16 (Wed, 16 Apr 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java
Log Message: ----------- BZ 1030082 1029384 - shutdown the server if it was decommissioned (that is, its server entry was removed from the server table)
Commit: 937cb29ee5450da0bcf04d8e9952310de400e90b https://github.com/rhq-project/rhq/commit/937cb29ee5450da0bcf04d8e9952310de4... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-17 (Thu, 17 Apr 2014)
Changed paths: M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java
Log Message: ----------- [BZ 1088264] AvailabilityExecutor stops calling getAvailability() on ResourceComponent after it previously failed with exception
The issue was in handling exception comming from future. When availability check failed with exception we cought it, next run, just by calling future.get() raises the very same exception. We forgot to mark future to be rescheduled next time = setting it to null. This commit also makes exception message more verbose so we know more what happened in plugin
Commit: 94a3d1e21acd212cb05409b3f01bbea0e735597f https://github.com/rhq-project/rhq/commit/94a3d1e21acd212cb05409b3f01bbea0e7... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-17 (Thu, 17 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertHistoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeDatasource.java
Log Message: ----------- Hiding the Resource Ancestry column in {Alerts|Events} Portlets not to overwhelm user with bazillion columns. It can be shown if necessary. Also fixing a typo that caused to displayed Group Events Portlet instead of Alert Group Portlet.
Commit: 0209557a16a9fc7ddb5a55a4faa055c352ff8d32 https://github.com/rhq-project/rhq/commit/0209557a16a9fc7ddb5a55a4faa055c352... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-17 (Thu, 17 Apr 2014)
Changed paths: M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
Log Message: ----------- BZ 1080508 - make sure we set log level so the install doesn't abort
Commit: 82b9324f2de55215b86df7e11c8237cefcf767cb https://github.com/rhq-project/rhq/commit/82b9324f2de55215b86df7e11c8237cefc... Author: Mike Thompson mithomps@redhat.com Date: 2014-04-17 (Thu, 17 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/MetricGraphData.java
Log Message: ----------- [BZ 1080470] - The unit in the new d3 charts is not refreshed correctly.
Commit: 60c2a2eaa023d2dc5aa6dede632895fc4b8d0597 https://github.com/rhq-project/rhq/commit/60c2a2eaa023d2dc5aa6dede632895fc4b... Author: Mike Thompson mithomps@redhat.com Date: 2014-04-18 (Fri, 18 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/MetricGraphData.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
Log Message: ----------- [BZ 1080470] The unit in the new d3 charts is not refreshed correctly. Adjust the YAxis over to accommodate large values due to scale changes
Commit: 4cfb11460be58fb2dd22dfddc5823f957b532025 https://github.com/rhq-project/rhq/commit/4cfb11460be58fb2dd22dfddc5823f957b... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-21 (Mon, 21 Apr 2014)
Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl
Log Message: ----------- [1085270] Unable to install the RHQ server when calling rhqctl outside of bin directory A fix for OS/X support. Also, move debug_msg up to match the way it is in rhqctl.
Commit: a329de99a5bec53984cbc88a27f5e933a6fa462d https://github.com/rhq-project/rhq/commit/a329de99a5bec53984cbc88a27f5e933a6... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-21 (Mon, 21 Apr 2014)
Changed paths: M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
Log Message: ----------- BZ 1045496 - have installer be able to recover from a canceled install if its aborted while the EAR is being deployed.
Commit: 7e9ce1d0a3953248a7dcc66b2025447b1cf1a019 https://github.com/rhq-project/rhq/commit/7e9ce1d0a3953248a7dcc66b2025447b1c... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-21 (Mon, 21 Apr 2014)
Changed paths: M modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
Log Message: ----------- [798006] Drift detection hangs on reading named pipes on filesystem Protect against drift detection on not "normal" files.
Commit: 1bc99048e18daf2a848b85b6f6d1fbc75f12d040 https://github.com/rhq-project/rhq/commit/1bc99048e18daf2a848b85b6f6d1fbc75f... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-21 (Mon, 21 Apr 2014)
Changed paths: M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
Log Message: ----------- Merge branch 'master' of github.com:rhq-project/rhq
Commit: 769bb647a4f448b3a3d6fb105e20ee1f4effe2e8 https://github.com/rhq-project/rhq/commit/769bb647a4f448b3a3d6fb105e20ee1f4e... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java
Log Message: ----------- [BZ 1089789] - Login Broken for GWT Dev Mode - Fixing the new login page for GWT development mode.
Commit: 414a2a69691055be0466b18962dbdec698f57d05 https://github.com/rhq-project/rhq/commit/414a2a69691055be0466b18962dbdec698... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/DescriptorPackages.java A modules/core/client-api/src/main/resources/rhq-canned-groups.xsd M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupAddition.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupExpression.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/server/ear/pom.xml A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginAdditionsReader.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java A modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/platform/src/main/resources/META-INF/rhq-group-expressions.xml
Log Message: ----------- [BZ 1076126] - RFE: Canned dynaGroup expressions provided by plugin
Added concept of 'additional descriptor' (optional zml file living in plugin's META-INF folder side-by-side to plugin descriptor). This file is parsed only by server when plugin is discovered. Within this xml file, we currently store predefined expressions for read dynaGroup definitions. Such expressions can install dynaGroup definitions automatically. This commit contains also logic which takes care about dynaGroupDefs created using such expressions. When plugin updates such expression, dynaGroup is updated (same for delete). GroupDefinition table has now "weak" reference to expression (Plugin:ExprId)
Predefined dynaGroup expressions hardcoded in SingleGroupDefinitionView.java have been replaced by cannedExpressions provided by plugins. From user perspective, almost nothing changed, except cannedExpressions contain more than just expression string, so when user selects template/expression fields like name,description,recursive,recalcInterval are pre-populated as well.
Added 3 expressions. First groups managed servers by server-group name (deploys DG) 2nd groups managed servers by hostname (aka domain) (deploys DG) 3rd groups enabled deployments per server-groups
For expressions with 'createByDefault=true': dynagroups being created are attached to plugin (having non-null cannedExpression). Whenever this dynagroup is changed (via API or UI) it get's detached from plugin (setting cannedExpression to null). Also on plugin upgrade or first install, if we find a detached dynagroup having same name as we are about to create, we just log INFO message - this happens when DG got previously detached.
Commit: a4629adaa5b38cbc8537881a210aa0a50f934b43 https://github.com/rhq-project/rhq/commit/a4629adaa5b38cbc8537881a210aa0a50f... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
Log Message: ----------- [BZ 1076126] Update Group Definitions UI to show DGs from plugins
When listing dynaGroups we now show additional first column having an icon of user - in case of regular dyna group or plugin - in case definition comes from plugin. When user edits plugin-based definition we also warn him once he attemts to save such expression. Within this commit i18n messages for old template names has been removed.
Commit: 061e29f6f4479f93f2de1a43f9f45a7b80496035 https://github.com/rhq-project/rhq/commit/061e29f6f4479f93f2de1a43f9f45a7b80... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/dbutils/pom.xml
Log Message: ----------- bump dbversion
Commit: 4edaa3b2de2575f6fb875b428ec6db1b20afe0a9 https://github.com/rhq-project/rhq/commit/4edaa3b2de2575f6fb875b428ec6db1b20... Author: Lukas Krejci metlos@users.noreply.github.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
Log Message: ----------- Merge pull request #19 from lzoubek/bugs/1072543
[BZ 1072543] Unable to collect metrics from EAP 6 datasources when a system properties is used in configuration
Commit: 5ac07def1618f0c7aac5d6f882add38ac0452496 https://github.com/rhq-project/rhq/commit/5ac07def1618f0c7aac5d6f882add38ac0... Author: Heiko W. Rupp hwr@pilhuhn.de Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/DescriptorPackages.java A modules/core/client-api/src/main/resources/rhq-canned-groups.xsd M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupAddition.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupExpression.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties M modules/enterprise/server/ear/pom.xml A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginAdditionsReader.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java A modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/platform/src/main/resources/META-INF/rhq-group-expressions.xml
Log Message: ----------- Merge pull request #11 from lzoubek/feature/canned-expressions
Bug 1076126 - RFE: Canned dynaGroup expressions provided by plugin
Commit: 79ef6b88bb08480e301a87713d07b9c5e5858bf0 https://github.com/rhq-project/rhq/commit/79ef6b88bb08480e301a87713d07b9c5e5... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: A etc/greasemonkey/RHQ_login_monkey-before-4.11.user.js M etc/greasemonkey/RHQ_login_monkey.user.js
Log Message: ----------- Adding new {grease|tamper}monkey script for the new login page. Also adding the exclude pattern for the old one not to conflict with the new script. Now, both scripts can live together and the right one will be used with the corresponding RHQ version. Based on the fact that new login page uses "login" substring in the url.
Commit: 44960d453e647b2b47291d84a4ca324de1a2db56 https://github.com/rhq-project/rhq/commit/44960d453e647b2b47291d84a4ca324de1... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerRemote.java
Log Message: ----------- [880359] JavaDoc used for Remote API is inconsistent with API I made another pass at the remote API jdoc, ensuring that all methods have at least minimal jdoc with the correct @param, @return, @throws, @deprecated and @since (starting with RHQ 4.5) annotations.
Commit: 8eaa8885e0b01eac9d1ecfcbcdbfc543ac81f2a0 https://github.com/rhq-project/rhq/commit/8eaa8885e0b01eac9d1ecfcbcdbfc543ac... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M .classpath M .settings/org.eclipse.core.resources.prefs A etc/greasemonkey/RHQ_login_monkey-before-4.11.user.js M etc/greasemonkey/RHQ_login_monkey.user.js M etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/inventory/CreateResourceRequest.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/DescriptorPackages.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationRequest.java A modules/core/client-api/src/main/resources/rhq-canned-groups.xsd M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/java/org/rhq/core/db/Oracle12DatabaseType.java M modules/core/dbutils/src/main/scripts/dbsetup/cluster-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/pom.xml M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationUtility.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java A modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstall.java M modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java A modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/CustomAgentInstallData.java M modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupAddition.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupExpression.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java M modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java M modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java M modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java M modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java M modules/core/util/src/test/java/org/rhq/core/util/obfuscation/ObfuscatorTest.java M modules/enterprise/agent/ant-run.xml M modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.dll M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.exe M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.jar A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.dll A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.exe A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.jar M modules/enterprise/agent/src/etc/rhq-agent-wrapper.bat M modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh M modules/enterprise/agent/src/etc/rhq-agent.sh M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml M modules/enterprise/gui/coregui/pom.xml M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LinkManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AdministrationView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/agent/install/RemoteAgentInstallView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/AgentTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertHistoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/upload/FileUploadForm.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/PortletFactory.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/PortletSettingsWindow.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/RecentEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AgentGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/RemoteInstallGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeHistoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/MetricGraphData.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AgentGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/FileUploadServlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/RemoteInstallGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.css M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.min.css M modules/enterprise/gui/coregui/src/main/webapp/img/bg-login.jpg R modules/enterprise/gui/coregui/src/main/webapp/img/brand-lg.png R modules/enterprise/gui/coregui/src/main/webapp/img/brand.png R modules/enterprise/gui/coregui/src/main/webapp/img/brand.svg A modules/enterprise/gui/coregui/src/main/webapp/img/caps.png A modules/enterprise/gui/coregui/src/main/webapp/img/feedback-error-arrow-down.png A modules/enterprise/gui/coregui/src/main/webapp/img/feedback-error-sign.png M modules/enterprise/gui/coregui/src/main/webapp/img/logo.png M modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg A modules/enterprise/gui/coregui/src/main/webapp/js/bootstrap.min.js A modules/enterprise/gui/coregui/src/main/webapp/js/jquery.capslockstate.js A modules/enterprise/gui/coregui/src/main/webapp/login M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh A modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-env.bat A modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-env.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.dll A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.exe A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.jar M modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/ear/pom.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java M modules/enterprise/server/itests-2/pom.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java A modules/enterprise/server/jar/intentional-api-changes-since-4.10.0.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginAdditionsReader.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java M modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java A modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQPosixParser.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java A modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-group-expressions.xml M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java A modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as/src/main/resources/META-INF/rhq-group-expressions.xml M modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTarget.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTargetMBean.java A modules/plugins/jmx/src/test/resources/custom-test-plugin.xml A modules/plugins/platform/src/main/resources/META-INF/rhq-group-expressions.xml M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableDiscoveryComponent.java M modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml M pom.xml
Log Message: ----------- Merge remote-tracking branch 'origin/master' into bug/1076104
Commit: 4c111ac43c9b49d1ffe5ef35a307506aae6fd5d0 https://github.com/rhq-project/rhq/commit/4c111ac43c9b49d1ffe5ef35a307506aae... Author: Heiko W. Rupp hwr@pilhuhn.de Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java
Log Message: ----------- Merge pull request #16 from lzoubek/bugs/1080909
[BZ 1080909] DynaGroup expression evaluator is not strict when grouping by resource configuration property
Commit: 659c7bd0eb954f982c71cff6bd7ef33148a5da97 https://github.com/rhq-project/rhq/commit/659c7bd0eb954f982c71cff6bd7ef33148... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
Log Message: ----------- got rid of TABs
Commit: a637f1ee6a2d1cd424924d0b4350818ee6591ca8 https://github.com/rhq-project/rhq/commit/a637f1ee6a2d1cd424924d0b4350818ee6... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/amps-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/dbsetup-schema.xsd M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/AbstractPlugin.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AgentPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/ServerPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.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/InstalledPluginsUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.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/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java
Log Message: ----------- Merge branch 'bug/1076104' of https://github.com/metlos/rhq into metlos-bug/1076104
Commit: 6286a106ce898c32a3a5f60ac9d62f82f03b56d1 https://github.com/rhq-project/rhq/commit/6286a106ce898c32a3a5f60ac9d62f82f0... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java
Log Message: ----------- BZ 1076104 - remove bad import
Commit: 5283ef79ea58b21d47742863a975771ff8e8a434 https://github.com/rhq-project/rhq/commit/5283ef79ea58b21d47742863a975771ff8... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
Log Message: ----------- BZ 1076104 consistent indentation in this file is 4 spaces
Commit: a776bf09e485b31dfdc2fc305efbc7ae08416cec https://github.com/rhq-project/rhq/commit/a776bf09e485b31dfdc2fc305efbc7ae08... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh
Log Message: ----------- BZ 1089062 - get this to work on Solaris
Commit: 18f781c55fe7ca4ec3535239710305442b02f680 https://github.com/rhq-project/rhq/commit/18f781c55fe7ca4ec3535239710305442b... Author: Stefan Negrea snegrea@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: A etc/greasemonkey/RHQ_login_monkey-before-4.11.user.js M etc/greasemonkey/RHQ_login_monkey.user.js M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/DescriptorPackages.java A modules/core/client-api/src/main/resources/rhq-canned-groups.xsd M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/amps-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/dbsetup-schema.xsd M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/AbstractPlugin.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupAddition.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupExpression.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AgentPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/ServerPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertHistoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/MetricGraphData.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl M modules/enterprise/server/ear/pom.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.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/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginAdditionsReader.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java A modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-group-expressions.xml M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java A modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/platform/src/main/resources/META-INF/rhq-group-expressions.xml
Log Message: ----------- Merge branch 'master' into BZ1069545
Conflicts: modules/core/dbutils/pom.xml modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
Compare: https://github.com/rhq-project/rhq/compare/1b3f0588b744...18f781c55fe7
rhq-commits@lists.fedorahosted.org
-
Stefan Negrea