Branch: refs/heads/release/jon3.3.x
Home:
https://github.com/rhq-project/rhq
Commit: 4d775e8a3fd8ffa3d82a0ecaadbd39171030bc07
https://github.com/rhq-project/rhq/commit/4d775e8a3fd8ffa3d82a0ecaadbd391...
Author: Ruben Vargas <ruben.vp8510(a)gmail.com>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
Log Message:
-----------
Silence warning for system properties PARTITION_EVENT_PURGE and
RESOURCE_CONFIG_HISTORY_PURGE
Commit: b2995817202f87caca7f4cd351f6c3f9143ed497
https://github.com/rhq-project/rhq/commit/b2995817202f87caca7f4cd351f6c3f...
Author: Josejulio Martínez <jmartine(a)redhat.com>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ConditionEditor.java
Log Message:
-----------
Bug 1318747 - Loads the current unit when editing.
It was loading the unit of the first available entry and not taking into account the one
being edited.
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ConditionEditor.java
Commit: b0e2a73c2c16ea784a2337b0ca34a28bba50f2a8
https://github.com/rhq-project/rhq/commit/b0e2a73c2c16ea784a2337b0ca34a28...
Author: jshaughn <jshaughn(a)jshaughn-fedora.fios-router.home>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java
M
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
M
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.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/configuration/ConfigurationManagerBean.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginManagerBean.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/metadata/ResourceMetadataManagerBean.java
Log Message:
-----------
Bug 1323332 - Orphaned configuration left in database
We knew from observation that drift-related configs were being orphaned in
the DB. Running some i-tests showed backing configs for drift definitions
being orphaned. This addresses a few different causes:
- improper use of EntityManager.getReference()
- This method is basically an optimized version of EntityManager.find(),
with the difference being that it is not required to go to the DB, and
instead basically wraps the given ID in a proxy for the desired class.
It should generally not be used for reasons outside of using the proxy
to set FK references in other entities, or to explicitly call setters
on the proxy in some circumstances. It should not be used for an
existence check, a way to perform subsequent gets on the proxy, or
passed to EntityManager.remove(). We were violating all of these rules
in various places. The calls to EM.remove were the cause of some
orphaned config because the getReference proxy did not provide the
proxy necessary for EM.remove to provide the cascade delete.
- improper update of a DriftDefinition or DriftDefinitionTemplate
- When updating these entities we were not removing the old backing
config, or backing drift definition for a template, when replacing
it with the new one.
- improper test cleanup
- this would not affect production. We were directly deleting
DriftDefinition and DriftDefinitionTemplate, so the cascade delete
was not happening. By changing the cleanup code to use EM.remove() the
configs are now cleaned up properly.
Note that this commit does not guarantee to solve this BZ entirely or
even partially, but it is guaranteed to stop some orphan issues, as proven
in testing. Also, it includes analogous changes outside of the drift domain.
Commit: 9feac6d5c7a1f29d2fa3ca5d2b3c0cc380c9b3c5
https://github.com/rhq-project/rhq/commit/9feac6d5c7a1f29d2fa3ca5d2b3c0cc...
Author: Josejulio Martínez <jmartine(a)redhat.com>
Date: 2017-01-04 (Wed, 04 Jan 2017)
Changed paths:
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentUIManagerBean.java
Log Message:
-----------
Bug 1367505 - Trims result to match page controls.
Compare:
https://github.com/rhq-project/rhq/compare/c3c8be49e842...9feac6d5c7a1