[rhq-project/rhq] f8a62e: Merge pull request #90 from rhq-project/jshaughn/1...
by Jay Shaughnessy
Branch: refs/heads/release/jon3.2.x
Home: https://github.com/rhq-project/rhq
Commit: f8a62e62c98b02eefc119177e0b0e7cd7e4f8e3e
https://github.com/rhq-project/rhq/commit/f8a62e62c98b02eefc119177e0b0e7c...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
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/core/StartupBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java
Log Message:
-----------
Merge pull request #90 from rhq-project/jshaughn/1111064
[1111064] Some code changes to avoid a locking issue.
Conflicts:
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java
Cherry-pick master merge commit: cec1e931ffdfbf0705b6b17358a25578a1462f7d
9 years, 9 months
[rhq-project/rhq] eeaad7: [1127654] - Patternfly theme: various minor UI iss...
by Jiri Kremser
Branch: refs/heads/release/jon3.3.x
Home: https://github.com/rhq-project/rhq
Commit: eeaad79aca7f7dc07b96993e9ed2362d26fdd8c0
https://github.com/rhq-project/rhq/commit/eeaad79aca7f7dc07b96993e9ed2362...
Author: Alan Santos <alan(a)poke53281.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close.png
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close_Over.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/help.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/help_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/maximize.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/maximize_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize_Disabled.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize_Over.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/refresh.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/refresh_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/settings.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/settings_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/load_skin.js
A rhq
Log Message:
-----------
[1127654] - Patternfly theme: various minor UI issues - Replacing Header Icons and fix spacing (kudos to asantos)
(cherry picked from commit 1b695d390fa41ce3d4a2ad1506121468a70488e1)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
(cherry picked from commit fdbe00f31d6f908246752e8a9854236f766e2425)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
Commit: d40b60a680e31fac3776879a15935586d03030cf
https://github.com/rhq-project/rhq/commit/d40b60a680e31fac3776879a1593558...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/actions/edit.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/actions/edit_Disabled.png
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/help_Disabled.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/maximize_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/refresh_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/restore.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/restore_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/restore_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/settings_Disabled.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/load_skin.js
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/skin_styles.css
Log Message:
-----------
[BZ 1127654] - Patternfly theme: various minor UI issues - window header icons, better icon for pencil (edit), fixing mouse cursor for header icons
(cherry picked from commit 98d63c2d7d8190ca4849f31c27bb98ec0ae0a4b7)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
Conflicts:
modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/skin_styles.css
Compare: https://github.com/rhq-project/rhq/compare/472bc54e4bba...d40b60a680e3
9 years, 9 months
[rhq-project/rhq] fdbe00: Replacing Header Icons and fix spacing
by Jiri Kremser
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: fdbe00f31d6f908246752e8a9854236f766e2425
https://github.com/rhq-project/rhq/commit/fdbe00f31d6f908246752e8a9854236...
Author: Alan Santos <alan(a)poke53281.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close.png
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close_Over.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/help.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/help_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/maximize.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/maximize_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize_Disabled.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize_Over.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/refresh.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/refresh_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/settings.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/settings_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/load_skin.js
A rhq
Log Message:
-----------
Replacing Header Icons and fix spacing
(cherry picked from commit 1b695d390fa41ce3d4a2ad1506121468a70488e1)
Signed-off-by: Jirka Kremser <jkremser(a)redhat.com>
Commit: 98d63c2d7d8190ca4849f31c27bb98ec0ae0a4b7
https://github.com/rhq-project/rhq/commit/98d63c2d7d8190ca4849f31c27bb98e...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/actions/edit.png
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/actions/edit_Disabled.png
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/close_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/help_Disabled.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/maximize_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/minimize_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/refresh_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/restore.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/restore_Disabled.gif
A modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/restore_Over.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/images/headerIcons/settings_Disabled.gif
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/load_skin.js
M modules/enterprise/gui/coregui/src/main/webapp/org.rhq.coregui.CoreGUI/sc/skins/CoreGUI/skin_styles.css
Log Message:
-----------
[BZ 1127654] - Patternfly theme: various minor UI issues - window header icons, better icon for pencil (edit), fixing mouse cursor for header icons
Compare: https://github.com/rhq-project/rhq/compare/1106141fb59a...98d63c2d7d81
9 years, 9 months
[rhq-project/rhq] 6e4dc2: [BZ 1120418] more domain model changes
by John Sanda
Branch: refs/heads/storage_workflow
Home: https://github.com/rhq-project/rhq
Commit: 6e4dc2f78153cd1e5b1ed054ccf0c759f2dd1270
https://github.com/rhq-project/rhq/commit/6e4dc2f78153cd1e5b1ed054ccf0c75...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
Changed paths:
M modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml
M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
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
A modules/core/domain/src/main/java/org/rhq/core/domain/storage/StorageMaintenanceJob.java
R modules/core/domain/src/test/java/org/rhq/core/domain/storage/MaintenanceJobTest.java
A modules/core/domain/src/test/java/org/rhq/core/domain/storage/MaintenanceStepTest.java
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/scheduler/jobs/StorageClusterMaintenanceJob.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClusterMaintenanceManagerLocal.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/MaintenanceJobRunner.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/job/StorageMaintenanceJobFactory.java
A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/AnnounceStorageNode.java
A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/BaseStepRunner.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/MaintenanceStepRunner.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/ShutdownStorageClient.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/StartStorageClient.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEndpoints.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/maintenance/step/UpdateStorageNodeEntity.java
Log Message:
-----------
[BZ 1120418] more domain model changes
After some lengthy discussion with jshaughn, I decided to eliminate the
maintenance_job table. We can implement jobs using only the maintenance_step
table, which I think simplifies things.
9 years, 10 months