Branch: refs/heads/release/jon3.3.x
Home:
https://github.com/rhq-project/rhq
Commit: e301dd8370e5533d0118170abd0d869251f2c8f2
https://github.com/rhq-project/rhq/commit/e301dd8370e5533d0118170abd0d869...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionEnumeration.java
M
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionSimple.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/resource/metadata/ResourceConfigurationMetadataManagerBean.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerLocal.java
Log Message:
-----------
[1120417] Break up transaction of updatePluginConfigurationDefinition into smaller
pieces
Another pass here given some oracle test failures in the CI env.
- Fix an issue with PropertyDefinitionSimple.removeEnumeratedValues.
An unexpected problem brought out, I guess, by the Tx reworking,
must be careful not to replace hibernate proxy dealing with
orphanRemoval.
- remove unnecessary REQUIRES_NEW that could lead to locking issues
- remove some dead code
- start shortening xxxInNewTransaction to xxxInNewTx, purely for selfish reasons.
(cherry picked from commit 001a3d1ed50713172774c4ae94effd34523aa9ca)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com>
Commit: e9498be580c6b22de9f4fc7a26f23c62c94c376c
https://github.com/rhq-project/rhq/commit/e9498be580c6b22de9f4fc7a26f23c6...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
Changed paths:
M
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java
M
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java
M
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java
M
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java
M modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/Dashboard.java
M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
Log Message:
-----------
In a recent commit for [1120417] (and the resulting oracle test failures) we
added protection against Hibernate errors related to detached sets when
orphanRemoval=true. This applies similar changes to entity classes
outside of the BZ work.
(cherry picked from commit 0e8b7ed217d5ec91ac1313e5fc87829c330b4ca9)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com>
Compare:
https://github.com/rhq-project/rhq/compare/189d971483a4...e9498be580c6