[rhq-project/rhq] 001a3d: [1120417] Break up transaction of updatePluginConf...
by Jay Shaughnessy
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 001a3d1ed50713172774c4ae94effd34523aa9ca
https://github.com/rhq-project/rhq/commit/001a3d1ed50713172774c4ae94effd3...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-07-25 (Fri, 25 Jul 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.
Commit: 0e8b7ed217d5ec91ac1313e5fc87829c330b4ca9
https://github.com/rhq-project/rhq/commit/0e8b7ed217d5ec91ac1313e5fc87829...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-07-25 (Fri, 25 Jul 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.
Compare: https://github.com/rhq-project/rhq/compare/fb8d00129c25...0e8b7ed217d5
9 years, 10 months
[rhq-project/rhq] c4eba0: patterfly: fixing typo in image name (_over -> _Ov...
by Jiri Kremser
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: c4eba02703bf7380728b50b5ac5355824a77eb75
https://github.com/rhq-project/rhq/commit/c4eba02703bf7380728b50b5ac53558...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-07-25 (Fri, 25 Jul 2014)
Changed paths:
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/EventCompositeDetailsView.java
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_green_16.png
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_green_24.png
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_grey_16.png
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_grey_24.png
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_red_16.png
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_red_24.png
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/control/Operation_failed_16.png
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/control/Operation_ok_16.png
M modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Drift_16_Disabled.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/Dialog/ask.png
R modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/flickr10.png
R modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/grid.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/refresh_Over.gif
R modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/refresh_over.gif
R modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/loading.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/skin_styles.css
Log Message:
-----------
patterfly: fixing typo in image name (_over -> _Over); increasing the size of icons for availability; decreasing the size of icons for event severities; removing unused images
Commit: fb8d00129c25f4c23e3d122b90e4ef3e6c4f5e31
https://github.com/rhq-project/rhq/commit/fb8d00129c25f4c23e3d122b90e4ef3...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-07-25 (Fri, 25 Jul 2014)
Changed paths:
A etc/ui/imageLightener.sh
A etc/ui/listOfBlack.txt
Log Message:
-----------
pf: simple bash script for lightening all the black icons
Compare: https://github.com/rhq-project/rhq/compare/f8e474f29549...fb8d00129c25
9 years, 10 months
[rhq-project/rhq] 3e4774: [801432, 807465] Related Issue to these BZs
by Jay Shaughnessy
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: 3e47741694b55fedecf9c904d89de11a7b92ccb2
https://github.com/rhq-project/rhq/commit/3e47741694b55fedecf9c904d89de11...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java
Log Message:
-----------
[801432, 807465] Related Issue to these BZs
Uninventory triggered our "assert-style" debug logging indicating that we
were working with HashSet for child resources when we expected to be using
a safer Set impl (wrt preventing ConcurrentModoficationException). There
were a few issues in play:
- When loading persisted resources from disk convert childResources to
CopyOnWriteArraySet if necessary. This repairs resources persisted with
the wrong Set impl.
- Eliminate some potential concurrent modification danger (or, at a minimum,
- Fix a couple of other places where we weren't using CopyOnWriteArraySet
- Fix Resource entity to ensure that when customChildResourcesCollection=true
that the childResources Set is truly protected. It was here that we were
losing the proper Set impl.
some unnecessary work) by only calling deactivateResource() on the root
resource. It recursively deactivates the subtree, so no need to then call
it on every node in the subtree.
- Fix our "assert-logging" conditional, which despite finding this issue was
actually looking for the wrong set impl. It had not been updated when we
moved to CopyOnWriteArraySet.
9 years, 10 months
[rhq-project/rhq] 23e0ef: [BZ 1120418] Transform domain classes to a fluid i...
by Stefan Negrea
Branch: refs/heads/storage_workflow
Home: https://github.com/rhq-project/rhq
Commit: 23e0ef342e5e50b4742ac48411576285bbdb1544
https://github.com/rhq-project/rhq/commit/23e0ef342e5e50b4742ac4841157628...
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/storage/MaintenanceJob.java
M modules/core/domain/src/main/java/org/rhq/core/domain/storage/MaintenanceStep.java
Log Message:
-----------
[BZ 1120418] Transform domain classes to a fluid interface.
Commit: 0f1b32654b484241b2b0ef873b4696c5119e32bf
https://github.com/rhq-project/rhq/commit/0f1b32654b484241b2b0ef873b4696c...
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M modules/enterprise/server/storage-maintenance/pom.xml
A modules/enterprise/server/storage-maintenance/src/main/java/org/rhq/server/storage/maintenance/StorageMaintenanceJobFactory.java
A modules/enterprise/server/storage-maintenance/src/main/java/org/rhq/server/storage/maintenance/step/MaintenanceStepFacade.java
A modules/enterprise/server/storage-maintenance/src/main/java/org/rhq/server/storage/maintenance/step/ShutdownStorageClient.java
A modules/enterprise/server/storage-maintenance/src/main/java/org/rhq/server/storage/maintenance/step/StartStorageClient.java
A modules/enterprise/server/storage-maintenance/src/main/java/org/rhq/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java
A modules/enterprise/server/storage-maintenance/src/main/java/org/rhq/server/storage/maintenance/step/UpdateStorageNodeEntity.java
Log Message:
-----------
[BZ 1120418] Initial proof-of-concept for job and step builders for storage maintenance workflow.
Commit: 1a901c579a60a91cdcc67cfaac60563c293d112b
https://github.com/rhq-project/rhq/commit/1a901c579a60a91cdcc67cfaac60563...
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
R modules/enterprise/server/storage-maintenance/src/main/java/org/rhq/server/storage/maintenance/SampleClass.java
Log Message:
-----------
[BZ 1120418] Clip superfluous class.
Compare: https://github.com/rhq-project/rhq/compare/8bc37861a077...1a901c579a60
9 years, 10 months
[rhq-project/rhq] a3d6c3: Work on ITest-2 Failures:
by Simeon Pinder
Branch: refs/heads/release/jon3.2.x
Home: https://github.com/rhq-project/rhq
Commit: a3d6c31fe7f3662165491d9b0d270c0acb453a55
https://github.com/rhq-project/rhq/commit/a3d6c31fe7f3662165491d9b0d270c0...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M modules/core/domain/src/main/java/org/rhq/core/domain/common/SystemConfiguration.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java
Log Message:
-----------
Work on ITest-2 Failures:
- I think the recent work for 1071330 which added caching and last-update
logic around SystemSettings adversely affected the LDAP tests which
where doing direct update of read-only system settings. Adding a
new inetrnal-only local SLSB for safely updating a read-only SystemSetting
and refactoring test class to use it.
- Removed now-obsolete NamedQuery that supported the old test-class logic.
(cherry picked from commit e81c703599425f6d720b9568d4d79db94d46d35f)
Conflicts:
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java
Signed-off-by: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Commit: 598ef9973f81626072b500236f9fff002fcc4ee4
https://github.com/rhq-project/rhq/commit/598ef9973f81626072b500236f9fff0...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java
Log Message:
-----------
Work on ITest-2 Failures:
- More work around 1071330 which added caching and last-update
logic around SystemSettings. Adding an internal-only local SLSB
method which allows write of readOnly system settings. This is
analogous to the one I added a few minutes ago for a single setting.
- Convert SynchronizationManagerbeanTest to use SystemSettings as opposed
to the deprecated systemConfig API, and use the internal SLSB methods
as needed.
(cherry picked from commit 5f29fcc4d5e69bea2b3c0950b55abc015fe8a261)
Signed-off-by: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Commit: c5a5410e00d2e4b123161a36fb236741e370d10d
https://github.com/rhq-project/rhq/commit/c5a5410e00d2e4b123161a36fb23674...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java
Log Message:
-----------
Work on ITest-2 Failures:
- More work around 1071330, use new local SLSBs as needed in test code
(cherry picked from commit 9475e5c9d28e4381438e68ff22f93a596d73c2ba)
Signed-off-by: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Commit: 8a1e9e636f96aa43b51cbf6f098f8abfe15f616e
https://github.com/rhq-project/rhq/commit/8a1e9e636f96aa43b51cbf6f098f8ab...
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M modules/core/plugin-container-itest/pom.xml
M modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java
M modules/enterprise/server/itests-2/pom.xml
M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
Log Message:
-----------
Itests still not resolving the correct dependencies. Another fix.
- updated Abstract classes to consistently use the same properties
- update plugin container itests to check before going to classpath.
Compare: https://github.com/rhq-project/rhq/compare/a12a4fb80346...8a1e9e636f96
9 years, 10 months
[rhq-project/rhq] 562cd9: [1118394] deployment of new war from repo content ...
by Jay Shaughnessy
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: 562cd907ca79fc18f9bfdf9aa051bbe5e10f3fea
https://github.com/rhq-project/rhq/commit/562cd907ca79fc18f9bfdf9aa051bbe...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-07-24 (Thu, 24 Jul 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java
M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
Log Message:
-----------
[1118394] deployment of new war from repo content fails
This is not a fix for the reported issue, which actually seems to not be a
bug. This is a fix to ensure failed package installs persist the error
messageto the history record in the DB. And to provide a more useful
log message in the agent log.
Cherry-pick master ec19fd70d8db8e100b3c83c75f8d29d6c5c797ff
9 years, 10 months