modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy | 24 +++++-----
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 694f61703512408e4e0492dff2e1eb78a70c56a0
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 29 14:47:49 2010 -0500
Fixing test failures
diff --git a/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy b/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy
index 26eea7d..8fb2596 100644
--- a/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy
+++ b/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy
@@ -8,6 +8,7 @@ import org.rhq.core.domain.plugin.Plugin
import javax.ejb.EJBException
import org.rhq.core.domain.plugin.PluginDeploymentType
import org.rhq.core.domain.plugin.PluginStatusType
+import org.testng.annotations.BeforeGroups
class PluginManagerBeanTest extends MetadataTest {
@@ -15,14 +16,13 @@ class PluginManagerBeanTest extends MetadataTest {
PluginManagerLocal pluginMgr
- @BeforeMethod
- void initTest() {
+ @Test(groups = ['plugin.metadata', 'PluginManagerBean'])
+ void registerPlugins() {
subjectMgr = LookupUtil.subjectManager
pluginMgr = LookupUtil.pluginManager
- }
- @Test(groups = ['plugin.metadata'])
- void registerPlugins() {
+ setupDB()
+
def pluginDescriptor1 =
"""
<plugin name="PluginManagerBeanTestPlugin1"
@@ -67,7 +67,7 @@ class PluginManagerBeanTest extends MetadataTest {
createPlugin("test-plugin3", "1.0", pluginDescriptor3)
}
- @Test(groups = ['plugin.metadata'], dependsOnMethods = ['registerPlugins'])
+ @Test(groups = ['plugin.metadata', 'PluginManagerBean'], dependsOnMethods = ['registerPlugins'])
void disablePlugin() {
def plugin = getPlugin('PluginManagerBeanTestPlugin3')
@@ -77,7 +77,7 @@ class PluginManagerBeanTest extends MetadataTest {
assertFalse 'Failed to disable plugin', plugin.enabled
}
- @Test(groups = ['plugin.metadata'], dependsOnMethods = ['registerPlugins'])
+ @Test(groups = ['plugin.metadata', 'PluginManagerBean'], dependsOnMethods = ['registerPlugins'])
void doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() {
def plugin = getPlugin('PluginManagerBeanTestPlugin1')
def exception = null
@@ -95,7 +95,7 @@ class PluginManagerBeanTest extends MetadataTest {
)
}
- @Test(groups = ['plugin.metadata'], dependsOnMethods = ['doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled'])
+ @Test(groups = ['plugin.metadata', 'PluginManagerBean'], dependsOnMethods = ['doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled'])
void disablePluginAndDependentPlugins() {
def plugin1 = getPlugin('PluginManagerBeanTestPlugin1')
def plugin2 = getPlugin('PluginManagerBeanTestPlugin2')
@@ -109,7 +109,7 @@ class PluginManagerBeanTest extends MetadataTest {
assertFalse 'Failed to disable plugin', plugin2.enabled
}
- @Test(groups = ['plugin.metadata'], dependsOnMethods = ['disablePluginAndDependentPlugins'])
+ @Test(groups = ['plugin.metadata', 'PluginManagerBean'], dependsOnMethods = ['disablePluginAndDependentPlugins'])
void enablePlugins() {
def plugin1 = getPlugin('PluginManagerBeanTestPlugin1')
def plugin2 = getPlugin('PluginManagerBeanTestPlugin2')
@@ -123,7 +123,7 @@ class PluginManagerBeanTest extends MetadataTest {
assertTrue 'Failed to enable plugin', plugin2.enabled
}
- @Test(groups = ['plugin.metadata'], dependsOnMethods = ['enablePlugins'])
+ @Test(groups = ['plugin.metadata', 'PluginManagerBean'], dependsOnMethods = ['enablePlugins'])
void doNotDeletePluginIfDependentPluginIsNotAlsoDeleted() {
def plugin = getPlugin('PluginManagerBeanTestPlugin1')
def exception = null
@@ -141,7 +141,7 @@ class PluginManagerBeanTest extends MetadataTest {
)
}
- @Test(groups = ['plugin.metadata'], dependsOnMethods = ['doNotDeletePluginIfDependentPluginIsNotAlsoDeleted'])
+ @Test(groups = ['plugin.metadata', 'PluginManagerBean'], dependsOnMethods = ['doNotDeletePluginIfDependentPluginIsNotAlsoDeleted'])
void deletePlugins() {
def plugin1 = getPlugin('PluginManagerBeanTestPlugin1')
def plugin2 = getPlugin('PluginManagerBeanTestPlugin2')
@@ -155,7 +155,7 @@ class PluginManagerBeanTest extends MetadataTest {
assertTrue 'Expected plugin status to be set to DELETED', plugin2.status == PluginStatusType.DELETED
}
- @Test(groups = ['plugin.metadata'], dependsOnMethods = ['deletePlugins'])
+ @Test(groups = ['plugin.metadata', 'PluginManagerBean'], dependsOnMethods = ['deletePlugins'])
void purgePlugins() {
def plugin1 = getPlugin('PluginManagerBeanTestPlugin1', 'Deleting a plugin should not remove it from the database')
def plugin2 = getPlugin('PluginManagerBeanTestPlugin2', 'Deleting a plugin should not remove it from the database')
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 52 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 207 ++++------
2 files changed, 126 insertions(+), 133 deletions(-)
New commits:
commit 59c7975de567f3265aa316a4c9360c09341173e9
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 14:30:30 2010 -0500
reorder the tabs so they make more sense and are more consistently placed across individual resource and group views
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index cada640..569882d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -149,6 +149,26 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
summaryTab.registerSubTabs(summaryOverview, summaryTimeline);
tabs.add(summaryTab);
+ inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", MSG
+ .view_tabs_common_inventory()), "/images/icons/Inventory_grey_16.png");
+ inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), new ViewName("Members", MSG
+ .view_tabs_common_members()), null);
+ inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
+ "ConnectionSettings", MSG.view_tabs_common_connectionSettings()), null);
+ inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), new ViewName(
+ "ConnectionSettingsHistory", MSG.view_tabs_common_connectionSettingsHistory()), null);
+ inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn, this.inventoryConnHistory);
+ tabs.add(inventoryTab);
+
+ alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts", MSG
+ .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions", MSG
+ .view_tabs_common_definitions()), null);
+ alertsTab.registerSubTabs(alertHistory, alertDef);
+ tabs.add(alertsTab);
+
monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring", MSG
.view_tabs_common_monitoring()), "/images/icons/Monitor_grey_16.png");
monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs", MSG
@@ -165,16 +185,12 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorSched, monitorCallTime);
tabs.add(monitoringTab);
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", MSG
- .view_tabs_common_inventory()), "/images/icons/Inventory_grey_16.png");
- inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), new ViewName("Members", MSG
- .view_tabs_common_members()), null);
- inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
- "ConnectionSettings", MSG.view_tabs_common_connectionSettings()), null);
- inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), new ViewName(
- "ConnectionSettingsHistory", MSG.view_tabs_common_connectionSettingsHistory()), null);
- inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn, this.inventoryConnHistory);
- tabs.add(inventoryTab);
+ eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events", MSG
+ .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ eventsTab.registerSubTabs(eventHistory);
+ tabs.add(eventsTab);
operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), new ViewName("Operations", MSG
.view_tabs_common_operations()), "/images/icons/Operation_grey_16.png");
@@ -185,15 +201,6 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
operationsTab.registerSubTabs(this.opHistory, this.opSched);
tabs.add(operationsTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts", MSG
- .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
- this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History", MSG
- .view_tabs_common_history()), null);
- this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions", MSG
- .view_tabs_common_definitions()), null);
- alertsTab.registerSubTabs(alertHistory, alertDef);
- tabs.add(alertsTab);
-
configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new ViewName("Configuration",
MSG.view_tabs_common_configuration()), "/images/icons/Configure_grey_16.png");
this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), new ViewName("Current", MSG
@@ -203,13 +210,6 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events", MSG
- .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History", MSG
- .view_tabs_common_history()), null);
- eventsTab.registerSubTabs(eventHistory);
- tabs.add(eventsTab);
-
return tabs;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 0191f51..9ee899c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -120,97 +120,97 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
protected List<TwoLevelTab> createTabs() {
List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary",
- MSG.view_tabs_common_summary()), "/images/icons/Service_up_16.png");
- summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview",
- MSG.view_tabs_common_overview()), null);
- summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"), new ViewName("Dashboard",
- MSG.view_tabs_common_dashboard()), null);
- summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline",
- MSG.view_tabs_common_timeline()), null);
+ summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", MSG
+ .view_tabs_common_summary()), "/images/icons/Service_up_16.png");
+ summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview", MSG
+ .view_tabs_common_overview()), null);
+ summaryDashboard = new SubTab(summaryTab.extendLocatorId("Dashboard"), new ViewName("Dashboard", MSG
+ .view_tabs_common_dashboard()), null);
+ summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline", MSG
+ .view_tabs_common_timeline()), null);
summaryTab.registerSubTabs(summaryOverview, summaryDashboard, summaryTimeline);
tabs.add(summaryTab);
- monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring",
- MSG.view_tabs_common_monitoring()), "/images/icons/Monitor_grey_16.png");
- monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs",
- MSG.view_tabs_common_graphs()), null);
- monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables",
- MSG.view_tabs_common_tables()), null);
- monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new ViewName("Traits",
- MSG.view_tabs_common_traits()), null);
- monitorAvail = new SubTab(monitoringTab.extendLocatorId("Availability"), new ViewName("Availability",
- MSG.view_tabs_common_availability()), null);
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), new ViewName("Schedules",
- MSG.view_tabs_common_schedules()), null);
- monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), new ViewName("CallTime",
- MSG.view_tabs_common_calltime()), null);
- monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorAvail, monitorSched,
- monitorCallTime);
- tabs.add(monitoringTab);
-
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory",
- MSG.view_tabs_common_inventory()), "/images/icons/Inventory_grey_16.png");
- inventoryChildren = new SubTab(inventoryTab.extendLocatorId("Children"), new ViewName("Children",
- MSG.view_tabs_common_child_resources()), null);
- inventoryChildHistory = new SubTab(inventoryTab.extendLocatorId("ChildHist"), new ViewName("ChildHistory",
- MSG.view_tabs_common_child_history()), null);
+ inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", MSG
+ .view_tabs_common_inventory()), "/images/icons/Inventory_grey_16.png");
+ inventoryChildren = new SubTab(inventoryTab.extendLocatorId("Children"), new ViewName("Children", MSG
+ .view_tabs_common_child_resources()), null);
+ inventoryChildHistory = new SubTab(inventoryTab.extendLocatorId("ChildHist"), new ViewName("ChildHistory", MSG
+ .view_tabs_common_child_history()), null);
inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
"ConnectionSettings", MSG.view_tabs_common_connectionSettings()), null);
inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnSetHist"), new ViewName(
"ConnectionSettingsHistory", MSG.view_tabs_common_connectionSettingsHistory()), null);
- inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"), new ViewName("Groups",
- MSG.view_tabs_common_groups()), null);
+ inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"), new ViewName("Groups", MSG
+ .view_tabs_common_groups()), null);
inventoryGroupMembership = new SubTab(inventoryTab.extendLocatorId("GroupMembership"), new ViewName(
"GroupMembership", MSG.view_tabs_common_group_membership()), null);
inventoryTab.registerSubTabs(this.inventoryChildren, this.inventoryChildHistory, this.inventoryConn,
this.inventoryConnHistory, this.inventoryGroups, this.inventoryGroupMembership);
tabs.add(inventoryTab);
- operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), new ViewName("Operations",
- MSG.view_tabs_common_operations()), "/images/icons/Operation_grey_16.png");
- this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
- this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), new ViewName("Scheduled",
- MSG.view_tabs_common_scheduled()), null);
- operationsTab.registerSubTabs(this.opHistory, this.opSched);
- tabs.add(operationsTab);
-
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts",
- MSG.view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
- this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
- this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions",
- MSG.view_tabs_common_definitions()), null);
+ alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts", MSG
+ .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions", MSG
+ .view_tabs_common_definitions()), null);
alertsTab.registerSubTabs(alertHistory, alertDef);
tabs.add(alertsTab);
+ monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring", MSG
+ .view_tabs_common_monitoring()), "/images/icons/Monitor_grey_16.png");
+ monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs", MSG
+ .view_tabs_common_graphs()), null);
+ monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables", MSG
+ .view_tabs_common_tables()), null);
+ monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new ViewName("Traits", MSG
+ .view_tabs_common_traits()), null);
+ monitorAvail = new SubTab(monitoringTab.extendLocatorId("Availability"), new ViewName("Availability", MSG
+ .view_tabs_common_availability()), null);
+ monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), new ViewName("Schedules", MSG
+ .view_tabs_common_schedules()), null);
+ monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), new ViewName("CallTime", MSG
+ .view_tabs_common_calltime()), null);
+ monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorAvail, monitorSched,
+ monitorCallTime);
+ tabs.add(monitoringTab);
+
+ eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events", MSG
+ .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ eventsTab.registerSubTabs(eventHistory);
+ tabs.add(eventsTab);
+
+ operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), new ViewName("Operations", MSG
+ .view_tabs_common_operations()), "/images/icons/Operation_grey_16.png");
+ this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), new ViewName("Scheduled", MSG
+ .view_tabs_common_scheduled()), null);
+ operationsTab.registerSubTabs(this.opHistory, this.opSched);
+ tabs.add(operationsTab);
+
configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new ViewName("Configuration",
MSG.view_tabs_common_configuration()), "/images/icons/Configure_grey_16.png");
- this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), new ViewName("Current",
- MSG.view_tabs_common_current()), null);
- this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), new ViewName("Current", MSG
+ .view_tabs_common_current()), null);
+ this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events",
- MSG.view_tabs_common_events()), "/images/icons/Events_grey_16.png");
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
- eventsTab.registerSubTabs(eventHistory);
- tabs.add(eventsTab);
-
- contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"), new ViewName("Content",
- MSG.view_tabs_common_content()), "/images/icons/Content_grey_16.png");
- this.contentDeployed = new SubTab(contentTab.extendLocatorId("Deployed"), new ViewName("Deployed",
- MSG.view_tabs_common_deployed()), null);
+ contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"), new ViewName("Content", MSG
+ .view_tabs_common_content()), "/images/icons/Content_grey_16.png");
+ this.contentDeployed = new SubTab(contentTab.extendLocatorId("Deployed"), new ViewName("Deployed", MSG
+ .view_tabs_common_deployed()), null);
this.contentNew = new SubTab(contentTab.extendLocatorId("New"),
new ViewName("New", MSG.view_tabs_common_new()), null);
this.contentSubscrip = new SubTab(contentTab.extendLocatorId("Subscriptions"), new ViewName("Subscriptions",
MSG.view_tabs_common_subscriptions()), null);
- this.contentHistory = new SubTab(contentTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.contentHistory = new SubTab(contentTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
contentTab.registerSubTabs(contentDeployed, contentNew, contentSubscrip, contentHistory);
tabs.add(contentTab);
@@ -238,15 +238,14 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
Set<ResourceTypeFacet> facets = this.resourceComposite.getResourceFacets().getFacets();
// Summary Tab
- updateSubTab(this.summaryTab, this.summaryOverview,
- new OverviewView(this.summaryTab.extendLocatorId("OverviewView"), this.resourceComposite), true, true);
+ updateSubTab(this.summaryTab, this.summaryOverview, new OverviewView(this.summaryTab
+ .extendLocatorId("OverviewView"), this.resourceComposite), true, true);
- updateSubTab(this.summaryTab, this.summaryDashboard,
- new DashboardView(this.summaryDashboard.extendLocatorId("View"), this.resourceComposite), true, true);
+ updateSubTab(this.summaryTab, this.summaryDashboard, new DashboardView(this.summaryDashboard
+ .extendLocatorId("View"), this.resourceComposite), true, true);
- updateSubTab(this.summaryTab, this.summaryTimeline,
- new FullHTMLPane(this.summaryTimeline.extendLocatorId("View"),
- "/rhq/resource/summary/timeline-plain.xhtml?id=" + resource.getId()), true, true);
+ updateSubTab(this.summaryTab, this.summaryTimeline, new FullHTMLPane(this.summaryTimeline
+ .extendLocatorId("View"), "/rhq/resource/summary/timeline-plain.xhtml?id=" + resource.getId()), true, true);
// Monitoring Tab
visible = hasMetricsOfType(this.resourceComposite, DataType.MEASUREMENT);
@@ -267,9 +266,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.monitoringTab, this.monitorAvail, new FullHTMLPane(this.monitorAvail.extendLocatorId("View"),
"/rhq/resource/monitor/availabilityHistory-plain.xhtml?id=" + resource.getId()), true, true);
- updateSubTab(this.monitoringTab, this.monitorSched,
- new SchedulesView(monitoringTab.extendLocatorId("SchedulesView"), resource.getId()),
- hasMetricsOfType(this.resourceComposite, null), true);
+ updateSubTab(this.monitoringTab, this.monitorSched, new SchedulesView(monitoringTab
+ .extendLocatorId("SchedulesView"), resource.getId()), hasMetricsOfType(this.resourceComposite, null), true);
visible = facets.contains(ResourceTypeFacet.CALL_TIME);
canvas = (visible) ? new FullHTMLPane(this.monitorCallTime.extendLocatorId("View"),
@@ -279,8 +277,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
// Inventory Tab
ResourceType type = this.resourceComposite.getResource().getResourceType();
visible = !type.getChildResourceTypes().isEmpty();
- canvas = (visible) ? ResourceCompositeSearchView.getChildrenOf(
- this.inventoryTab.extendLocatorId("ChildrenView"), resourceComposite) : null;
+ canvas = (visible) ? ResourceCompositeSearchView.getChildrenOf(this.inventoryTab
+ .extendLocatorId("ChildrenView"), resourceComposite) : null;
updateSubTab(this.inventoryTab, this.inventoryChildren, canvas, visible, true);
updateSubTab(this.inventoryTab, this.inventoryChildHistory, new Canvas(), visible, true);
@@ -294,9 +292,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
canvas = (visible) ? new Canvas() : null; // TODO: Add real canvas when visible
updateSubTab(this.inventoryTab, this.inventoryConnHistory, canvas, visible, true);
- updateSubTab(this.inventoryTab, this.inventoryGroups,
- ResourceGroupListView.getGroupsOf(this.inventoryTab.extendLocatorId("GroupsView"), resource.getId()), true,
- true);
+ updateSubTab(this.inventoryTab, this.inventoryGroups, ResourceGroupListView.getGroupsOf(this.inventoryTab
+ .extendLocatorId("GroupsView"), resource.getId()), true, true);
enabled = globalPermissions.contains(Permission.MANAGE_INVENTORY);
canvas = (enabled) ? new ResourceResourceGroupsView(this.inventoryTab.extendLocatorId("GroupMembershipView"),
@@ -311,58 +308,54 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
// 3) operation arguments/results become read-only configuration data in the history details pop-up
// 4) user can navigate to the group operation that spawned this resource operation history, if appropriate
// note: enabled operation execution/schedules from left-nav, if it doesn't already exist
- updateSubTab(this.operationsTab, this.opHistory, OperationHistoryView.getResourceHistoryView(
- operationsTab.extendLocatorId("HistoryView"), this.resourceComposite), true, true);
+ updateSubTab(this.operationsTab, this.opHistory, OperationHistoryView.getResourceHistoryView(operationsTab
+ .extendLocatorId("HistoryView"), this.resourceComposite), true, true);
updateSubTab(this.operationsTab, this.opSched, new FullHTMLPane(this.opSched.extendLocatorId("View"),
"/rhq/resource/operation/resourceOperationSchedules-plain.xhtml?id=" + resource.getId()), true, true);
}
// Alerts Tab
- updateSubTab(this.alertsTab, this.alertHistory,
- ResourceAlertHistoryView.get(this.alertHistory.extendLocatorId("View"), resourceComposite), true, true);
+ updateSubTab(this.alertsTab, this.alertHistory, ResourceAlertHistoryView.get(this.alertHistory
+ .extendLocatorId("View"), resourceComposite), true, true);
- updateSubTab(this.alertsTab, this.alertDef,
- new ResourceAlertDefinitionsView(alertsTab.extendLocatorId("AlertDefView"), this.resourceComposite), true,
- true);
+ updateSubTab(this.alertsTab, this.alertDef, new ResourceAlertDefinitionsView(alertsTab
+ .extendLocatorId("AlertDefView"), this.resourceComposite), true, true);
// Configuration Tab
- if (updateTab(this.configurationTab, facets.contains(ResourceTypeFacet.CONFIGURATION),
- resourcePermissions.isConfigureRead())) {
+ if (updateTab(this.configurationTab, facets.contains(ResourceTypeFacet.CONFIGURATION), resourcePermissions
+ .isConfigureRead())) {
- updateSubTab(this.configurationTab, this.configCurrent,
- new ResourceConfigurationEditView(this.extendLocatorId("ResourceConfigView"), resourceComposite), true,
- true);
+ updateSubTab(this.configurationTab, this.configCurrent, new ResourceConfigurationEditView(this
+ .extendLocatorId("ResourceConfigView"), resourceComposite), true, true);
- updateSubTab(this.configurationTab, this.configHistory,
- ConfigurationHistoryView.getHistoryOf(this.extendLocatorId("ConfigHistView"), resource.getId()), true,
- true);
+ updateSubTab(this.configurationTab, this.configHistory, ConfigurationHistoryView.getHistoryOf(this
+ .extendLocatorId("ConfigHistView"), resource.getId()), true, true);
}
// Events Tab
if (updateTab(this.eventsTab, facets.contains(ResourceTypeFacet.EVENT), true)) {
- updateSubTab(this.eventsTab, this.eventHistory, EventCompositeHistoryView.get(
- this.eventsTab.extendLocatorId("CompositeHistoryView"), resourceComposite), true, true);
+ updateSubTab(this.eventsTab, this.eventHistory, EventCompositeHistoryView.get(this.eventsTab
+ .extendLocatorId("CompositeHistoryView"), resourceComposite), true, true);
}
// Content Tab
if (updateTab(this.contentTab, facets.contains(ResourceTypeFacet.CONTENT), true)) {
- updateSubTab(this.contentTab, this.contentDeployed,
- new FullHTMLPane(this.contentDeployed.extendLocatorId("View"),
- "/rhq/resource/content/view-plain.xhtml?id=" + resource.getId()), true, true);
+ updateSubTab(this.contentTab, this.contentDeployed, new FullHTMLPane(this.contentDeployed
+ .extendLocatorId("View"), "/rhq/resource/content/view-plain.xhtml?id=" + resource.getId()), true, true);
updateSubTab(this.contentTab, this.contentNew, new FullHTMLPane(this.contentNew.extendLocatorId("View"),
"/rhq/resource/content/deploy-plain.xhtml?id=" + resource.getId()), true, true);
- updateSubTab(this.contentTab, this.contentSubscrip,
- new FullHTMLPane(this.contentSubscrip.extendLocatorId("View"),
- "/rhq/resource/content/subscription-plain.xhtml?id=" + resource.getId()), true, true);
+ updateSubTab(this.contentTab, this.contentSubscrip, new FullHTMLPane(this.contentSubscrip
+ .extendLocatorId("View"), "/rhq/resource/content/subscription-plain.xhtml?id=" + resource.getId()),
+ true, true);
- updateSubTab(this.contentTab, this.contentHistory,
- new FullHTMLPane(this.configHistory.extendLocatorId("View"),
- "/rhq/resource/content/history-plain.xhtml?id=" + resource.getId()), true, true);
+ updateSubTab(this.contentTab, this.contentHistory, new FullHTMLPane(this.configHistory
+ .extendLocatorId("View"), "/rhq/resource/content/history-plain.xhtml?id=" + resource.getId()), true,
+ true);
}
this.show();
1
0
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 145 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java | 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 110 +++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 31 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java | 56 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 43 +-
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_failed_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_inprogress_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_ok_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_warning_16.png |binary
29 files changed, 340 insertions(+), 222 deletions(-)
New commits:
commit 2997f48c5f49656b03a51d57634e29845a3875d6
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Nov 29 14:15:33 2010 -0500
use the new ImageManager to obtain icon urls.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java
index cae33a9..1c0ff4d 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java
@@ -30,6 +30,7 @@ import org.rhq.core.domain.resource.composite.ResourceFacets;
import org.rhq.core.domain.resource.composite.ResourcePermission;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
/**
* @author Greg Hinkle
@@ -186,12 +187,13 @@ public class ResourceGroupComposite implements Serializable {
StringBuilder results = new StringBuilder();
results.append("<table width=\"120px\"><tr>");
if (up == 0 && down == 0) {
- results.append(getColumn(false, "<img src=\"/images/icons/availability_grey_16.png\" /> 0"));
+ results.append(getColumn(false, "<img src=\"" + ImageManager.getAvailabilityIcon(null) + "\" /> 0"));
results.append(getColumn(true));
results.append(getColumn(false));
} else {
if (up > 0) {
- results.append(getColumn(false, " <img src=\"/images/icons/availability_green_16.png\" />", up));
+ results.append(getColumn(false, " <img src=\"" + ImageManager.getAvailabilityIcon(Boolean.TRUE)
+ + "\" />", up));
}
if (up > 0 && down > 0) {
@@ -199,7 +201,8 @@ public class ResourceGroupComposite implements Serializable {
}
if (down > 0) {
- results.append(getColumn(false, " <img src=\"/images/icons/availability_red_16.png\" />", down));
+ results.append(getColumn(false, " <img src=\"" + ImageManager.getAvailabilityIcon(Boolean.FALSE)
+ + "\" />", down));
} else {
results.append(getColumn(false,
" <img src=\"/images/blank.png\" width=\"16px\" height=\"16px\" />"));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
new file mode 100644
index 0000000..3975f98
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
@@ -0,0 +1,145 @@
+package org.rhq.enterprise.gui.coregui.client;
+
+import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.resource.group.GroupCategory;
+
+/**
+ * Provides an API to obtain links to images and icons, thus avoiding hardcoding image URLs throughout client code.
+ *
+ * For each icon, there is typically a small and large version (16x16 and 24x24). To obtain the smaller icon,
+ * you use the "getXXXIcon" methods and to obtain the larger icon you use the "getXXXLargeIcon" method.
+ *
+ * @author John Mazzitelli
+ *
+ */
+public class ImageManager {
+ /**
+ * Returns the large group icon badged with availability icon. Avails is the
+ * percentage of resources in the group that are UP. If avails is 0, it is
+ * red (no resources are available), if it is 1, it is green (all resources
+ * are available), if it is between 0 and 1, it is yellow.
+ *
+ * If avails is null, this means there are no resources in the group. In that
+ * case, this method returns the "UP" badged icon.
+ *
+ * @param groupType the type of group
+ * @param avails percentage of resources that are UP
+ * @return the group badge icon
+ */
+ public static String getGroupLargeIcon(GroupCategory groupType, Double avails) {
+ String category = groupType == GroupCategory.COMPATIBLE ? "Cluster" : "Group";
+
+ if (avails == null) {
+ return "types/" + category + "_up_24.png";
+ }
+
+ double val = avails.doubleValue();
+
+ if (val == 0.0d) {
+ return "types/" + category + "_down_24.png";
+ } else if (val > 0.0d && val < 1.0d) {
+ return "types/" + category + "_warning_24.png";
+ } else {
+ return "types/" + category + "_up_24.png";
+ }
+ }
+
+ public static String getAvailabilityIconFromAvailType(AvailabilityType availType) {
+ return getAvailabilityIcon((availType != null) ? Boolean.valueOf(availType == AvailabilityType.UP) : null);
+ }
+
+ public static String getAvailabilityLargeIconFromAvailType(AvailabilityType availType) {
+ return getAvailabilityLargeIcon((availType != null) ? Boolean.valueOf(availType == AvailabilityType.UP) : null);
+ }
+
+ /**
+ * Given a Boolean to indicate if something is to be considered available or unavailable, the appropriate
+ * availability icon is returned. If the given Boolean is null, the availability will be considered unknown
+ * and thus the unknown/question icon is returned.
+ *
+ * @param avail
+ * @return the avail icon
+ */
+ public static String getAvailabilityIcon(Boolean avail) {
+ return "subsystems/availability/availability_" + ((avail == null) ? "grey" : (avail ? "green" : "red"))
+ + "_16.png";
+ }
+
+ public static String getAvailabilityLargeIcon(Boolean avail) {
+ return "subsystems/availability/availability_" + ((avail == null) ? "grey" : (avail ? "green" : "red"))
+ + "_24.png";
+ }
+
+ /**
+ * Returns the large availability icon based on the given percentage.
+ * Avails is the percentage of availabilities that are UP. If avails is 0, it is
+ * red (nothing is available), if it is 1, it is green (everything is available),
+ * if it is between 0 and 1, it is yellow.
+ *
+ * If avails is null, the icon will be the unknown/grey form.
+ *
+ * @param avails percentage of availabilities that are UP
+ * @return the large availability icon
+ */
+ public static String getAvailabilityGroupLargeIcon(Double avails) {
+ if (avails == null) {
+ return "subsystems/availability/availability_grey_24.png";
+ }
+
+ double val = avails.doubleValue();
+
+ if (val == 0.0d) {
+ return "subsystems/availability/availability_red_24.png";
+ } else if (val > 0.0d && val < 1.0d) {
+ return "subsystems/availability/availability_yellow_24.png";
+ } else {
+ return "subsystems/availability/availability_green_24.png";
+ }
+ }
+
+ public static String getAvailabilityYellowIcon() {
+ return "subsystems/availability/availability_yellow_16.png";
+ }
+
+ public static String getAvailabilityYellowLargeIcon() {
+ return "subsystems/availability/availability_yellow_24.png";
+ }
+
+ public static String getAlertIcon(AlertPriority priority) {
+ return "subsystems/alert/Alert_" + priority.name() + "_16.png";
+ }
+
+ public static String getAlertIcon() {
+ return "subsystems/alert/Alert_16.png";
+ }
+
+ public static String getAlertLargeIcon() {
+ return "subsystems/alert/Flag_blue_24.png";
+ }
+
+ public static String getAlertEditIcon() {
+ return "subsystems/alert/Edit_Alert.png";
+ }
+
+ public static String getPluginConfigurationIcon(ConfigurationUpdateStatus updateStatus) {
+ if (updateStatus != null) {
+ switch (updateStatus) {
+ case SUCCESS: {
+ return "subsystems/inventory/Connection_ok_16.png";
+ }
+ case FAILURE: {
+ return "subsystems/inventory/Connection_failed_16.png";
+ }
+ case INPROGRESS: {
+ return "subsystems/inventory/Connection_inprogress_16.png";
+ }
+ case NOCHANGE:
+ return "subsystems/inventory/Connection_16.png";
+ }
+ }
+
+ return "subsystems/inventory/Connection_16.png";
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
index ae4b755..9e6e2d9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
@@ -43,6 +43,7 @@ import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
@@ -223,7 +224,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab
});
}
- private void editMetricTemplate(int resourceTypeId) {
+ private void editMetricTemplate(int resourceTypeId) {
Layout metricCanvas = getMetricTemplateCanvas();
TemplateSchedulesView templateSchedulesView = new TemplateSchedulesView(extendLocatorId("MetricTemplate"),
resourceTypeId);
@@ -307,7 +308,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab
alertTemplateImg.setShowDown(false);
alertTemplateImg.setShowRollOver(false);
alertTemplateImg.setLayoutAlign(Alignment.CENTER);
- alertTemplateImg.setSrc("subsystems/alert/Edit_Alert.png");
+ alertTemplateImg.setSrc(ImageManager.getAlertEditIcon());
alertTemplateImg.setPrompt("Edit Alert Template");
alertTemplateImg.setHeight(16);
alertTemplateImg.setWidth(16);
@@ -403,7 +404,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab
alertTemplateImg.setShowDown(false);
alertTemplateImg.setShowRollOver(false);
alertTemplateImg.setLayoutAlign(Alignment.CENTER);
- alertTemplateImg.setSrc("subsystems/alert/Edit_Alert.png");
+ alertTemplateImg.setSrc(ImageManager.getAlertEditIcon());
alertTemplateImg.setPrompt("Edit Alert Template");
alertTemplateImg.setHeight(16);
alertTemplateImg.setWidth(16);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
index b7fdeb5..98951c0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
@@ -50,6 +50,7 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTServiceAsync;
@@ -67,9 +68,9 @@ public class AlertDataSource extends RPCDataSource<Alert> {
private EntityContext entityContext;
- private static final String PRIORITY_ICON_HIGH = "/images/icons/Flag_red_16.png";
- private static final String PRIORITY_ICON_MEDIUM = "/images/icons/Flag_yellow_16.png";
- private static final String PRIORITY_ICON_LOW = "/images/icons/Flag_blue_16.png";
+ private static final String PRIORITY_ICON_HIGH = ImageManager.getAlertIcon(AlertPriority.HIGH);
+ private static final String PRIORITY_ICON_MEDIUM = ImageManager.getAlertIcon(AlertPriority.MEDIUM);
+ private static final String PRIORITY_ICON_LOW = ImageManager.getAlertIcon(AlertPriority.LOW);
public AlertDataSource() {
this(EntityContext.forSubsystemView());
@@ -227,20 +228,7 @@ public class AlertDataSource extends RPCDataSource<Alert> {
record.setAttribute("resourceId", from.getAlertDefinition().getResource().getId());
record.setAttribute("resourceName", from.getAlertDefinition().getResource().getName());
record.setAttribute("name", from.getAlertDefinition().getName());
- switch (from.getAlertDefinition().getPriority()) {
- case HIGH: {
- record.setAttribute("priority", PRIORITY_ICON_HIGH);
- break;
- }
- case MEDIUM: {
- record.setAttribute("priority", PRIORITY_ICON_MEDIUM);
- break;
- }
- case LOW: {
- record.setAttribute("priority", PRIORITY_ICON_LOW);
- break;
- }
- }
+ record.setAttribute("priority", ImageManager.getAlertIcon(from.getAlertDefinition().getPriority()));
Set<AlertConditionLog> conditionLogs = from.getConditionLogs();
String conditionText;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
index afa4cdc..3384ed7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
@@ -35,6 +35,7 @@ import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
@@ -88,9 +89,9 @@ public class AlertHistoryView extends TableSection {
priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium());
priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low());
LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(3);
- priorityIcons.put(AlertPriority.HIGH.name(), "/images/icons/Flag_red_16.png");
- priorityIcons.put(AlertPriority.MEDIUM.name(), "/images/icons/Flag_yellow_16.png");
- priorityIcons.put(AlertPriority.LOW.name(), "/images/icons/Flag_blue_16.png");
+ priorityIcons.put(AlertPriority.HIGH.name(), ImageManager.getAlertIcon(AlertPriority.HIGH));
+ priorityIcons.put(AlertPriority.MEDIUM.name(), ImageManager.getAlertIcon(AlertPriority.MEDIUM));
+ priorityIcons.put(AlertPriority.LOW.name(), ImageManager.getAlertIcon(AlertPriority.LOW));
priorityFilter.setValueMap(priorities);
priorityFilter.setValueIcons(priorityIcons);
priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name(), AlertPriority.LOW.name());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
index aa59e54..a07566c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
@@ -42,6 +42,7 @@ import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -146,26 +147,9 @@ public abstract class AbstractAlertDefinitionsDataSource extends RPCDataSource<A
record.setAttribute(FIELD_DESCRIPTION, from.getDescription());
record.setAttribute(FIELD_CTIME, new Date(from.getCtime()));
record.setAttribute(FIELD_MTIME, new Date(from.getMtime()));
- if (from.getEnabled()) {
- record.setAttribute(FIELD_ENABLED, "/images/icons/availability_green_16.png");
- } else {
- record.setAttribute(FIELD_ENABLED, "/images/icons/availability_red_16.png");
- }
+ record.setAttribute(FIELD_ENABLED, ImageManager.getAvailabilityIcon(from.getEnabled()));
record.setAttribute(FIELD_DELETED, from.getDeleted());
- switch (from.getPriority()) {
- case HIGH: {
- record.setAttribute(FIELD_PRIORITY, "/images/icons/Flag_red_16.png");
- break;
- }
- case MEDIUM: {
- record.setAttribute(FIELD_PRIORITY, "/images/icons/Flag_yellow_16.png");
- break;
- }
- case LOW: {
- record.setAttribute(FIELD_PRIORITY, "/images/icons/Flag_blue_16.png");
- break;
- }
- }
+ record.setAttribute(FIELD_PRIORITY, ImageManager.getAlertIcon(from.getPriority()));
record.setAttribute(FIELD_OBJECT, from);
return record;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
index ca4c3ce..90f09f4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GeneralPropertiesAlertDefinitionForm.java
@@ -33,6 +33,7 @@ import com.smartgwt.client.widgets.form.fields.TextItem;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/**
@@ -220,9 +221,9 @@ public class GeneralPropertiesAlertDefinitionForm extends LocatableDynamicForm i
priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium());
priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low());
LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(3);
- priorityIcons.put(AlertPriority.HIGH.name(), "/images/icons/Flag_red_16.png");
- priorityIcons.put(AlertPriority.MEDIUM.name(), "/images/icons/Flag_yellow_16.png");
- priorityIcons.put(AlertPriority.LOW.name(), "/images/icons/Flag_blue_16.png");
+ priorityIcons.put(AlertPriority.HIGH.name(), ImageManager.getAlertIcon(AlertPriority.HIGH));
+ priorityIcons.put(AlertPriority.MEDIUM.name(), ImageManager.getAlertIcon(AlertPriority.MEDIUM));
+ priorityIcons.put(AlertPriority.LOW.name(), ImageManager.getAlertIcon(AlertPriority.LOW));
prioritySelection.setValueMap(priorities);
prioritySelection.setValueIcons(priorityIcons);
prioritySelection.setDefaultValue(AlertPriority.MEDIUM.name());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java
index 7f22af9..16d2891 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java
@@ -3,20 +3,17 @@ package org.rhq.enterprise.gui.coregui.client.components.table;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.Messages;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
/**
- * Formats a Boolean value as "yes" or "no".
+ * Formats a Boolean value as "yes" or "no" image.
*
* @author Ian Springer
*/
public class BooleanCellFormatter implements CellFormatter {
- private static final Messages MSG = CoreGUI.getMessages();
-
- private static String RED = "/images/icons/availability_red_16.png";
- private static String GREEN = "/images/icons/availability_green_16.png";
- private static String GREY = "/images/icons/availability_grey_16.png";
+ private static String RED = ImageManager.getAvailabilityIcon(Boolean.FALSE);
+ private static String GREEN = ImageManager.getAvailabilityIcon(Boolean.TRUE);
+ private static String GREY = ImageManager.getAvailabilityIcon(null);
public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
String result;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
index 62aba36..e2ae778 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java
@@ -35,6 +35,7 @@ import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
@@ -86,17 +87,17 @@ public class FileUploadForm extends DynamicCallbackForm {
iconLoading.setHeight(16);
iconGreen = new FormItemIcon();
- iconGreen.setSrc("/images/icons/availability_green_16.png");
+ iconGreen.setSrc(ImageManager.getAvailabilityIcon(Boolean.TRUE));
iconGreen.setWidth(16);
iconGreen.setHeight(16);
iconRed = new FormItemIcon();
- iconRed.setSrc("/images/icons/availability_red_16.png");
+ iconRed.setSrc(ImageManager.getAvailabilityIcon(Boolean.FALSE));
iconRed.setWidth(16);
iconRed.setHeight(16);
iconGrey = new FormItemIcon();
- iconGrey.setSrc("/images/icons/availability_grey_16.png");
+ iconGrey.setSrc(ImageManager.getAvailabilityIcon(null));
iconGrey.setWidth(16);
iconGrey.setHeight(16);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
index e91a4a2..3eae1f8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java
@@ -30,6 +30,7 @@ import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
@@ -104,10 +105,10 @@ public class TextFileRetrieverForm extends DynamicCallbackForm {
if (uploadButton != null) {
FormItemIcon loadedIcon = new FormItemIcon();
if (ok) {
- loadedIcon.setSrc("/images/icons/availability_green_16.png");
+ loadedIcon.setSrc(ImageManager.getAvailabilityIcon(Boolean.TRUE));
CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_success(), Severity.Info));
} else {
- loadedIcon.setSrc("/images/icons/availability_red_16.png");
+ loadedIcon.setSrc(ImageManager.getAvailabilityIcon(Boolean.FALSE));
CoreGUI.getMessageCenter().notify(new Message(MSG.view_upload_error_file(), Severity.Error));
}
loadedIcon.setWidth(16);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
index d7a545b..db6a3ec 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java
@@ -38,11 +38,11 @@ import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
import com.smartgwt.client.widgets.tree.TreeNode;
-import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.RecentlyAddedResourceComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
@@ -208,10 +208,8 @@ public class RecentlyAddedResourceDS extends DataSource {
setAttribute("parentId", parentId);
setAttribute("name", resource.getName());
setAttribute("timestamp", "");//String.valueOf(resource.getItime())); // Seems to be null
- setAttribute(
- "currentAvailability",
- resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
+ setAttribute("currentAvailability", ImageManager.getAvailabilityIconFromAvailType(resource
+ .getCurrentAvailability().getAvailabilityType()));
}
public Resource getResource() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 94865f8..cada640 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -140,35 +140,35 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
protected List<TwoLevelTab> createTabs() {
List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>();
- summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary",
- MSG.view_tabs_common_summary()), "/images/icons/Service_up_16.png");
- summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview",
- MSG.view_tabs_common_overview()), null);
- summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline",
- MSG.view_tabs_common_timeline()), null);
+ summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", MSG
+ .view_tabs_common_summary()), "/images/icons/Service_up_16.png");
+ summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview", MSG
+ .view_tabs_common_overview()), null);
+ summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline", MSG
+ .view_tabs_common_timeline()), null);
summaryTab.registerSubTabs(summaryOverview, summaryTimeline);
tabs.add(summaryTab);
- monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring",
- MSG.view_tabs_common_monitoring()), "/images/icons/Monitor_grey_16.png");
- monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs",
- MSG.view_tabs_common_graphs()), null);
- monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables",
- MSG.view_tabs_common_tables()), null);
- monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new ViewName("Traits",
- MSG.view_tabs_common_traits()), null);
-
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), new ViewName("Schedules",
- MSG.view_tabs_common_schedules()), null);
- monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), new ViewName("CallTime",
- MSG.view_tabs_common_calltime()), null);
+ monitoringTab = new TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new ViewName("Monitoring", MSG
+ .view_tabs_common_monitoring()), "/images/icons/Monitor_grey_16.png");
+ monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new ViewName("Graphs", MSG
+ .view_tabs_common_graphs()), null);
+ monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new ViewName("Tables", MSG
+ .view_tabs_common_tables()), null);
+ monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new ViewName("Traits", MSG
+ .view_tabs_common_traits()), null);
+
+ monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"), new ViewName("Schedules", MSG
+ .view_tabs_common_schedules()), null);
+ monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"), new ViewName("CallTime", MSG
+ .view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits, monitorSched, monitorCallTime);
tabs.add(monitoringTab);
- inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory",
- MSG.view_tabs_common_inventory()), "/images/icons/Inventory_grey_16.png");
- inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), new ViewName("Members",
- MSG.view_tabs_common_members()), null);
+ inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", MSG
+ .view_tabs_common_inventory()), "/images/icons/Inventory_grey_16.png");
+ inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"), new ViewName("Members", MSG
+ .view_tabs_common_members()), null);
inventoryConn = new SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
"ConnectionSettings", MSG.view_tabs_common_connectionSettings()), null);
inventoryConnHistory = new SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), new ViewName(
@@ -176,37 +176,37 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn, this.inventoryConnHistory);
tabs.add(inventoryTab);
- operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), new ViewName("Operations",
- MSG.view_tabs_common_operations()), "/images/icons/Operation_grey_16.png");
- this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
- this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), new ViewName("Scheduled",
- MSG.view_tabs_common_scheduled()), null);
+ operationsTab = new TwoLevelTab(getTabSet().extendLocatorId("Operations"), new ViewName("Operations", MSG
+ .view_tabs_common_operations()), "/images/icons/Operation_grey_16.png");
+ this.opHistory = new SubTab(operationsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.opSched = new SubTab(operationsTab.extendLocatorId("Scheduled"), new ViewName("Scheduled", MSG
+ .view_tabs_common_scheduled()), null);
operationsTab.registerSubTabs(this.opHistory, this.opSched);
tabs.add(operationsTab);
- alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts",
- MSG.view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
- this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
- this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions",
- MSG.view_tabs_common_definitions()), null);
+ alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new ViewName("Alerts", MSG
+ .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"), new ViewName("Definitions", MSG
+ .view_tabs_common_definitions()), null);
alertsTab.registerSubTabs(alertHistory, alertDef);
tabs.add(alertsTab);
configurationTab = new TwoLevelTab(getTabSet().extendLocatorId("Configuration"), new ViewName("Configuration",
MSG.view_tabs_common_configuration()), "/images/icons/Configure_grey_16.png");
- this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), new ViewName("Current",
- MSG.view_tabs_common_current()), null);
- this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.configCurrent = new SubTab(configurationTab.extendLocatorId("Current"), new ViewName("Current", MSG
+ .view_tabs_common_current()), null);
+ this.configHistory = new SubTab(configurationTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events",
- MSG.view_tabs_common_events()), "/images/icons/Events_grey_16.png");
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new ViewName("Events", MSG
+ .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"), new ViewName("History", MSG
+ .view_tabs_common_history()), null);
eventsTab.registerSubTabs(eventHistory);
tabs.add(eventsTab);
@@ -221,7 +221,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
this.groupComposite = groupComposite;
ResourceGroup group = groupComposite.getResourceGroup();
int groupId = group.getId();
- getTitleBar().setGroup(group);
+ getTitleBar().setGroup(groupComposite);
for (Tab top : this.getTabSet().getTabs()) {
((TwoLevelTab) top).getLayout().destroyViews();
@@ -234,8 +234,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
// summaryTab.updateSubTab("Overview", new DashboardView(resource));
// summaryTab.updateSubTab("Timeline", timelinePane);
// Summary tab is always visible and enabled.
- updateSubTab(this.summaryTab, this.summaryOverview,
- new OverviewView(this.summaryOverview.extendLocatorId("View"), this.groupComposite), true, true);
+ updateSubTab(this.summaryTab, this.summaryOverview, new OverviewView(this.summaryOverview
+ .extendLocatorId("View"), this.groupComposite), true, true);
if (updateTab(this.monitoringTab, groupCategory == GroupCategory.COMPATIBLE, true)) {
visible = hasMetricsOfType(this.groupComposite, DataType.MEASUREMENT);
@@ -274,8 +274,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
this.inventoryConnHistory.extendLocatorId("View"), this.groupComposite), facets
.contains(ResourceTypeFacet.PLUGIN_CONFIGURATION), true);
- if (updateTab(this.operationsTab,
- groupCategory == GroupCategory.COMPATIBLE && facets.contains(ResourceTypeFacet.OPERATION), true)) {
+ if (updateTab(this.operationsTab, groupCategory == GroupCategory.COMPATIBLE
+ && facets.contains(ResourceTypeFacet.OPERATION), true)) {
updateSubTab(this.operationsTab, this.opHistory, new FullHTMLPane(this.opHistory.extendLocatorId("View"),
"/rhq/group/operation/groupOperationHistory-plain.xhtml?groupId=" + groupId), true, true);
updateSubTab(this.operationsTab, this.opSched, new FullHTMLPane(this.opSched.extendLocatorId("View"),
@@ -285,8 +285,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
// alerts tab is always visible, even for mixed groups
if (updateTab(this.alertsTab, true, true)) {
// alert history is always available
- updateSubTab(this.alertsTab, this.alertHistory,
- GroupAlertHistoryView.get(this.alertHistory.extendLocatorId("View"), groupComposite), true, true);
+ updateSubTab(this.alertsTab, this.alertHistory, GroupAlertHistoryView.get(this.alertHistory
+ .extendLocatorId("View"), groupComposite), true, true);
// but alert definitions can only be created on compatible groups
visible = (groupCategory == GroupCategory.COMPATIBLE);
canvas = (visible) ? new GroupAlertDefinitionsView(alertDef.extendLocatorId("View"), this.groupComposite)
@@ -301,16 +301,16 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
// "/rhq/group/configuration/viewCurrent-plain.xhtml?groupId=" + groupId), true, true);
updateSubTab(this.configurationTab, this.configCurrent, new GroupResourceConfigurationEditView(
this.configCurrent.extendLocatorId("View"), this.groupComposite), true, true);
- updateSubTab(this.configurationTab, this.configHistory,
- new FullHTMLPane(this.configHistory.extendLocatorId("View"),
- "/rhq/group/configuration/history-plain.xhtml?groupId=" + groupId), true, true);
+ updateSubTab(this.configurationTab, this.configHistory, new FullHTMLPane(this.configHistory
+ .extendLocatorId("View"), "/rhq/group/configuration/history-plain.xhtml?groupId=" + groupId), true,
+ true);
}
// allow mixed groups to show events from supporting resources
visible = groupCategory == GroupCategory.MIXED
|| (groupCategory == GroupCategory.COMPATIBLE && facets.contains(ResourceTypeFacet.EVENT));
if (updateTab(this.eventsTab, visible, true)) {
- updateSubTab(this.eventsTab, this.eventHistory,
- EventCompositeHistoryView.get(this.eventHistory.extendLocatorId("View"), groupComposite), true, true);
+ updateSubTab(this.eventsTab, this.eventHistory, EventCompositeHistoryView.get(this.eventHistory
+ .extendLocatorId("View"), groupComposite), true, true);
}
this.show();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index a623c4b..a81f98e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -32,12 +32,12 @@ import com.smartgwt.client.widgets.events.ClickHandler;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
-import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
@@ -89,7 +89,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
this.title = new HTMLFlow();
this.title.setWidth("*");
- this.availabilityImage = new Img("resources/availability_grey_24.png", 24, 24);
+ this.availabilityImage = new Img(ImageManager.getAvailabilityLargeIcon(null), 24, 24);
this.favoriteButton = new LocatableImg(this.extendLocatorId("Favorite"), NOT_FAV_ICON, 24, 24);
@@ -119,7 +119,11 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
.valueOf(ResourceGroupTitleBar.this.group.getId())));
return;
}
- generalProperties = new GeneralProperties(extendLocatorId("genProps"), result.get(0));
+
+ ResourceGroupComposite resultComposite = result.get(0);
+ setGroupIcons(resultComposite);
+
+ generalProperties = new GeneralProperties(extendLocatorId("genProps"), resultComposite);
generalProperties.setVisible(false);
ResourceGroupTitleBar.this.addMember(generalProperties);
expandCollapseArrow.addClickHandler(new ClickHandler() {
@@ -202,8 +206,8 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
});
}
- public void setGroup(ResourceGroup group) {
- this.group = group;
+ public void setGroup(ResourceGroupComposite groupComposite) {
+ this.group = groupComposite.getResourceGroup();
update();
this.title.setContents("<span class=\"SectionHeader\">" + group.getName()
@@ -213,19 +217,16 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
this.favorite = favorites.contains(group.getId());
updateFavoriteButton();
- this.availabilityImage.setSrc("resources/availability_" + (true ? "green" : "red") + //todo
- "_24.png");
-
- String category = this.group.getGroupCategory() == GroupCategory.COMPATIBLE ? "Cluster" : "Group";
-
- String avail = "up"; // todo
- // (resource.getCurrentAvailability() != null && resource.getCurrentAvailability().getAvailabilityType() != null)
- // ? (resource.getCurrentAvailability().getAvailabilityType().name().toLowerCase()) : "down";
- badge.setSrc("types/" + category + "_" + avail + "_24.png");
-
+ setGroupIcons(groupComposite);
markForRedraw();
}
+ private void setGroupIcons(ResourceGroupComposite groupComposite) {
+ Double avails = groupComposite.getExplicitAvail();
+ this.badge.setSrc(ImageManager.getGroupLargeIcon(this.group.getGroupCategory(), avails));
+ this.availabilityImage.setSrc(ImageManager.getAvailabilityGroupLargeIcon(avails));
+ }
+
private void updateFavoriteButton() {
this.favoriteButton.setSrc(favorite ? FAV_ICON : NOT_FAV_ICON);
if (favorite) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
index 32f363f..7567f58 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
@@ -46,6 +46,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
@@ -112,10 +113,14 @@ public class HistoryGroupPluginConfigurationMembers extends LocatableVLayout {
fieldStatus.setType(ListGridFieldType.ICON);
HashMap<String, String> statusIcons = new HashMap<String, String>(4);
- statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), "/images/icons/Connection_ok_16.png");
- statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), "/images/icons/Connection_failed_16.png");
- statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), "/images/icons/Connection_inprogress_16.png");
- statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), "/images/icons/Connection_16.png");
+ statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.SUCCESS));
+ statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.FAILURE));
+ statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS));
+ statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE));
fieldStatus.setValueIcons(statusIcons);
fieldStatus.addRecordClickHandler(new RecordClickHandler() {
@Override
@@ -169,7 +174,6 @@ public class HistoryGroupPluginConfigurationMembers extends LocatableVLayout {
listGrid.setLinkTextProperty("resourceName");
-
}
private String getStatusHtmlString(Record record) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
index 4639767..11149f9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
@@ -48,6 +48,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
@@ -92,10 +93,14 @@ public class HistoryGroupPluginConfigurationTable extends Table {
fieldStatus.setType(ListGridFieldType.ICON);
HashMap<String, String> statusIcons = new HashMap<String, String>(4);
- statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), "/images/icons/Connection_ok_16.png");
- statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), "/images/icons/Connection_failed_16.png");
- statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), "/images/icons/Connection_inprogress_16.png");
- statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), "/images/icons/Connection_16.png");
+ statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.SUCCESS));
+ statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.FAILURE));
+ statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS));
+ statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), ImageManager
+ .getPluginConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE));
fieldStatus.setValueIcons(statusIcons);
fieldStatus.addRecordClickHandler(new RecordClickHandler() {
@Override
@@ -201,7 +206,6 @@ public class HistoryGroupPluginConfigurationTable extends Table {
}
});
-
}
private String getStatusHtmlString(Record record) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
index 33dd19b..bf6d251 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java
@@ -27,6 +27,7 @@ import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -160,12 +161,8 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite
record.setAttribute(CATEGORY.propertyName(), res.getResourceType().getCategory().name());
record.setAttribute("icon", res.getResourceType().getCategory().getDisplayName() + "_"
+ (res.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "up" : "down") + "_16.png");
-
- record
- .setAttribute(
- AVAILABILITY.propertyName(),
- res.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
+ record.setAttribute(AVAILABILITY.propertyName(), ImageManager.getAvailabilityIconFromAvailType(res
+ .getCurrentAvailability().getAvailabilityType()));
record.setAttribute("resourcePersmission", from.getResourcePermission());
return record;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
index 515c0b5..d2593a5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java
@@ -44,6 +44,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
@@ -168,12 +169,8 @@ public class ResourceDatasource extends RPCDataSource<Resource> {
record.setAttribute(CATEGORY.propertyName(), from.getResourceType().getCategory().name());
record.setAttribute("icon", from.getResourceType().getCategory().getDisplayName() + "_"
+ (from.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "up" : "down") + "_16.png");
-
- record
- .setAttribute(
- AVAILABILITY.propertyName(),
- from.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
+ record.setAttribute(AVAILABILITY.propertyName(), ImageManager.getAvailabilityIconFromAvailType(from
+ .getCurrentAvailability().getAvailabilityType()));
return record;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
index db193e1..c54c0ff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
@@ -42,13 +42,13 @@ import com.smartgwt.client.types.DSProtocol;
import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceSubCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
@@ -334,10 +334,8 @@ public class NewResourceTreeDataSource extends DataSource {
setAttribute("name", resource.getName());
// setAttribute("description", resource.getDescription());
- setAttribute(
- "currentAvailability",
- resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "/images/icons/availability_green_16.png"
- : "/images/icons/availability_red_16.png");
+ setAttribute("currentAvailability", ImageManager.getAvailabilityIconFromAvailType(resource
+ .getCurrentAvailability().getAvailabilityType()));
setIsFolder((resource.getResourceType().getChildResourceTypes() != null && !resource.getResourceType()
.getChildResourceTypes().isEmpty()));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index 2054855..a4f9897 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -41,13 +41,13 @@ import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceError;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
@@ -116,7 +116,7 @@ public class ResourceTitleBar extends LocatableVLayout {
this.title = new HTMLFlow();
this.title.setWidth("*");
- this.availabilityImage = new Img("resources/availability_grey_24.png", 24, 24);
+ this.availabilityImage = new Img(ImageManager.getAvailabilityLargeIcon(null), 24, 24);
this.favoriteButton = new LocatableImg(this.extendLocatorId("Favorite"), NOT_FAV_ICON, 24, 24);
@@ -312,9 +312,8 @@ public class ResourceTitleBar extends LocatableVLayout {
this.favorite = favorites.contains(resource.getId());
updateFavoriteButton();
- this.availabilityImage.setSrc("resources/availability_"
- + (resource.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "green" : "red")
- + "_24.png");
+ this.availabilityImage.setSrc(ImageManager.getAvailabilityLargeIconFromAvailType(resource
+ .getCurrentAvailability().getAvailabilityType()));
String category = this.resource.getResourceType().getCategory().getDisplayName();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java
index f398136..d113ae8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java
@@ -32,6 +32,7 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -104,7 +105,7 @@ public class OverviewView extends LocatableVLayout {
//agent-comm-status
String agentComStatus = "agent-comm-status";
agentStatusIcon = new FormItemIcon();
- agentStatusIcon.setSrc("resources/availability_grey_24.png");
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(null));
agentStatus = new StaticTextItem(agentComStatus, MSG.view_inventory_summary_agent_status_title());
agentStatus.setIcons(agentStatusIcon);
agentStatus.setWrapTitle(false);
@@ -119,7 +120,7 @@ public class OverviewView extends LocatableVLayout {
@Override
public void onSuccess(Boolean result) {
//update icon with correct status
- agentStatusIcon.setSrc("resources/availability_" + (result ? "green" : "red") + "_24.png");
+ agentStatusIcon.setSrc(ImageManager.getAvailabilityLargeIcon(result));
currentAgentInfo.markForRedraw();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
index 1278490..d843ba3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
@@ -76,7 +76,7 @@ public class ResourceSelector extends AbstractSelector<Resource> {
typeSelectItem.setCanSelectParentItems(true);
typeSelectItem.setLoadDataOnDemand(false);
typeSelectItem.setEmptyMenuMessage(MSG.common_msg_loading());
- typeSelectItem.setShowIcons(true);
+ typeSelectItem.setShowIcons(false);
if (this.forceResourceTypeFilter) {
typeSelectItem.setDisabled(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
index 1bab7a8..71b7310 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
@@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.operation;
import java.util.Date;
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -35,6 +34,7 @@ import org.rhq.core.domain.operation.OperationRequestStatus;
import org.rhq.core.domain.operation.composite.ResourceOperationLastCompletedComposite;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OperationsPortlet;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -61,7 +61,7 @@ public class RecentOperationsDataSource extends
//config attributes
private boolean operationsRangeLastEnabled = false;
- private int operationsRangeCompleted = -1;
+ private int operationsRangeCompleted = -1;
/** Build list of fields for the datasource and then adds them to it.
*/
@@ -76,25 +76,25 @@ public class RecentOperationsDataSource extends
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE,
- MSG.dataSource_recentOperations_field_resource());
+ DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, MSG
+ .dataSource_recentOperations_field_resource());
resourceField.setPrimaryKey(true);
fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION,
- MSG.dataSource_recentOperations_field_location(), 200);
+ DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, MSG
+ .dataSource_recentOperations_field_location(), 200);
fields.add(locationField);
- DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION,
- MSG.dataSource_recentOperations_field_operation());
+ DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION, MSG
+ .dataSource_recentOperations_field_operation());
fields.add(operationField);
- DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME,
- MSG.dataSource_recentOperations_field_time());
+ DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME, MSG
+ .dataSource_recentOperations_field_time());
fields.add(timeField);
- DataSourceTextField statusField = new DataSourceTextField(FIELD_STATUS,
- MSG.dataSource_recentOperations_field_status());
+ DataSourceTextField statusField = new DataSourceTextField(FIELD_STATUS, MSG
+ .dataSource_recentOperations_field_status());
fields.add(statusField);
return fields;
@@ -170,9 +170,9 @@ public class RecentOperationsDataSource extends
for (DisambiguationReport<ResourceOperationLastCompletedComposite> report : list) {
ListGridRecord record = new ListGridRecord();
//disambiguated Resource name, decorated with html anchors to problem resources
- record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal()
- .getResourceId(), true));
+ record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(
+ ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(), report.getOriginal().getResourceName(),
+ report.getOriginal().getResourceId(), true));
//disambiguated resource lineage, decorated with html anchors
record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true));
//operation name.
@@ -195,20 +195,24 @@ public class RecentOperationsDataSource extends
*/
private String generateResourceOperationStatusLink(
DisambiguationReport<ResourceOperationLastCompletedComposite> report) {
- //TODO: refactor this out for more general case
- String link = "<a href='" + "/rhq/resource/operation/resourceOperationHistoryDetails-plain.xhtml?id="
- + report.getOriginal().getResourceId() + "&opId=" + report.getOriginal().getResourceId() + "'>";
- String img = "<img alt='" + report.getOriginal().getOperationStatus() + "' title='"
- + report.getOriginal().getOperationStatus() + "' src='/images/icons/";
+
+ String iconLink;
if (report.getOriginal().getOperationStatus().compareTo(OperationRequestStatus.SUCCESS) == 0) {
- img += "availability_green_16.png'";
+ iconLink = ImageManager.getAvailabilityIcon(Boolean.TRUE);
} else if (report.getOriginal().getOperationStatus().compareTo(OperationRequestStatus.FAILURE) == 0) {
- img += "availability_red_16.png";
+ iconLink = ImageManager.getAvailabilityIcon(Boolean.FALSE);
} else if (report.getOriginal().getOperationStatus().compareTo(OperationRequestStatus.CANCELED) == 0) {
- img += "availability_yellow_16.png";
+ iconLink = ImageManager.getAvailabilityYellowIcon();
} else {
- img += "availability_grey_16.png";
+ iconLink = ImageManager.getAvailabilityIcon(null);
}
+
+ //TODO: refactor this out for more general case
+ String link = "<a href='" + "/rhq/resource/operation/resourceOperationHistoryDetails-plain.xhtml?id="
+ + report.getOriginal().getResourceId() + "&opId=" + report.getOriginal().getResourceId() + "'>";
+ String img = "<img alt='" + report.getOriginal().getOperationStatus() + "' title='"
+ + report.getOriginal().getOperationStatus() + "' src='";
+ img += iconLink;
link = link + img + "'></img></a>";
return link;
}
@@ -221,8 +225,8 @@ public class RecentOperationsDataSource extends
@Override
public ListGridRecord copyValues(DisambiguationReport<ResourceOperationLastCompletedComposite> from) {
ListGridRecord record = new ListGridRecord();
- record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true));
+ record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from
+ .getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true));
record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true));
record.setAttribute(FIELD_OPERATION, from.getOriginal().getOperationName());
record.setAttribute(FIELD_TIME, from.getOriginal().getOperationStartTime());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
index 4763217..b21b0bf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
@@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.resource;
*/
import java.util.List;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -30,10 +29,10 @@ import com.smartgwt.client.data.fields.DataSourceImageField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.composite.ProblemResourceComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.problems.ProblemResourcesPortlet;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -74,21 +73,21 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE,
- MSG.dataSource_problemResources_field_resource());
+ DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, MSG
+ .dataSource_problemResources_field_resource());
resourceField.setPrimaryKey(true);
fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION,
- MSG.dataSource_problemResources_field_location());
+ DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, MSG
+ .dataSource_problemResources_field_location());
fields.add(locationField);
- DataSourceTextField alertsField = new DataSourceTextField(FIELD_ALERTS,
- MSG.dataSource_problemResources_field_alerts());
+ DataSourceTextField alertsField = new DataSourceTextField(FIELD_ALERTS, MSG
+ .dataSource_problemResources_field_alerts());
fields.add(alertsField);
- DataSourceImageField availabilityField = new DataSourceImageField(FIELD_AVAILABLE,
- MSG.dataSource_problemResources_field_available());
+ DataSourceImageField availabilityField = new DataSourceImageField(FIELD_AVAILABLE, MSG
+ .dataSource_problemResources_field_available());
fields.add(availabilityField);
return fields;
@@ -159,19 +158,16 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo
for (DisambiguationReport<ProblemResourceComposite> report : list) {
ListGridRecord record = new ListGridRecord();
//disambiguated Resource name, decorated with html anchors to problem resources
- record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal()
- .getResourceId(), true));
+ record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(
+ ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(), report.getOriginal().getResourceName(),
+ report.getOriginal().getResourceId(), true));
//disambiguated resource lineage, decorated with html anchors
record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true));
//alert cnt.
record.setAttribute(FIELD_ALERTS, report.getOriginal().getNumAlerts());
//populate availability icon
- if (report.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) == 0) {
- record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_red_16.png");
- } else {
- record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_green_16.png");
- }
+ record.setAttribute(FIELD_AVAILABLE, ImageManager.getAvailabilityIconFromAvailType(report.getOriginal()
+ .getAvailabilityType()));
dataValues[indx++] = record;
}
@@ -182,15 +178,12 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo
@Override
public ListGridRecord copyValues(DisambiguationReport<ProblemResourceComposite> from) {
ListGridRecord record = new ListGridRecord();
- record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true));
+ record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from
+ .getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true));
record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true));
record.setAttribute(FIELD_ALERTS, from.getOriginal().getNumAlerts());
- if (from.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) == 0) {
- record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_red_16.png");
- } else {
- record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_green_16.png");
- }
+ record.setAttribute(FIELD_AVAILABLE, ImageManager.getAvailabilityIconFromAvailType(from.getOriginal()
+ .getAvailabilityType()));
record.setAttribute("entity", from);
return record;
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_16.png
new file mode 100644
index 0000000..f595d09
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_24.png
new file mode 100644
index 0000000..d3755f6
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_24.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_failed_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_failed_16.png
new file mode 100644
index 0000000..e926a22
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_failed_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_inprogress_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_inprogress_16.png
new file mode 100644
index 0000000..3754265
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_inprogress_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_ok_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_ok_16.png
new file mode 100644
index 0000000..32137ac
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_ok_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_warning_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_warning_16.png
new file mode 100644
index 0000000..0b5c56b
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Connection_warning_16.png differ
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 20 +++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java | 28 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 15 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java | 3 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 12 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java | 4 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 5 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 28 ++--------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 16 ++++-
17 files changed, 93 insertions(+), 53 deletions(-)
New commits:
commit a1ebd5844f059352b0b9fc4b73bd6ed807c8e87c
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 29 12:44:29 2010 -0500
i18n selector grid titles; make names links in user and role list views; fix column widths in group list view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index f425e77..c3e9309 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -22,6 +22,10 @@
*/
package org.rhq.enterprise.gui.coregui.client;
+import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView;
+import org.rhq.enterprise.gui.coregui.client.admin.users.UsersView;
+
/**
* @author Greg Hinkle
*/
@@ -57,6 +61,22 @@ public class LinkManager {
}
}
+ public static String getUserLink(int subjectId) {
+ if (GWT) {
+ return "#" + UsersView.VIEW_PATH + "/" + subjectId;
+ } else {
+ return "/admin/user/UserAdmin.do?mode=view&u=" + subjectId;
+ }
+ }
+
+ public static String getRoleLink(int roleId) {
+ if (GWT) {
+ return "#" + RolesView.VIEW_PATH + "/" + roleId;
+ } else {
+ return "/admin/role/RoleAdmin.do?mode=view&r=" + roleId;
+ }
+ }
+
public static String getSubsystemConfigurationLink() {
return "/rhq/subsystem/configurationUpdate.xhtml";
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
index fbaf720..bedccff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsItem.java
@@ -138,13 +138,7 @@ public class PermissionsItem extends CanvasItem {
// TODO: Add table title.
- ListGridField iconField = new ListGridField("icon", " ", 40);
- iconField.setShowDefaultContextMenu(false);
- iconField.setAlign(Alignment.CENTER);
- iconField.setType(ListGridFieldType.IMAGE);
- iconField.setImageURLSuffix("_16.png");
- iconField.setImageWidth(16);
- iconField.setImageHeight(16);
+ ListGridField iconField = createIconField();
ListGridField nameField = new ListGridField("name");
nameField.setHidden(true);
@@ -182,13 +176,7 @@ public class PermissionsItem extends CanvasItem {
ListGrid grid = createPermissionsGrid();
// TODO: Add table title.
- ListGridField iconField = new ListGridField("icon", " ", 40);
- iconField.setShowDefaultContextMenu(false);
- iconField.setAlign(Alignment.CENTER);
- iconField.setType(ListGridFieldType.IMAGE);
- iconField.setImageURLSuffix("_16.png");
- iconField.setImageWidth(16);
- iconField.setImageHeight(16);
+ ListGridField iconField = createIconField();
ListGridField readNameField = new ListGridField("readName");
readNameField.setHidden(true);
@@ -276,6 +264,18 @@ public class PermissionsItem extends CanvasItem {
return grid;
}
+ private ListGridField createIconField() {
+ ListGridField iconField = new ListGridField("icon", " ", 28);
+ iconField.setShowDefaultContextMenu(false);
+ iconField.setCanSort(false);
+ iconField.setAlign(Alignment.CENTER);
+ iconField.setType(ListGridFieldType.IMAGE);
+ iconField.setImageURLSuffix("_16.png");
+ iconField.setImageWidth(16);
+ iconField.setImageHeight(16);
+ return iconField;
+ }
+
private ListGrid createPermissionsGrid() {
ListGrid grid = new ListGrid();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
index f8f9b5a..ed9216b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
@@ -219,7 +219,6 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen
TextItem descriptionItem = new TextItem(RolesDataSource.Field.DESCRIPTION, MSG.common_title_description());
descriptionItem.setColSpan(form.getNumCols());
- descriptionItem.setWidth("*");
items.add(descriptionItem);
permissionsItem = new PermissionsItem(this);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
index 3cc5e4b..df60177 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
@@ -167,7 +167,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>>
@Override
protected String getItemTitle() {
- return "group";
+ return MSG.common_title_groups();
}
public class LdapGroupsDataSource extends RPCDataSource<PageList<LdapGroup>> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java
index 305b5bf..4e898e1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java
@@ -59,7 +59,7 @@ public class RoleSubjectSelector extends AbstractSelector<Subject> {
@Override
protected String getItemTitle() {
- return MSG.common_title_user();
+ return MSG.common_title_users();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
index bde77b4..e615429 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
@@ -23,17 +23,21 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A table that lists all roles and provides the ability to view details of or delete those roles and to create new
@@ -45,6 +49,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
public class RolesView extends TableSection<RolesDataSource> implements BookmarkableView {
public static final ViewName VIEW_ID = new ViewName("Roles", MSG.view_adminSecurity_roles());
+ public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
+ + AdministrationView.SECTION_SECURITY_VIEW_ID + "/" + VIEW_ID;
// TODO: We need a 24x24 version of the Role icon.
private static final String HEADER_ICON = "global/Role_16.png";
@@ -62,8 +68,15 @@ public class RolesView extends TableSection<RolesDataSource> implements Bookmark
super.configureTable();
ListGridField nameField = new ListGridField(RolesDataSource.Field.NAME, 150);
+ nameField.setCellFormatter(new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int i, int i1) {
+ Integer roleId = getId(record);
+ String roleUrl = LinkManager.getRoleLink(roleId);
+ return SeleniumUtility.getLocatableHref(roleUrl, value.toString(), null);
+ }
+ });
- ListGridField descriptionField = new ListGridField(RolesDataSource.Field.DESCRIPTION, 600);
+ ListGridField descriptionField = new ListGridField(RolesDataSource.Field.DESCRIPTION);
setListGridFields(nameField, descriptionField);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java
index e2d253d..df5036c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java
@@ -23,7 +23,6 @@
package org.rhq.enterprise.gui.coregui.client.admin.users;
import com.smartgwt.client.data.Criteria;
-import com.smartgwt.client.data.Record;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -61,7 +60,7 @@ public class SubjectRoleSelector extends AbstractSelector<Role> {
@Override
protected String getItemTitle() {
- return "role";
+ return MSG.common_title_roles();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
index 7a68363..b8d7a56 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -25,17 +25,20 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A table that lists all users and provides the ability to view or edit details of users, delete users, or create new
@@ -76,7 +79,14 @@ public class UsersView extends TableSection<UsersDataSource> {
private List<ListGridField> createFields() {
List<ListGridField> fields = new ArrayList<ListGridField>();
- ListGridField nameField = new ListGridField(UsersDataSource.Field.NAME, 120);
+ ListGridField nameField = new ListGridField(UsersDataSource.Field.NAME, 150);
+ nameField.setCellFormatter(new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int i, int i1) {
+ Integer subjectId = getId(record);
+ String userUrl = LinkManager.getUserLink(subjectId);
+ return SeleniumUtility.getLocatableHref(userUrl, value.toString(), null);
+ }
+ });
fields.add(nameField);
ListGridField activeField = new ListGridField(UsersDataSource.Field.FACTIVE, 90);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
index a0d3e52..606da75 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java
@@ -186,7 +186,7 @@ public class SystemRolesNotificationSenderForm extends AbstractNotificationSende
@Override
protected String getItemTitle() {
- return "role";
+ return MSG.common_title_roles();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java
index 894965b..726bdc5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java
@@ -187,7 +187,7 @@ public class SystemUsersNotificationSenderForm extends AbstractNotificationSende
@Override
protected String getItemTitle() {
- return "user";
+ return MSG.common_title_users();
}
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
index e4799ae..ab5b00d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java
@@ -96,6 +96,6 @@ public class BundleSelector extends AbstractSelector<Bundle> {
@Override
protected String getItemTitle() {
- return "bundle";
+ return MSG.common_title_bundles();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java
index 6d76f2c..350c2d4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java
@@ -86,7 +86,7 @@ public class EnhancedDynamicForm extends LocatableDynamicForm {
//setPadding(13);
// Default to 4 columns, i.e.: itemOneTitle | itemOneValue | itemTwoTitle | itemTwoValue
setNumCols(4);
- setColWidths(100, 220, 100, 220);
+ setColWidths(100, 200, 100, 200);
//setTitleWidth(100);
setWrapItemTitles(false);
@@ -224,7 +224,7 @@ public class EnhancedDynamicForm extends LocatableDynamicForm {
}
//item.setWidth("*"); // this causes a JavaScript exception ... :-(
- item.setWidth(199);
+ item.setWidth(195);
}
super.setFields((FormItem[]) itemsList.toArray(new FormItem[itemsList.size()]));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
index 7862d50..68671e7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
@@ -476,6 +476,11 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
return "name";
}
+ /**
+ * Return the item title (i.e. display name), which should be plural and capitalized, e.g. "Resource Groups", "Roles".
+ *
+ * @return the item title (i.e. display name), which should be plural and capitalized, e.g. "Resource Groups", "Roles"
+ */
protected abstract String getItemTitle();
protected String getAvailableItemsGridTitle() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 3748bbf..88e78f4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -27,7 +27,6 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGro
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
-import com.smartgwt.client.types.AutoFitWidthApproach;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -75,7 +74,7 @@ public class ResourceGroupListView extends Table {
@Override
protected void configureTable() {
- ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title());
+ ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(), 250);
nameField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord record, int i, int i1) {
String groupId = record.getAttribute("id");
@@ -84,35 +83,22 @@ public class ResourceGroupListView extends Table {
}
});
- ListGridField idField = new ListGridField("id", MSG.common_title_id());
ListGridField descriptionField = new ListGridField(DESCRIPTION.propertyName(), DESCRIPTION.title());
- ListGridField typeNameField = new ListGridField(TYPE.propertyName(), TYPE.title());
- ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(), PLUGIN.title());
- ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title());
+ ListGridField typeNameField = new ListGridField(TYPE.propertyName(), TYPE.title(), 130);
+ ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(), PLUGIN.title(), 100);
+ ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title(), 60);
ListGridField availabilityChildrenField = new ListGridField("availabilityChildren", MSG
- .view_inventory_groups_children());
+ .view_inventory_groups_children(), 70);
availabilityChildrenField.setWrap(false);
availabilityChildrenField.setAlign(Alignment.CENTER);
ListGridField availabilityDescendantsField = new ListGridField("availabilityDescendents", MSG
- .view_inventory_groups_descendants());
+ .view_inventory_groups_descendants(), 70);
availabilityDescendantsField.setWrap(false);
availabilityDescendantsField.setAlign(Alignment.CENTER);
- nameField.setWidth("50%");
- descriptionField.setWidth("50%");
- typeNameField.setWidth(75);
- pluginNameField.setAutoFitWidth(true);
- pluginNameField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
- categoryField.setAutoFitWidth(true);
- categoryField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
- availabilityChildrenField.setAutoFitWidth(true);
- availabilityChildrenField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
- availabilityDescendantsField.setAutoFitWidth(true);
- availabilityDescendantsField.setAutoFitWidthApproach(AutoFitWidthApproach.BOTH);
-
- setListGridFields(false, idField, nameField, descriptionField, typeNameField, pluginNameField, categoryField,
+ setListGridFields(false, nameField, descriptionField, typeNameField, pluginNameField, categoryField,
availabilityChildrenField, availabilityDescendantsField);
addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG.common_msg_areYouSure(),
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index c58fa89..fb38770 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -164,7 +164,7 @@ public class ResourceSearchView extends Table {
}
});
- ListGridField availabilityField = new ListGridField(AVAILABILITY.propertyName(), AVAILABILITY.title(), 55);
+ ListGridField availabilityField = new ListGridField(AVAILABILITY.propertyName(), AVAILABILITY.title(), 70);
availabilityField.setType(ListGridFieldType.IMAGE);
availabilityField.setAlign(Alignment.CENTER);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java
index 30a4bea..aaee31e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java
@@ -79,7 +79,7 @@ public class ResourceGroupSelector extends AbstractSelector<ResourceGroup> {
@Override
protected String getItemTitle() {
- return "group";
+ return MSG.common_title_groups();
}
// protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 0fb9be2..347ea5a 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -76,6 +76,8 @@ common_title_availability = Availability~
common_title_average_metrics=Average Metrics per Minute~
common_title_available_resources=Available Resources~
common_title_background=Background~
+common_title_bundle = Bundle~
+common_title_bundles = Bundles~
common_title_category = Category~
common_title_columns=Columns~
common_title_configuration = Configuration~
@@ -96,6 +98,8 @@ common_title_enabled=Enabled?~
common_title_end = End~
common_title_favorites=Favorites~
common_title_generalProp = General Properties~
+common_title_group = Group~
+common_title_groups = Groups~
common_title_group_def_total=Group Definition Total~
common_title_icon = ~
common_title_id = ID~
@@ -131,10 +135,13 @@ common_title_recent_operations=Recent Operations~
common_title_remove_column=Remove Column~
common_title_repositories=Repositories~
common_title_resource = Resource~
+common_title_resources = Resources~
common_title_resource_group = Resource Group~
common_title_resource_inventory=Resource Inventory~
common_title_resource_id=Resource ID~
common_title_resource_name=Resource Name~
+common_title_role = Role~
+common_title_roles = Roles~
common_title_search = Search~
common_title_scheduled_operations = Scheduled Operations~
common_title_selected_resources = Selected Resources~
@@ -155,7 +162,8 @@ common_title_timestamp = Date/Time~
common_title_total = Total~
common_title_type = Type~
common_title_units = Units~
-common_title_user=User~
+common_title_user = User~
+common_title_users = Users~
common_title_value = Value~
common_title_version = Version~
common_title_view_mode = View Mode~
@@ -183,9 +191,9 @@ common_val_none = None~
# Common Alert Priorities
#------------------------
-common_alert_high=HIGH
-common_alert_medium=MEDIUM
-common_alert_low=LOW
+common_alert_high = HIGH
+common_alert_medium = MEDIUM
+common_alert_low = LOW
# Common Calendar
#--------------
1
0
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java | 24 -
modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/MetadataTest.groovy | 5
modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy | 182 ++++++++++
3 files changed, 199 insertions(+), 12 deletions(-)
New commits:
commit 45ca087390b49ec594bcf045dc81f4e12e5385fb
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 29 12:20:04 2010 -0500
Adding tests for PluginManagerBean
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java
index 9ac0dd9..b948ab9 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java
@@ -303,7 +303,7 @@ public class PluginManagerBean implements PluginManagerLocal {
}
@RequiredPermission(Permission.MANAGE_SETTINGS)
- public boolean registerPluginTypes(Subject subject, Plugin plugin, PluginDescriptor pluginDescriptor,
+ public boolean registerPluginTypes(Subject subject, Plugin newPlugin, PluginDescriptor pluginDescriptor,
File pluginFile, boolean forceUpdate) throws Exception {
// TODO GH: Consider how to remove features from plugins in updates without breaking everything
@@ -313,38 +313,38 @@ public class PluginManagerBean implements PluginManagerLocal {
boolean typesUpdated = false;
try {
- existingPlugin = getPlugin(plugin.getName());
+ existingPlugin = getPlugin(newPlugin.getName());
} catch (NoResultException nre) {
newOrUpdated = true; // this is expected for new plugins
}
if (existingPlugin != null) {
- Plugin obsolete = AgentPluginDescriptorUtil.determineObsoletePlugin(plugin, existingPlugin);
+ Plugin obsolete = AgentPluginDescriptorUtil.determineObsoletePlugin(newPlugin, existingPlugin);
if (obsolete == existingPlugin) { // yes, use == for reference equality
newOrUpdated = true;
}
- plugin.setId(existingPlugin.getId());
- plugin.setEnabled(existingPlugin.isEnabled());
+ newPlugin.setId(existingPlugin.getId());
+ newPlugin.setEnabled(existingPlugin.isEnabled());
}
// If this is a brand new plugin, it gets "updated" too.
if (newOrUpdated) {
- if (plugin.getDisplayName() == null) {
- plugin.setDisplayName(plugin.getName());
+ if (newPlugin.getDisplayName() == null) {
+ newPlugin.setDisplayName(newPlugin.getName());
}
- plugin = updatePluginExceptContent(plugin);
+ newPlugin = updatePluginExceptContent(newPlugin);
if (pluginFile != null) {
entityManager.flush();
- streamPluginFileContentToDatabase(plugin.getId(), pluginFile);
+ streamPluginFileContentToDatabase(newPlugin.getId(), pluginFile);
}
- log.debug("Updated plugin entity [" + plugin + "]");
+ log.debug("Updated plugin entity [" + newPlugin + "]");
}
- if (newOrUpdated || forceUpdate || !PLUGIN_METADATA_MANAGER.getPluginNames().contains(plugin.getName())) {
+ if (newOrUpdated || forceUpdate || !PLUGIN_METADATA_MANAGER.getPluginNames().contains(newPlugin.getName())) {
Set<ResourceType> rootResourceTypes = PLUGIN_METADATA_MANAGER.loadPlugin(pluginDescriptor);
if (rootResourceTypes == null) {
- throw new Exception("Failed to load plugin [" + plugin.getName() + "].");
+ throw new Exception("Failed to load plugin [" + newPlugin.getName() + "].");
}
if (newOrUpdated || forceUpdate) {
// Only merge the plugin's ResourceTypes into the DB if the plugin is new or updated or we were forced to
diff --git a/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/MetadataTest.groovy b/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/MetadataTest.groovy
index 59d510b..b1dba37 100644
--- a/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/MetadataTest.groovy
+++ b/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/MetadataTest.groovy
@@ -47,6 +47,11 @@ class MetadataTest extends AbstractEJB3Test {
prepareScheduler()
}
+ /**
+ * Need to delete rows from RHQ_PLUGINS because subsequent tests in server/jar would otherwise fail. Some tests
+ * look at what plugins are in the database, and then look for corresponding plugin files on the file system.
+ * MetadataTest however removes the generated plugin files during each test run.
+ */
@AfterGroups(groups = ['plugin.metadata'])
void removePluginsFromDB() {
unprepareScheduler()
diff --git a/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy b/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy
new file mode 100644
index 0000000..26eea7d
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/groovy/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.groovy
@@ -0,0 +1,182 @@
+package org.rhq.enterprise.server.resource.metadata
+
+import org.testng.annotations.Test
+import org.rhq.enterprise.server.util.LookupUtil
+import org.testng.annotations.BeforeMethod
+import org.rhq.enterprise.server.auth.SubjectManagerLocal
+import org.rhq.core.domain.plugin.Plugin
+import javax.ejb.EJBException
+import org.rhq.core.domain.plugin.PluginDeploymentType
+import org.rhq.core.domain.plugin.PluginStatusType
+
+class PluginManagerBeanTest extends MetadataTest {
+
+ SubjectManagerLocal subjectMgr
+
+ PluginManagerLocal pluginMgr
+
+ @BeforeMethod
+ void initTest() {
+ subjectMgr = LookupUtil.subjectManager
+ pluginMgr = LookupUtil.pluginManager
+ }
+
+ @Test(groups = ['plugin.metadata'])
+ void registerPlugins() {
+ def pluginDescriptor1 =
+ """
+ <plugin name="PluginManagerBeanTestPlugin1"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+ <server name="TestServer1"/>
+ </plugin>
+ """
+
+ createPlugin("test-plugin1", "1.0", pluginDescriptor1)
+
+ def pluginDescriptor2 =
+ """
+ <plugin name="PluginManagerBeanTestPlugin2"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <depends plugin="PluginManagerBeanTestPlugin1" useClasses="true"/>
+
+ <server name="TestServer2"/>
+ </plugin>
+ """
+
+ createPlugin("test-plugin2", "1.0", pluginDescriptor2)
+
+ def pluginDescriptor3 =
+ """
+ <plugin name="PluginManagerBeanTestPlugin3"
+ package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="TestServer3"/>
+ </plugin>
+ """
+
+ createPlugin("test-plugin3", "1.0", pluginDescriptor3)
+ }
+
+ @Test(groups = ['plugin.metadata'], dependsOnMethods = ['registerPlugins'])
+ void disablePlugin() {
+ def plugin = getPlugin('PluginManagerBeanTestPlugin3')
+
+ pluginMgr.disablePlugins subjectMgr.overlord, [plugin.id]
+ plugin = pluginMgr.getPlugin('PluginManagerBeanTestPlugin3')
+
+ assertFalse 'Failed to disable plugin', plugin.enabled
+ }
+
+ @Test(groups = ['plugin.metadata'], dependsOnMethods = ['registerPlugins'])
+ void doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() {
+ def plugin = getPlugin('PluginManagerBeanTestPlugin1')
+ def exception = null
+
+ try {
+ pluginMgr.disablePlugins subjectMgr.overlord, [plugin.id]
+ } catch (EJBException e) {
+ exception = e
+ }
+
+ assertNotNull 'Expected exception to be thrown when trying to disable a plugin that has dependent plugins', exception
+ assertTrue(
+ 'Expected an IllegalArgumentException when trying to disable a plugin with dependent plugins',
+ exception.causedByException instanceof IllegalArgumentException
+ )
+ }
+
+ @Test(groups = ['plugin.metadata'], dependsOnMethods = ['doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled'])
+ void disablePluginAndDependentPlugins() {
+ def plugin1 = getPlugin('PluginManagerBeanTestPlugin1')
+ def plugin2 = getPlugin('PluginManagerBeanTestPlugin2')
+
+ pluginMgr.disablePlugins subjectMgr.overlord, [plugin1.id, plugin2.id]
+
+ plugin1 = getPlugin('PluginManagerBeanTestPlugin1')
+ plugin2 = getPlugin('PluginManagerBeanTestPlugin2')
+
+ assertFalse 'Failed to disable plugin', plugin1.enabled
+ assertFalse 'Failed to disable plugin', plugin2.enabled
+ }
+
+ @Test(groups = ['plugin.metadata'], dependsOnMethods = ['disablePluginAndDependentPlugins'])
+ void enablePlugins() {
+ def plugin1 = getPlugin('PluginManagerBeanTestPlugin1')
+ def plugin2 = getPlugin('PluginManagerBeanTestPlugin2')
+
+ pluginMgr.enablePlugins subjectMgr.overlord, [plugin1.id, plugin2.id]
+
+ plugin1 = getPlugin('PluginManagerBeanTestPlugin1')
+ plugin2 = getPlugin('PluginManagerBeanTestPlugin2')
+
+ assertTrue 'Failed to enable plugin', plugin1.enabled
+ assertTrue 'Failed to enable plugin', plugin2.enabled
+ }
+
+ @Test(groups = ['plugin.metadata'], dependsOnMethods = ['enablePlugins'])
+ void doNotDeletePluginIfDependentPluginIsNotAlsoDeleted() {
+ def plugin = getPlugin('PluginManagerBeanTestPlugin1')
+ def exception = null
+
+ try {
+ pluginMgr.deletePlugins subjectMgr.overlord, [plugin.id]
+ } catch (EJBException e) {
+ exception = e
+ }
+
+ assertNotNull 'Expected exception to be thrown when trying to delete a plugin that has dependent plugins', exception
+ assertTrue(
+ 'Expected an IllegalArgumentException when trying to delete a plugin with dependent plugins',
+ exception.causedByException instanceof IllegalArgumentException
+ )
+ }
+
+ @Test(groups = ['plugin.metadata'], dependsOnMethods = ['doNotDeletePluginIfDependentPluginIsNotAlsoDeleted'])
+ void deletePlugins() {
+ def plugin1 = getPlugin('PluginManagerBeanTestPlugin1')
+ def plugin2 = getPlugin('PluginManagerBeanTestPlugin2')
+
+ pluginMgr.deletePlugins subjectMgr.overlord, [plugin1.id, plugin2.id]
+
+ plugin1 = getPlugin('PluginManagerBeanTestPlugin1', 'Deleting a plugin should not remove it from the database')
+ plugin2 = getPlugin('PluginManagerBeanTestPlugin2', 'Deleting a plugin should not remove it from the database')
+
+ assertTrue 'Expected plugin status to be set to DELETED', plugin1.status == PluginStatusType.DELETED
+ assertTrue 'Expected plugin status to be set to DELETED', plugin2.status == PluginStatusType.DELETED
+ }
+
+ @Test(groups = ['plugin.metadata'], dependsOnMethods = ['deletePlugins'])
+ void purgePlugins() {
+ def plugin1 = getPlugin('PluginManagerBeanTestPlugin1', 'Deleting a plugin should not remove it from the database')
+ def plugin2 = getPlugin('PluginManagerBeanTestPlugin2', 'Deleting a plugin should not remove it from the database')
+
+ pluginMgr.purgePlugins subjectMgr.overlord, [plugin1.id, plugin2.id]
+
+ assertEquals('Failed to purge plugins from the database', 1, pluginMgr.getPlugins().size())
+ }
+
+ Plugin getPlugin(String name) {
+ def plugin = pluginMgr.getPlugin(name)
+ assertNotNull "Failed to find plugin <$name>", plugin
+
+ return plugin
+ }
+
+ Plugin getPlugin(String name, String msg) {
+ def plugins = entityManager.createQuery("from Plugin where name = :name").setParameter('name', name).resultList
+ assertTrue "Failed to find plugin <$name>: $msg", plugins.size() == 1
+
+ return plugins[0]
+ }
+
+}
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 22 ++++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 34 +++++-----
2 files changed, 39 insertions(+), 17 deletions(-)
New commits:
commit 51906ed7422b324f9fb686d7eacf022e34d9b82f
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 29 11:23:38 2010 -0500
i18n Resource category names in Resource list view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index 05494e0..c58fa89 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -42,6 +42,7 @@ import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
@@ -124,9 +125,12 @@ public class ResourceSearchView extends Table {
@Override
protected void configureTable() {
- ListGridField iconField = new ListGridField("icon", MSG.common_title_icon(), 40);
+ ListGridField iconField = new ListGridField("icon", MSG.common_title_icon(), 26);
iconField.setType(ListGridFieldType.IMAGE);
iconField.setImageURLPrefix("types/");
+ iconField.setShowDefaultContextMenu(false);
+ iconField.setCanSort(false);
+ iconField.setTitle(" ");
ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(), 250);
nameField.setCellFormatter(new CellFormatter() {
@@ -143,6 +147,22 @@ public class ResourceSearchView extends Table {
ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(), PLUGIN.title(), 100);
ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title(), 60);
+ categoryField.setCellFormatter(new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
+ String categoryName = (String)value;
+ ResourceCategory category = ResourceCategory.valueOf(categoryName);
+ String displayName = "";
+ switch (category) {
+ case PLATFORM:
+ displayName = MSG.common_title_platform(); break;
+ case SERVER:
+ displayName = MSG.common_title_server(); break;
+ case SERVICE:
+ displayName = MSG.common_title_service(); break;
+ }
+ return displayName;
+ }
+ });
ListGridField availabilityField = new ListGridField(AVAILABILITY.propertyName(), AVAILABILITY.title(), 55);
availabilityField.setType(ListGridFieldType.IMAGE);
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 65a5886..0fb9be2 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -136,29 +136,31 @@ common_title_resource_inventory=Resource Inventory~
common_title_resource_id=Resource ID~
common_title_resource_name=Resource Name~
common_title_search = Search~
-common_title_scheduled_operations=Scheduled Operations~
-common_title_selected_resources=Selected Resources~
-common_title_server_total=Server Total~
-common_title_service_total=Service Total~
-common_title_settings=Settings~
-common_title_show=Show~
+common_title_scheduled_operations = Scheduled Operations~
+common_title_selected_resources = Selected Resources~
+common_title_server = Server~
+common_title_server_total = Server Total~
+common_title_service = Service~
+common_title_service_total = Service Total~
+common_title_settings = Settings~
+common_title_show = Show~
common_title_show_more = Show more...~
common_title_start = Start~
-common_title_status=Status~
-common_title_summary=Summary~
-common_title_tag_cloud=Tag Cloud~
-common_title_the=The
-common_title_summary_counts=Summary Counts~
-common_title_timestamp =Date/Time~
-common_title_total=Total~
+common_title_status = Status~
+common_title_summary = Summary~
+common_title_tag_cloud = Tag Cloud~
+common_title_the = The~
+common_title_summary_counts = Summary Counts~
+common_title_timestamp = Date/Time~
+common_title_total = Total~
common_title_type = Type~
common_title_units = Units~
common_title_user=User~
common_title_value = Value~
common_title_version = Version~
-common_title_view_mode=View Mode~
-common_title_web_address=Web Address~
-common_title_welcome=Welcome~
+common_title_view_mode = View Mode~
+common_title_web_address = Web Address~
+common_title_welcome = Welcome~
# Common Messages
#--------------
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 12 +++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 42d1f6ac84a5d110be764145af643e154095c193
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 29 10:27:32 2010 -0500
fix getSelection()
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
index 9bf6088..7862d50 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
@@ -108,13 +108,11 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
this.hlayout = new HLayout();
this.assignedGrid = new LocatableListGrid(extendLocatorId("assignedGrid"));
- this.assignedGrid.setEmptyMessage(MSG.common_msg_loading());
if (this.isReadOnly) {
this.assignedGrid.setSelectionType(SelectionStyle.NONE);
} else {
this.availableGrid = new LocatableListGrid(extendLocatorId("availableGrid"));
- this.availableGrid.setEmptyMessage(MSG.common_msg_loading());
}
}
@@ -128,7 +126,7 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
* @return the set of currently selected {@link Record record}s
*/
public ListGridRecord[] getSelectedRecords() {
- return this.assignedGrid.getSelection();
+ return this.assignedGrid.getRecords();
}
/**
@@ -137,7 +135,7 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
* @return the set of currently selected {@link T item}s
*/
public Set<T> getSelectedItems() {
- ListGridRecord[] selectedRecords = this.assignedGrid.getSelection();
+ ListGridRecord[] selectedRecords = this.assignedGrid.getRecords();
return getDataSource().buildDataObjects(selectedRecords);
}
@@ -147,7 +145,7 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
* @return the IDs of the currently selected items
*/
public Set<Integer> getSelection() {
- ListGridRecord[] selectedRecords = this.assignedGrid.getSelection();
+ ListGridRecord[] selectedRecords = this.assignedGrid.getRecords();
Set<Integer> ids = new HashSet<Integer>(selectedRecords.length);
for (ListGridRecord selectedRecord : selectedRecords) {
Integer id = selectedRecord.getAttributeAsInt(getSelectorKey());
@@ -215,6 +213,8 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
availableGrid.setTrackerImage(new ImgProperties(getItemIcon(), 16, 16));
}
availableGrid.setDragDataAction(DragDataAction.MOVE);
+ this.availableGrid.setLoadingMessage(MSG.common_msg_loading());
+ this.availableGrid.setEmptyMessage(MSG.common_msg_noItemsToShow());
List<ListGridField> availableFields = new ArrayList<ListGridField>();
String itemIcon = getItemIcon();
@@ -372,6 +372,8 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
assignedGrid.setTrackerImage(new ImgProperties(getItemIcon(), 16, 16));
}
assignedGrid.setCanAcceptDroppedRecords(true);
+ this.assignedGrid.setLoadingMessage(MSG.common_msg_loading());
+ this.assignedGrid.setEmptyMessage(MSG.common_msg_noItemsToShow());
List<ListGridField> assignedFields = new ArrayList<ListGridField>();
String itemIcon = getItemIcon();
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java | 13 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 87 +++-------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java | 9 -
3 files changed, 35 insertions(+), 74 deletions(-)
New commits:
commit 29ab38ed60b29c7d3ce0e01fa9d778b8c8bb161b
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 29 09:47:56 2010 -0500
remove some obsolete code from AbstractSelector
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
index 8f9a192..3cc5e4b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
@@ -56,6 +56,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
* @author Simeon Pinder
*/
public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>> {
+
public static final String id = "id";
public static final String name = "name";
public static final String description = "description";
@@ -124,7 +125,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>>
if (loaded != null) {
ArrayList<Integer> located = new ArrayList<Integer>();
for (LdapGroup group : currentlyAssignedLdapGroups) {
- int index = loaded.findIndex(name, (String) group.getName());
+ int index = loaded.findIndex(name, group.getName());
if (index > -1) {
group.setId(index);//overwrite RHQ Resource ID to match ldap fabricated id.
located.add(Integer.valueOf(index));
@@ -137,11 +138,8 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>>
}
availableGrid.selectRecords(records);
//now simulate button push
- assignedGrid.transferSelectedData(availableGrid);
initialLdapSelectionsLoad = false;
- select(assignedGrid.getSelection());
- updateButtonEnablement();
- assignedGrid.deselectAllRecords();
+ addSelectedRows();
}
}
}
@@ -386,9 +384,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>>
}
getAssignedGrid().selectRecords(records);
//now simulate button push
- assignedGrid.transferSelectedData(availableGrid);
- select(assignedGrid.getSelection());
- updateButtonEnablement();
+ addSelectedRows();
//entry count
if (null != currentlyAssignedLdapGroups) {
@@ -435,4 +431,5 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>>
public int getCurrentRoleId() {
return currentRoleId;
}
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
index daae8b2..9bf6088 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
@@ -48,6 +48,7 @@ import com.smartgwt.client.widgets.events.KeyPressHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.ItemChangedEvent;
import com.smartgwt.client.widgets.form.events.ItemChangedHandler;
+import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.DataArrivedEvent;
@@ -71,10 +72,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Ian Springer
*/
public abstract class AbstractSelector<T> extends LocatableVLayout {
- private static String SELECTOR_KEY = "id";
- protected Set<Integer> selection = new HashSet<Integer>();
- protected Set<String> selectionAlternateIds = new HashSet<String>();
+ private static String SELECTOR_KEY = "id";
Set<AssignedItemsChangedHandler> assignedItemsChangedHandlers = new HashSet<AssignedItemsChangedHandler>();
@@ -157,10 +156,6 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
return ids;
}
- public Set<String> getSelectionAlternateIds() {
- return selectionAlternateIds;
- }
-
protected abstract DynamicForm getAvailableFilterForm();
protected abstract RPCDataSource<T> getDataSource();
@@ -296,10 +291,15 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
public void execute(DSResponse response, Object rawData, DSRequest request) {
availableRecords = new ArrayList<Record>();
Record[] allRecords = response.getData();
- if (selection != null) {
+ if (initialSelection != null) {
+ Set<Integer> selectedRecordIds = new HashSet<Integer>(initialSelection.length);
+ for (Record record : initialSelection) {
+ Integer id = record.getAttributeAsInt(getSelectorKey());
+ selectedRecordIds.add(id);
+ }
for (Record record : allRecords) {
- int id = record.getAttributeAsInt("id");
- if (!selection.contains(id)) {
+ int id = record.getAttributeAsInt(getSelectorKey());
+ if (!selectedRecordIds.contains(id)) {
availableRecords.add(record);
}
}
@@ -392,13 +392,6 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
// Load data.
if (initialSelection != null) {
assignedGrid.setData(initialSelection);
- for (ListGridRecord record : initialSelection) {
- if (getSelectorKey().equalsIgnoreCase("id")) {
- selection.add(record.getAttributeAsInt(getSelectorKey()));
- } else {
- selectionAlternateIds.add(record.getAttributeAsString(getSelectorKey()));
- }
- }
}
if (!this.isReadOnly) {
@@ -440,7 +433,8 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
}
public void reset() {
- select(initialSelection);
+ this.assignedGrid.setData(this.initialSelection);
+ populateAvailableGrid(getLatestCriteria(getAvailableFilterForm()));
}
public HandlerRegistration addAssignedItemsChangedHandler(final AssignedItemsChangedHandler handler) {
@@ -453,22 +447,29 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
};
}
- private void removeSelectedRows() {
- availableGrid.transferSelectedData(assignedGrid);
- deselect(assignedGrid.getSelection());
- assignedGrid.removeSelectedData();
+ /**
+ * Moves the rows selected in the assigned grid to the available grid.
+ */
+ public void removeSelectedRows() {
+ moveSelectedData(this.assignedGrid, this.availableGrid);
notifyAssignedItemsChangedHandlers();
updateButtonEnablement();
}
- private void addSelectedRows() {
- assignedGrid.transferSelectedData(availableGrid);
- select(assignedGrid.getSelection());
- availableGrid.removeSelectedData();
+ /**
+ * Moves the rows selected in the available grid to the assigned grid.
+ */
+ public void addSelectedRows() {
+ moveSelectedData(this.availableGrid, this.assignedGrid);
notifyAssignedItemsChangedHandlers();
updateButtonEnablement();
}
+ private void moveSelectedData(ListGrid sourceGrid, ListGrid targetGrid) {
+ targetGrid.transferSelectedData(sourceGrid);
+ sourceGrid.removeSelectedData();
+ }
+
protected String getItemName() {
return "name";
}
@@ -512,40 +513,8 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
removeAllButton.setDisabled(assignedGrid.getDataAsRecordList().isEmpty());
}
+ @Deprecated
protected void select(ListGridRecord[] records) {
- availableGrid.deselectAllRecords();
- for (ListGridRecord record : records) {
- if (getSelectorKey().equalsIgnoreCase("id")) {
- selection.add(record.getAttributeAsInt(getSelectorKey()));
- } else {
- selectionAlternateIds.add(record.getAttributeAsString(getSelectorKey()));
- }
- }
- assignedGrid.markForRedraw();
- }
-
- protected void deselect(ListGridRecord[] records) {
- Set<Integer> toRemove = new HashSet<Integer>();
- Set<String> toRemoveStringIds = new HashSet<String>();
- if (getSelectorKey().equalsIgnoreCase("id")) {//integer id based
- for (ListGridRecord record : records) {
- toRemove.add(record.getAttributeAsInt(getSelectorKey()));
- }
- selection.removeAll(toRemove);
-
- for (Integer id : toRemove) {
- Record record = availableGrid.getDataAsRecordList().find(getSelectorKey(), id);
- if (record != null) {
- ((ListGridRecord) record).setEnabled(true);
- }
- }
- } else {//not using 'id' as selection criteria
- for (ListGridRecord record : records) {
- toRemoveStringIds.add(record.getAttributeAsString(getSelectorKey()));
- }
- selectionAlternateIds.removeAll(toRemoveStringIds);
- }
- availableGrid.markForRedraw();
}
@Deprecated
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
index a81c97f..689fd25 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
@@ -62,7 +62,6 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
public class RecentAlertsPortlet extends AlertHistoryView implements CustomSettingsPortlet {
public static final String KEY = MSG.view_portlet_recentAlerts_title();
- public static final String TITLE = KEY;
//widget keys also used in form population
public static final String ALERT_RANGE_DISPLAY_AMOUNT_VALUE = "alert-range-display-amount-value";
public static final String ALERT_RANGE_PRIORITY_VALUE = "alert-range-priority-value";
@@ -512,7 +511,7 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti
PropertySimple prop = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE);
//check to see if "Selected Resources" or "All Resources"
- if (prop.getStringValue().equals(RESOURCES_SELECTED)) {
+ if (prop != null && RESOURCES_SELECTED.equals(prop.getStringValue())) {
//retrieve currentlyAssignedIds
Integer[] valuesToPersist = resourceSelector.getListGridValues();
resourceSelector.setCurrentlyAssignedIds(valuesToPersist);
@@ -631,11 +630,7 @@ class AlertResourceSelectorRegion {
}
}
//simulate 'add' button push.
- selector.addAvailableGridSelectionsToAssignedGrid();
- selector.getAssignedGrid().invalidateCache();
- selector.getAssignedGrid().markForRedraw();
- } else {//no selected resources found
- selector.getAvailableGrid().setEmptyMessage(MSG.common_msg_noItemsToShow());
+ selector.addSelectedRows();
}
}
});
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 25 ++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 14 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 37 ++++++++--
4 files changed, 61 insertions(+), 17 deletions(-)
New commits:
commit 74b209041a0b4d7646b68791a1082ef7eaed44b9
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 29 08:54:18 2010 -0500
fix getSelection() in AbstractSelector and add new getSelectedRecords() and getSelectedItems() methods; fix some potential NPEs in UserEditView and RoleEditView
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
index 800c7a0..f8f9b5a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
@@ -255,15 +255,19 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen
protected void save() {
// Grab the currently assigned sets from each of the selectors and stick them into the corresponding canvas
// items on the form, so when the form is saved, they'll get submitted along with the rest of the simple fields
- // to the datasource's add or update methods .
- ListGridRecord[] groupRecords = this.groupSelector.getAssignedGrid().getRecords();
- getForm().setValue(RolesDataSource.Field.RESOURCE_GROUPS, groupRecords);
+ // to the datasource's add or update methods.
+ if (this.groupSelector != null) {
+ ListGridRecord[] groupRecords = this.groupSelector.getSelectedRecords();
+ getForm().setValue(RolesDataSource.Field.RESOURCE_GROUPS, groupRecords);
+ }
- ListGridRecord[] subjectRecords = this.subjectSelector.getAssignedGrid().getRecords();
- getForm().setValue(RolesDataSource.Field.SUBJECTS, subjectRecords);
+ if (this.subjectSelector != null) {
+ ListGridRecord[] subjectRecords = this.subjectSelector.getSelectedRecords();
+ getForm().setValue(RolesDataSource.Field.SUBJECTS, subjectRecords);
+ }
if (this.ldapGroupSelector != null) {
- ListGridRecord[] ldapGroupRecords = this.ldapGroupSelector.getAssignedGrid().getRecords();
+ ListGridRecord[] ldapGroupRecords = this.ldapGroupSelector.getSelectedRecords();
getForm().setValue(RolesDataSource.Field.LDAP_GROUPS, ldapGroupRecords);
}
@@ -276,8 +280,13 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen
super.reset();
this.permissionsItem.reset();
- this.groupSelector.reset();
- this.subjectSelector.reset();
+
+ if (this.groupSelector != null) {
+ this.groupSelector.reset();
+ }
+ if (this.subjectSelector != null) {
+ this.subjectSelector.reset();
+ }
if (this.ldapGroupSelector != null) {
this.ldapGroupSelector.reset();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
index 80194f7..8f9a192 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
@@ -102,7 +102,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>>
if (currentRoleId > -1) {
//add listener to AvailableGrid, to act after successfully populated.
- getAvailableGrid().addDataArrivedHandler(new DataArrivedHandler() {
+ this.availableGrid.addDataArrivedHandler(new DataArrivedHandler() {
@Override
public void onDataArrived(DataArrivedEvent event) {
int currentRoleId = getCurrentRoleId();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
index 391c8f8..b54c5f4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
@@ -214,8 +214,13 @@ public class UserEditView extends AbstractRecordEditor<UsersDataSource> {
@Override
protected void save() {
- ListGridRecord[] roleRecords = this.roleSelector.getAssignedGrid().getRecords();
- getForm().setValue(UsersDataSource.Field.ROLES, roleRecords);
+ // Grab the currently assigned roles from the selector and stick them into the corresponding canvas
+ // item on the form, so when the form is saved, they'll get submitted along with the rest of the simple fields
+ // to the datasource's add or update methods.
+ if (roleSelector != null) {
+ ListGridRecord[] roleRecords = this.roleSelector.getSelectedRecords();
+ getForm().setValue(UsersDataSource.Field.ROLES, roleRecords);
+ }
// Submit the form values to the datasource.
super.save();
@@ -224,7 +229,10 @@ public class UserEditView extends AbstractRecordEditor<UsersDataSource> {
@Override
protected void reset() {
super.reset();
- this.roleSelector.reset();
+
+ if (this.roleSelector != null) {
+ this.roleSelector.reset();
+ }
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
index 62174c6..daae8b2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
@@ -109,11 +109,13 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
this.hlayout = new HLayout();
this.assignedGrid = new LocatableListGrid(extendLocatorId("assignedGrid"));
+ this.assignedGrid.setEmptyMessage(MSG.common_msg_loading());
if (this.isReadOnly) {
this.assignedGrid.setSelectionType(SelectionStyle.NONE);
} else {
this.availableGrid = new LocatableListGrid(extendLocatorId("availableGrid"));
+ this.availableGrid.setEmptyMessage(MSG.common_msg_loading());
}
}
@@ -122,12 +124,37 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
}
/**
- * Returns the list of IDs for the records being transferred.
+ * Returns the set of currently selected {@link Record record}s.
+ *
+ * @return the set of currently selected {@link Record record}s
+ */
+ public ListGridRecord[] getSelectedRecords() {
+ return this.assignedGrid.getSelection();
+ }
+
+ /**
+ * Returns the set of currently selected {@link T item}s.
+ *
+ * @return the set of currently selected {@link T item}s
+ */
+ public Set<T> getSelectedItems() {
+ ListGridRecord[] selectedRecords = this.assignedGrid.getSelection();
+ return getDataSource().buildDataObjects(selectedRecords);
+ }
+
+ /**
+ * Returns the IDs of the currently selected items
*
- * @return the list of IDs for the records being transferred
+ * @return the IDs of the currently selected items
*/
public Set<Integer> getSelection() {
- return selection;
+ ListGridRecord[] selectedRecords = this.assignedGrid.getSelection();
+ Set<Integer> ids = new HashSet<Integer>(selectedRecords.length);
+ for (ListGridRecord selectedRecord : selectedRecords) {
+ Integer id = selectedRecord.getAttributeAsInt(getSelectorKey());
+ ids.add(id);
+ }
+ return ids;
}
public Set<String> getSelectionAlternateIds() {
@@ -521,12 +548,12 @@ public abstract class AbstractSelector<T> extends LocatableVLayout {
availableGrid.markForRedraw();
}
- // TODO: Add reset() method.
-
+ @Deprecated
public LocatableListGrid getAvailableGrid() {
return availableGrid;
}
+ @Deprecated
public LocatableListGrid getAssignedGrid() {
return assignedGrid;
}
1
0
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 381 ++++------
1 file changed, 187 insertions(+), 194 deletions(-)
New commits:
commit 12f59f40084851affd3b7e52542e24478676aebf
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Mon Nov 29 12:55:09 2010 +0100
BZ-655149 Deleting resource plugin config update from audit trail checks wrong permission.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index c49aa9d..e83e846 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -144,7 +144,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if (!authorizationManager.canViewResource(subject, resourceId)) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view plugin configuration for [" + resource + "]");
+ + "] does not have permission to view plugin configuration for [" + resource + "]");
}
Configuration pluginConfiguration = configurationManager.getPluginConfiguration(resourceId);
@@ -195,7 +195,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
} else {
handlePluginConfiguratonUpdateRemoteException(resource, response.getStatus().toString(), response
- .getErrorMessage());
+ .getErrorMessage());
update.setStatus(response.getStatus());
update.setErrorMessage(response.getErrorMessage());
@@ -221,7 +221,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
agentClient.getDiscoveryAgentService().executeServiceScanDeferred();
} catch (Exception e) {
log.warn("Failed to execute service scan - cannot detect children of the newly connected resource ["
- + resource + "]", e);
+ + resource + "]", e);
}
response = new ConfigurationUpdateResponse(update.getId(), null, ConfigurationUpdateStatus.SUCCESS, null);
@@ -233,8 +233,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public PluginConfigurationUpdate updatePluginConfiguration(Subject subject, int resourceId,
- @XmlJavaTypeAdapter(ConfigurationAdapter.class) Configuration configuration)
- throws ResourceNotFoundException {
+ @XmlJavaTypeAdapter(ConfigurationAdapter.class) Configuration configuration) throws ResourceNotFoundException {
Subject overlord = subjectManager.getOverlord();
Resource resource = resourceManager.getResourceById(overlord, resourceId);
@@ -270,7 +269,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_READ, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view resource configuration for [" + resource + "]");
+ + "] does not have permission to view resource configuration for [" + resource + "]");
}
Configuration result = configurationManager.getResourceConfiguration(resourceId);
@@ -293,7 +292,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public ResourceConfigurationUpdate getLatestResourceConfigurationUpdate(Subject subject, int resourceId,
- boolean fromStructured) {
+ boolean fromStructured) {
log.debug("Getting current resource configuration for resource [" + resourceId + "]");
Resource resource;
@@ -302,7 +301,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
// Get the latest configuration as known to the server (i.e. persisted in the DB).
try {
Query query = entityManager
- .createNamedQuery(ResourceConfigurationUpdate.QUERY_FIND_CURRENTLY_ACTIVE_CONFIG);
+ .createNamedQuery(ResourceConfigurationUpdate.QUERY_FIND_CURRENTLY_ACTIVE_CONFIG);
query.setParameter("resourceId", resourceId);
current = (ResourceConfigurationUpdate) query.getSingleResult();
resource = current.getResource();
@@ -313,13 +312,13 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
resource = entityManager.find(Resource.class, resourceId);
if (resource == null) {
throw new NoResultException("Cannot get latest resource configuration for unknown resource ["
- + resourceId + "]");
+ + resourceId + "]");
}
}
if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_READ, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view resource configuration for [" + resource + "]");
+ + "] does not have permission to view resource configuration for [" + resource + "]");
}
// Check whether or not a resource configuration update is currently in progress.
@@ -360,12 +359,12 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
// not effect our current transaction since the persist call was made with REQUIRES_NEW
// and thus only that new tx was rolled back
log.debug("Resource is currently in progress of changing its resource configuration - "
- + "since it hasn't finished yet, will use the last successful resource configuration: " + e);
+ + "since it hasn't finished yet, will use the last successful resource configuration: " + e);
}
}
} else {
log.warn("Could not get live resource configuration for resource [" + resource
- + "]; will assume latest resource configuration update is the current resource configuration.");
+ + "]; will assume latest resource configuration update is the current resource configuration.");
}
return current;
@@ -377,7 +376,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
private ResourceConfigurationUpdate persistNewAgentReportedResourceConfiguration(Resource resource,
- Configuration liveConfig) throws ConfigurationUpdateStillInProgressException {
+ Configuration liveConfig) throws ConfigurationUpdateStillInProgressException {
if (liveConfig.getRawConfigurations() != null) {
for (RawConfiguration raw : liveConfig.getRawConfigurations()) {
@@ -394,8 +393,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
* we want to provide for configuration updates. For the same reason, we pass null as the subject.
*/
ResourceConfigurationUpdate update = this.configurationManager.persistNewResourceConfigurationUpdateHistory(
- this.subjectManager.getOverlord(), resource.getId(), liveConfig, ConfigurationUpdateStatus.SUCCESS,
- null, false);
+ this.subjectManager.getOverlord(), resource.getId(), liveConfig, ConfigurationUpdateStatus.SUCCESS, null,
+ false);
// resource.setResourceConfiguration(liveConfig.deepCopy(false));
resource.setResourceConfiguration(liveConfig.deepCopyWithoutProxies());
return update;
@@ -420,13 +419,13 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
resource = entityManager.find(Resource.class, resourceId);
if (resource == null) {
throw new NoResultException("Cannot get latest plugin configuration for unknown resource ["
- + resourceId + "]");
+ + resourceId + "]");
}
}
if (!authorizationManager.canViewResource(subject, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view plugin configuration for [" + resource + "]");
+ + "] does not have permission to view plugin configuration for [" + resource + "]");
}
return current;
@@ -439,10 +438,10 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
query.setParameter("resourceId", resourceId);
ResourceConfigurationUpdate latestConfigUpdate = (ResourceConfigurationUpdate) query.getSingleResult();
if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_READ, latestConfigUpdate
- .getResource().getId())) {
+ .getResource().getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view Resource configuration for ["
- + latestConfigUpdate.getResource() + "]");
+ + "] does not have permission to view Resource configuration for ["
+ + latestConfigUpdate.getResource() + "]");
}
updateInProgress = (latestConfigUpdate.getStatus() == ConfigurationUpdateStatus.INPROGRESS);
} catch (NoResultException nre) {
@@ -460,8 +459,8 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
PluginConfigurationUpdate latestConfigUpdate = (PluginConfigurationUpdate) query.getSingleResult();
if (!authorizationManager.canViewResource(subject, latestConfigUpdate.getResource().getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view plugin configuration for ["
- + latestConfigUpdate.getResource() + "]");
+ + "] does not have permission to view plugin configuration for ["
+ + latestConfigUpdate.getResource() + "]");
}
updateInProgress = (latestConfigUpdate.getStatus() == ConfigurationUpdateStatus.INPROGRESS);
} catch (NoResultException nre) {
@@ -475,14 +474,14 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
boolean updateInProgress;
try {
Query query = entityManager
- .createNamedQuery(GroupResourceConfigurationUpdate.QUERY_FIND_LATEST_BY_GROUP_ID);
+ .createNamedQuery(GroupResourceConfigurationUpdate.QUERY_FIND_LATEST_BY_GROUP_ID);
query.setParameter("groupId", groupId);
GroupResourceConfigurationUpdate latestConfigGroupUpdate = (GroupResourceConfigurationUpdate) query
- .getSingleResult();
+ .getSingleResult();
if (!authorizationManager.canViewGroup(subject, latestConfigGroupUpdate.getGroup().getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view group Resource configuration for ["
- + latestConfigGroupUpdate.getGroup() + "]");
+ + "] does not have permission to view group Resource configuration for ["
+ + latestConfigGroupUpdate.getGroup() + "]");
}
updateInProgress = (latestConfigGroupUpdate.getStatus() == ConfigurationUpdateStatus.INPROGRESS);
@@ -500,11 +499,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
Query query = entityManager.createNamedQuery(GroupPluginConfigurationUpdate.QUERY_FIND_LATEST_BY_GROUP_ID);
query.setParameter("groupId", groupId);
GroupPluginConfigurationUpdate latestConfigGroupUpdate = (GroupPluginConfigurationUpdate) query
- .getSingleResult();
+ .getSingleResult();
if (!authorizationManager.canViewGroup(subject, latestConfigGroupUpdate.getGroup().getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view group plugin configuration for ["
- + latestConfigGroupUpdate.getGroup() + "]");
+ + "] does not have permission to view group plugin configuration for ["
+ + latestConfigGroupUpdate.getGroup() + "]");
}
updateInProgress = (latestConfigGroupUpdate.getStatus() == ConfigurationUpdateStatus.INPROGRESS);
@@ -517,11 +516,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public Map<Integer, Configuration> getResourceConfigurationsForCompatibleGroup(Subject subject, int groupId)
- throws ConfigurationUpdateStillInProgressException, Exception {
+ throws ConfigurationUpdateStillInProgressException, Exception {
if (authorizationManager.hasGroupPermission(subject, Permission.CONFIGURE_READ, groupId) == false) {
throw new PermissionException("User[name=" + subject.getName()
- + "] does not have permission to view configuration for group[id=" + groupId + "]");
+ + "] does not have permission to view configuration for group[id=" + groupId + "]");
}
// The below call will also handle the check to see if the subject has perms to view the group.
@@ -533,10 +532,10 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
AvailabilityType availability = (groupComposite.getExplicitAvail() == 1) ? AvailabilityType.UP
- : AvailabilityType.DOWN;
+ : AvailabilityType.DOWN;
if (availability == AvailabilityType.DOWN)
throw new Exception("Current group Resource configuration for " + groupId
- + " cannot be calculated, because one or more of this group's member Resources are DOWN.");
+ + " cannot be calculated, because one or more of this group's member Resources are DOWN.");
// If we got this far, all member Resources are UP. Now check to make sure no config updates, group-level or
// resource-level, are in progress.
@@ -549,7 +548,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
int userPreferencesTimeout = new SubjectPreferences(subject).getGroupConfigurationTimeoutPeriod();
Set<Resource> groupMembers = group.getExplicitResources();
Map<Integer, Configuration> liveConfigs = LiveConfigurationLoader.getInstance().loadLiveResourceConfigurations(
- groupMembers, userPreferencesTimeout);
+ groupMembers, userPreferencesTimeout);
// If we got this far, we were able to retrieve all of the live configs from the Agents. Now load the current
// persisted configs from the DB and compare them to the corresponding live configs. For any that are not equal,
@@ -562,22 +561,22 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if (!liveConfig.equals(currentPersistedConfig)) {
// If the live config is different than the persisted config, persist it as the new current config.
ResourceConfigurationUpdate update = persistNewAgentReportedResourceConfiguration(memberResource,
- liveConfig);
+ liveConfig);
if (update != null)
currentPersistedConfigs.put(memberResource.getId(), update.getConfiguration());
else
log.error("Current Configuration for " + memberResource
- + " does not match latest associated ResourceConfigurationUpdate with SUCCESS status.");
+ + " does not match latest associated ResourceConfigurationUpdate with SUCCESS status.");
}
}
return currentPersistedConfigs;
}
public Map<Integer, Configuration> getPluginConfigurationsForCompatibleGroup(Subject subject, int groupId)
- throws ConfigurationUpdateStillInProgressException, Exception {
+ throws ConfigurationUpdateStillInProgressException, Exception {
// The below call will also handle the check to see if the subject has perms to view the group.
ResourceGroup group = this.resourceGroupManager
- .getResourceGroupById(subject, groupId, GroupCategory.COMPATIBLE);
+ .getResourceGroupById(subject, groupId, GroupCategory.COMPATIBLE);
// Check to make sure no config updates, group-level or resource-level, are in progress.
ensureNoPluginConfigurationUpdatesInProgress(group);
@@ -590,16 +589,16 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@SuppressWarnings("unchecked")
private void ensureNoResourceConfigurationUpdatesInProgress(ResourceGroup compatibleGroup)
- throws ConfigurationUpdateStillInProgressException {
+ throws ConfigurationUpdateStillInProgressException {
if (isGroupResourceConfigurationUpdateInProgress(this.subjectManager.getOverlord(), compatibleGroup.getId())) {
throw new ConfigurationUpdateStillInProgressException("Current group Resource configuration for "
- + compatibleGroup
- + " cannot be calculated, because a group Resource configuration update is currently in progress "
- + " (please wait for this update to complete or delete it from the history).");
+ + compatibleGroup
+ + " cannot be calculated, because a group Resource configuration update is currently in progress "
+ + " (please wait for this update to complete or delete it from the history).");
}
Query countQuery = PersistenceUtility.createCountQuery(entityManager,
- ResourceConfigurationUpdate.QUERY_FIND_BY_GROUP_ID_AND_STATUS);
+ ResourceConfigurationUpdate.QUERY_FIND_BY_GROUP_ID_AND_STATUS);
countQuery.setParameter("groupId", compatibleGroup.getId());
countQuery.setParameter("status", ConfigurationUpdateStatus.INPROGRESS);
long count = (Long) countQuery.getSingleResult();
@@ -608,21 +607,20 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
query.setParameter("groupId", compatibleGroup.getId());
query.setParameter("status", ConfigurationUpdateStatus.INPROGRESS);
List<Resource> resources = query.getResultList();
- throw new ConfigurationUpdateStillInProgressException(
- "Current group Resource configuration for "
- + compatibleGroup
- + " cannot be calculated, because Resource configuration updates are currently in progress for the"
- + " following Resources (please wait for these updates to complete or delete them from the history): "
- + resources);
+ throw new ConfigurationUpdateStillInProgressException("Current group Resource configuration for "
+ + compatibleGroup
+ + " cannot be calculated, because Resource configuration updates are currently in progress for the"
+ + " following Resources (please wait for these updates to complete or delete them from the history): "
+ + resources);
}
}
private void ensureNoPluginConfigurationUpdatesInProgress(ResourceGroup compatibleGroup)
- throws ConfigurationUpdateStillInProgressException {
+ throws ConfigurationUpdateStillInProgressException {
if (isGroupPluginConfigurationUpdateInProgress(this.subjectManager.getOverlord(), compatibleGroup.getId())) {
throw new ConfigurationUpdateStillInProgressException("Current group plugin configuration for "
- + compatibleGroup
- + " cannot be calculated, because a group plugin configuration update is currently in progress.");
+ + compatibleGroup
+ + " cannot be calculated, because a group plugin configuration update is currently in progress.");
}
List<Resource> resourcesWithPluginConfigUpdatesInProgress = new ArrayList<Resource>();
for (Resource memberResource : compatibleGroup.getExplicitResources()) {
@@ -631,22 +629,22 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
if (!resourcesWithPluginConfigUpdatesInProgress.isEmpty())
throw new ConfigurationUpdateStillInProgressException(
- "Current group plugin configuration for "
- + compatibleGroup
- + " cannot be calculated, because plugin configuration updates are currently in progress for the following Resources: "
- + resourcesWithPluginConfigUpdatesInProgress);
+ "Current group plugin configuration for "
+ + compatibleGroup
+ + " cannot be calculated, because plugin configuration updates are currently in progress for the following Resources: "
+ + resourcesWithPluginConfigUpdatesInProgress);
}
@SuppressWarnings("unchecked")
private Map<Integer, Configuration> getPersistedResourceConfigurationsForCompatibleGroup(
- ResourceGroup compatibleGroup) {
+ ResourceGroup compatibleGroup) {
Query countQuery = PersistenceUtility.createCountQuery(entityManager,
- Configuration.QUERY_GET_RESOURCE_CONFIG_MAP_BY_GROUP_ID);
+ Configuration.QUERY_GET_RESOURCE_CONFIG_MAP_BY_GROUP_ID);
countQuery.setParameter("resourceGroupId", compatibleGroup.getId());
long count = (Long) countQuery.getSingleResult();
if (count != compatibleGroup.getExplicitResources().size())
throw new IllegalStateException("Size of group changed from "
- + compatibleGroup.getExplicitResources().size() + " to " + count + " - please retry the operation.");
+ + compatibleGroup.getExplicitResources().size() + " to " + count + " - please retry the operation.");
// Configurations are very expensive to load, so load 'em in chunks to ease the strain on the DB.
PageControl pageControl = new PageControl(0, 10);
@@ -677,12 +675,12 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@SuppressWarnings("unchecked")
private Map<Integer, Configuration> getPersistedPluginConfigurationsForCompatibleGroup(ResourceGroup compatibleGroup) {
Query countQuery = PersistenceUtility.createCountQuery(entityManager,
- Configuration.QUERY_GET_PLUGIN_CONFIG_MAP_BY_GROUP_ID);
+ Configuration.QUERY_GET_PLUGIN_CONFIG_MAP_BY_GROUP_ID);
countQuery.setParameter("resourceGroupId", compatibleGroup.getId());
long count = (Long) countQuery.getSingleResult();
if (count != compatibleGroup.getExplicitResources().size())
throw new IllegalStateException("Size of group changed from "
- + compatibleGroup.getExplicitResources().size() + " to " + count + " - please retry the operation.");
+ + compatibleGroup.getExplicitResources().size() + " to " + count + " - please retry the operation.");
// Configurations are very expensive to load, so load 'em in chunks to ease the strain on the DB.
PageControl pageControl = new PageControl(0, 20);
@@ -711,12 +709,12 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public Configuration getLiveResourceConfiguration(Subject subject, int resourceId, boolean pingAgentFirst)
- throws Exception {
+ throws Exception {
return getLiveResourceConfiguration(subject, resourceId, pingAgentFirst, true);
}
public Configuration getLiveResourceConfiguration(Subject subject, int resourceId, boolean pingAgentFirst,
- boolean fromStructured) throws Exception {
+ boolean fromStructured) throws Exception {
Resource resource = entityManager.find(Resource.class, resourceId);
if (resource == null) {
@@ -725,7 +723,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if (!authorizationManager.canViewResource(subject, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view resource configuration for [" + resource + "]");
+ + "] does not have permission to view resource configuration for [" + resource + "]");
}
// ask the agent to get us the live, most up-to-date configuration for the resource
@@ -756,9 +754,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
long duration = request.getDuration();
if (duration > timeout) {
log.info("Resource configuration update request seems to have been orphaned - timing it out: "
- + request);
+ + request);
request.setErrorMessage("Timed out - did not complete after " + duration + " ms"
- + " (the timeout period was " + timeout + " ms)");
+ + " (the timeout period was " + timeout + " ms)");
request.setStatus(ConfigurationUpdateStatus.FAILURE);
// If it's part of a group update, check if all member updates of the group update have completed,
// and, if so, update the group update's status.
@@ -787,9 +785,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
long duration = request.getDuration();
if (duration > timeout) {
log.info("Group Resource configuration update request seems to have been orphaned - timing it out: "
- + request);
+ + request);
request.setErrorMessage("Timed out - did not complete after " + duration + " ms"
- + " (the timeout period was " + timeout + " ms)");
+ + " (the timeout period was " + timeout + " ms)");
request.setStatus(ConfigurationUpdateStatus.FAILURE);
}
}
@@ -800,11 +798,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@SuppressWarnings("unchecked")
public PageList<PluginConfigurationUpdate> findPluginConfigurationUpdates(Subject subject, int resourceId,
- Long beginDate, Long endDate, PageControl pc) {
+ Long beginDate, Long endDate, PageControl pc) {
Resource resource = entityManager.find(Resource.class, resourceId);
if (resource.getResourceType().getPluginConfigurationDefinition() == null
- || resource.getResourceType().getPluginConfigurationDefinition().getPropertyDefinitions().isEmpty()) {
+ || resource.getResourceType().getPluginConfigurationDefinition().getPropertyDefinitions().isEmpty()) {
return new PageList<PluginConfigurationUpdate>(pc);
}
@@ -837,7 +835,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
resource = updates.get(0).getResource();
if (!authorizationManager.canViewResource(subject, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view resource [" + resource + "]");
+ + "] does not have permission to view resource [" + resource + "]");
}
}
@@ -846,11 +844,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@SuppressWarnings("unchecked")
public PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdates(Subject subject, Integer resourceId,
- Long beginDate, Long endDate, boolean suppressOldest, PageControl pc) {
+ Long beginDate, Long endDate, boolean suppressOldest, PageControl pc) {
if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_READ, resourceId)) {
throw new PermissionException("User[" + subject.getName()
- + "] does not have permission to view configuration history for resource[id=" + resourceId + "]");
+ + "] does not have permission to view configuration history for resource[id=" + resourceId + "]");
}
// TODO (ips, 04/01/10): Our id's are not guaranteed to be sequential, because our sequences are configured to
@@ -895,8 +893,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if (!authorizationManager.canViewResource(subject, update.getResource().getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view plugin configuration update for [" + update.getResource()
- + "]");
+ + "] does not have permission to view plugin configuration update for [" + update.getResource() + "]");
}
update.getConfiguration(); // this is EAGER loaded, so this really doesn't do anything
@@ -906,12 +903,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public ResourceConfigurationUpdate getResourceConfigurationUpdate(Subject subject, int configurationUpdateId) {
ResourceConfigurationUpdate update = entityManager.find(ResourceConfigurationUpdate.class,
- configurationUpdateId);
+ configurationUpdateId);
if (!authorizationManager.canViewResource(subject, update.getResource().getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view resource configuration update for [" + update.getResource()
- + "]");
+ + "] does not have permission to view resource configuration update for [" + update.getResource() + "]");
}
update.getConfiguration(); // this is EAGER loaded, so this really doesn't do anything
@@ -921,7 +917,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public void purgePluginConfigurationUpdate(Subject subject, int configurationUpdateId, boolean purgeInProgress) {
PluginConfigurationUpdate doomedRequest = entityManager.find(PluginConfigurationUpdate.class,
- configurationUpdateId);
+ configurationUpdateId);
if (doomedRequest == null) {
log.debug("Asked to purge a non-existing config update request [" + configurationUpdateId + "]");
@@ -930,16 +926,16 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if ((doomedRequest.getStatus() == ConfigurationUpdateStatus.INPROGRESS) && !purgeInProgress) {
throw new IllegalStateException(
- "The update request is still in the in-progress state. Please wait for it to complete: "
- + doomedRequest);
+ "The update request is still in the in-progress state. Please wait for it to complete: "
+ + doomedRequest);
}
// make sure the user has the proper permissions to do this
Resource resource = doomedRequest.getResource();
- if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_WRITE, resource.getId())) {
+ if (!authorizationManager.hasResourcePermission(subject, Permission.MODIFY_RESOURCE, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to purge a plugin configuration update audit trail for resource ["
- + resource + "]");
+ + "] does not have permission to purge a plugin configuration update audit trail for resource ["
+ + resource + "]");
}
resource.getPluginConfigurationUpdates().remove(doomedRequest);
@@ -951,7 +947,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public void purgeResourceConfigurationUpdate(Subject subject, int configurationUpdateId, boolean purgeInProgress) {
ResourceConfigurationUpdate doomedRequest = entityManager.find(ResourceConfigurationUpdate.class,
- configurationUpdateId);
+ configurationUpdateId);
if (doomedRequest == null) {
log.debug("Asked to purge a non-existing config update request [" + configurationUpdateId + "]");
@@ -960,16 +956,16 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if ((doomedRequest.getStatus() == ConfigurationUpdateStatus.INPROGRESS) && !purgeInProgress) {
throw new IllegalStateException(
- "The update request is still in the in-progress state. Please wait for it to complete: "
- + doomedRequest);
+ "The update request is still in the in-progress state. Please wait for it to complete: "
+ + doomedRequest);
}
// make sure the user has the proper permissions to do this
Resource resource = doomedRequest.getResource();
- if (!authorizationManager.hasResourcePermission(subject, Permission.MODIFY_RESOURCE, resource.getId())) {
+ if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_WRITE, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to purge a configuration update audit trail for resource ["
- + resource + "]");
+ + "] does not have permission to purge a configuration update audit trail for resource [" + resource
+ + "]");
}
resource.getResourceConfigurationUpdates().remove(doomedRequest);
@@ -993,12 +989,12 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public ResourceConfigurationUpdate updateStructuredOrRawConfiguration(Subject subject, int resourceId,
- Configuration newConfiguration, boolean fromStructured) throws ResourceNotFoundException,
- ConfigurationUpdateStillInProgressException {
+ Configuration newConfiguration, boolean fromStructured) throws ResourceNotFoundException,
+ ConfigurationUpdateStillInProgressException {
if (authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_WRITE, resourceId) == false) {
throw new PermissionException("User[name=" + subject.getName()
- + "] does not have the permission to update configuration for resource[id=" + resourceId + "]");
+ + "] does not have the permission to update configuration for resource[id=" + resourceId + "]");
}
Configuration configToUpdate = newConfiguration;
@@ -1008,11 +1004,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
try {
Configuration invalidConfig = validateResourceConfiguration(subject, resourceId, newConfiguration,
- fromStructured);
+ fromStructured);
if (null != invalidConfig) {
Resource resource = resourceManager.getResourceById(subject, resourceId);
ResourceConfigurationUpdate resourceConfigurationUpdate = new ResourceConfigurationUpdate(resource,
- invalidConfig, subject.getName());
+ invalidConfig, subject.getName());
resourceConfigurationUpdate.setErrorMessage("resource.validation.failed");
resourceConfigurationUpdate.setStatus(ConfigurationUpdateStatus.FAILURE);
@@ -1021,27 +1017,27 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
} catch (PluginContainerException e) {
Resource resource = resourceManager.getResourceById(subject, resourceId);
ResourceConfigurationUpdate resourceConfigurationUpdate = new ResourceConfigurationUpdate(resource,
- newConfiguration, subject.getName());
+ newConfiguration, subject.getName());
resourceConfigurationUpdate.setErrorMessage(e.getMessage());
resourceConfigurationUpdate.setStatus(ConfigurationUpdateStatus.FAILURE);
return resourceConfigurationUpdate;
}
ResourceConfigurationUpdate newUpdate = configurationManager.persistNewResourceConfigurationUpdateHistory(
- subject, resourceId, configToUpdate, ConfigurationUpdateStatus.INPROGRESS, subject.getName(), false);
+ subject, resourceId, configToUpdate, ConfigurationUpdateStatus.INPROGRESS, subject.getName(), false);
executeResourceConfigurationUpdate(newUpdate, fromStructured);
return newUpdate;
}
private Configuration validateResourceConfiguration(Subject subject, int resourceId, Configuration configuration,
- boolean isStructured) throws PluginContainerException {
+ boolean isStructured) throws PluginContainerException {
Resource resource = entityManager.find(Resource.class, resourceId);
if (resource == null) {
throw new NoResultException("Cannot get live configuration for unknown resource [" + resourceId + "]");
}
if (!authorizationManager.canViewResource(subject, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view resource configuration for [" + resource + "]");
+ + "] does not have permission to view resource configuration for [" + resource + "]");
}
Agent agent = resource.getAgent();
AgentClient agentClient = this.agentManager.getAgentClient(agent);
@@ -1054,7 +1050,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
return (ConfigurationFormat.STRUCTURED_AND_RAW == configDef.getConfigurationFormat() || (ConfigurationFormat.RAW == configDef
- .getConfigurationFormat()));
+ .getConfigurationFormat()));
}
private boolean isStructuredAndRawSupported(int resourceId) {
@@ -1066,19 +1062,19 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@Nullable
public ResourceConfigurationUpdate updateResourceConfiguration(Subject subject, int resourceId,
- @XmlJavaTypeAdapter(ConfigurationAdapter.class) Configuration newConfiguration)
- throws ResourceNotFoundException {
+ @XmlJavaTypeAdapter(ConfigurationAdapter.class) Configuration newConfiguration)
+ throws ResourceNotFoundException {
if (isStructuredAndRawSupported(resourceId)) {
throw new ConfigurationUpdateNotSupportedException("Cannot update a resource configuration that "
- + "supports both structured and raw configuration using this method because there is insufficient "
- + "information. You should instead call updateStructuredOrRawConfiguration() which requires you "
- + "whether the structured or raw was updated.");
+ + "supports both structured and raw configuration using this method because there is insufficient "
+ + "information. You should instead call updateStructuredOrRawConfiguration() which requires you "
+ + "whether the structured or raw was updated.");
}
if (authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_WRITE, resourceId) == false) {
throw new PermissionException("User[name=" + subject.getName()
- + "] does not have the permission to update configuration for resource[id=" + resourceId + "]");
+ + "] does not have the permission to update configuration for resource[id=" + resourceId + "]");
}
// must do this in a separate transaction so it is committed prior to sending the agent request
@@ -1088,7 +1084,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
// here we call ourself, but we do so via the EJB interface so we pick up the REQUIRES_NEW semantics
// this can return null if newConfiguration is not actually different.
newUpdate = configurationManager.persistNewResourceConfigurationUpdateHistory(subject, resourceId,
- newConfiguration, ConfigurationUpdateStatus.INPROGRESS, subject.getName(), false);
+ newConfiguration, ConfigurationUpdateStatus.INPROGRESS, subject.getName(), false);
executeResourceConfigurationUpdate(newUpdate, true);
@@ -1110,7 +1106,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
try {
AgentClient agentClient = agentManager.getAgentClient(update.getResource().getAgent());
ConfigurationUpdateRequest request = new ConfigurationUpdateRequest(update.getId(), update
- .getConfiguration(), update.getResource().getId());
+ .getConfiguration(), update.getResource().getId());
agentClient.getConfigurationAgentService().updateResourceConfiguration(request);
} catch (RuntimeException e) {
// Any exception means the remote call itself failed - make sure to change the status on the update to
@@ -1127,13 +1123,13 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public void rollbackResourceConfiguration(Subject subject, int resourceId, int configHistoryId)
- throws ConfigurationUpdateException {
+ throws ConfigurationUpdateException {
ResourceConfigurationUpdate configurationUpdateHistory = entityManager.find(ResourceConfigurationUpdate.class,
- configHistoryId);
+ configHistoryId);
Configuration configuration = configurationUpdateHistory.getConfiguration();
if (configuration == null) {
throw new ConfigurationUpdateException("No configuration history element exists with id = '"
- + configHistoryId + "'");
+ + configHistoryId + "'");
}
if (isStructuredAndRawSupported(resourceId)) {
@@ -1145,15 +1141,15 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public ResourceConfigurationUpdate persistNewResourceConfigurationUpdateHistory(Subject subject, int resourceId,
- Configuration newConfiguration, ConfigurationUpdateStatus newStatus, String newSubject,
- boolean isPartofGroupUpdate) throws ResourceNotFoundException, ConfigurationUpdateStillInProgressException {
+ Configuration newConfiguration, ConfigurationUpdateStatus newStatus, String newSubject,
+ boolean isPartofGroupUpdate) throws ResourceNotFoundException, ConfigurationUpdateStillInProgressException {
// get the resource that we will be updating
Resource resource = resourceManager.getResourceById(subject, resourceId);
// make sure the user has the proper permissions to do this
if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_WRITE, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to modify configuration for resource [" + resource + "]");
+ + "] does not have permission to modify configuration for resource [" + resource + "]");
}
// see if there was a previous update request and make sure it isn't still in progress
@@ -1173,10 +1169,10 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
// NOTE: If you change this to another exception, make sure you change
// getLatestResourceConfigurationUpdate().
throw new ConfigurationUpdateStillInProgressException(
- "Resource ["
- + resource
- + "] has a resource configuration update request already in progress - please wait for it to finish: "
- + previousRequest);
+ "Resource ["
+ + resource
+ + "] has a resource configuration update request already in progress - please wait for it to finish: "
+ + previousRequest);
}
}
}
@@ -1187,7 +1183,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
// Get the latest configuration as known to the server (i.e. persisted in the DB).
try {
Query query = entityManager
- .createNamedQuery(ResourceConfigurationUpdate.QUERY_FIND_CURRENTLY_ACTIVE_CONFIG);
+ .createNamedQuery(ResourceConfigurationUpdate.QUERY_FIND_CURRENTLY_ACTIVE_CONFIG);
query.setParameter("resourceId", resourceId);
current = (ResourceConfigurationUpdate) query.getSingleResult();
resource = current.getResource();
@@ -1207,7 +1203,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
// create our new update request and assign it to our resource - its status will initially be "in progress"
ResourceConfigurationUpdate newUpdateRequest = new ResourceConfigurationUpdate(resource, zeroedConfiguration,
- newSubject);
+ newSubject);
newUpdateRequest.setStatus(newStatus);
if (newStatus == ConfigurationUpdateStatus.FAILURE) {
@@ -1246,11 +1242,10 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
// find the current update request that is persisted - this is the one that is being reported as being complete
ResourceConfigurationUpdate update = entityManager.find(ResourceConfigurationUpdate.class, response
- .getConfigurationUpdateId());
+ .getConfigurationUpdateId());
if (update == null) {
throw new IllegalStateException(
- "The completed request passed in does not match any request for any resource in inventory: "
- + response);
+ "The completed request passed in does not match any request for any resource in inventory: " + response);
}
if (response.getStatus() == ConfigurationUpdateStatus.FAILURE) {
@@ -1282,7 +1277,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@SuppressWarnings("unchecked")
public void checkForCompletedGroupResourceConfigurationUpdate(int resourceConfigUpdateId) {
ResourceConfigurationUpdate resourceConfigUpdate = entityManager.find(ResourceConfigurationUpdate.class,
- resourceConfigUpdateId);
+ resourceConfigUpdateId);
if (resourceConfigUpdate.getStatus() == ConfigurationUpdateStatus.INPROGRESS)
// If this update isn't done, then, by definition, the group update isn't done either.
return;
@@ -1293,14 +1288,14 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return;
Query inProgressResourcesCountQuery = PersistenceUtility.createCountQuery(this.entityManager,
- ResourceConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID_AND_STATUS);
+ ResourceConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID_AND_STATUS);
inProgressResourcesCountQuery.setParameter("parentUpdateId", groupConfigUpdate.getId());
inProgressResourcesCountQuery.setParameter("status", ConfigurationUpdateStatus.INPROGRESS);
long inProgressResourcesCount = (Long) inProgressResourcesCountQuery.getSingleResult();
if (inProgressResourcesCount == 0) {
// No more member updates in progress - the group update is complete.
Query failedResourcesQuery = this.entityManager
- .createNamedQuery(ResourceConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID_AND_STATUS);
+ .createNamedQuery(ResourceConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID_AND_STATUS);
failedResourcesQuery.setParameter("parentUpdateId", groupConfigUpdate.getId());
failedResourcesQuery.setParameter("status", ConfigurationUpdateStatus.FAILURE);
List<Resource> failedResources = failedResourcesQuery.getResultList();
@@ -1310,17 +1305,17 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
} else {
groupStatus = ConfigurationUpdateStatus.FAILURE;
groupConfigUpdate.setErrorMessage("The following Resources failed to update their Configurations: "
- + failedResources);
+ + failedResources);
}
groupConfigUpdate.setStatus(groupStatus);
log.info("Group Resource configuration update [" + groupConfigUpdate.getId() + "] for "
- + groupConfigUpdate.getGroup() + " has completed with status [" + groupStatus + "].");
+ + groupConfigUpdate.getGroup() + " has completed with status [" + groupStatus + "].");
// TODO: Add support for alerting on completion of group resource config updates.
// notifyAlertConditionCacheManager("checkForCompletedGroupResourceConfigurationUpdate", groupUpdate);
} else {
log.debug("Group Resource configuration update [" + groupConfigUpdate.getId() + "] for "
- + groupConfigUpdate.getGroup() + " has " + inProgressResourcesCount
- + " member updates still in progress.");
+ + groupConfigUpdate.getGroup() + " has " + inProgressResourcesCount
+ + " member updates still in progress.");
}
return;
}
@@ -1360,7 +1355,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@Nullable
public ConfigurationDefinition getResourceConfigurationDefinitionWithTemplatesForResourceType(Subject subject,
- int resourceTypeId) {
+ int resourceTypeId) {
Query query = entityManager.createNamedQuery(ConfigurationDefinition.QUERY_FIND_RESOURCE_BY_RESOURCE_TYPE_ID);
query.setParameter("resourceTypeId", resourceTypeId);
ConfigurationDefinition configurationDefinition = null;
@@ -1383,7 +1378,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public boolean hasPluginConfiguration(int resourceTypeId) {
Query countQuery = PersistenceUtility.createCountQuery(entityManager,
- ConfigurationDefinition.QUERY_FIND_PLUGIN_BY_RESOURCE_TYPE_ID);
+ ConfigurationDefinition.QUERY_FIND_PLUGIN_BY_RESOURCE_TYPE_ID);
countQuery.setParameter("resourceTypeId", resourceTypeId);
long count = (Long) countQuery.getSingleResult();
@@ -1454,11 +1449,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
} else {
log.warn("Agent is unreachable [" + agent + "] - cannot get live configuration for resource ["
- + resource + "]");
+ + resource + "]");
}
} catch (Exception e) {
log.warn("Could not get live configuration for resource [" + resource + "]"
- + ThrowableUtil.getAllMessages(e, true));
+ + ThrowableUtil.getAllMessages(e, true));
}
return liveConfig;
@@ -1466,7 +1461,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public AbstractResourceConfigurationUpdate mergeConfigurationUpdate(
- AbstractResourceConfigurationUpdate configurationUpdate) {
+ AbstractResourceConfigurationUpdate configurationUpdate) {
return this.entityManager.merge(configurationUpdate);
}
@@ -1480,15 +1475,14 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public Configuration getConfigurationFromDefaultTemplate(ConfigurationDefinition definition) {
ConfigurationDefinition managedDefinition = entityManager.find(ConfigurationDefinition.class, definition
- .getId());
+ .getId());
return managedDefinition.getDefaultTemplate().getConfiguration();
}
private void handlePluginConfiguratonUpdateRemoteException(Resource resource, String summary, String detail) {
resource.setConnected(false);
ResourceError invalidPluginConfigError = new ResourceError(resource,
- ResourceErrorType.INVALID_PLUGIN_CONFIGURATION, summary, detail, Calendar.getInstance()
- .getTimeInMillis());
+ ResourceErrorType.INVALID_PLUGIN_CONFIGURATION, summary, detail, Calendar.getInstance().getTimeInMillis());
this.resourceManager.addResourceError(invalidPluginConfigError);
}
@@ -1505,11 +1499,11 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public int scheduleGroupPluginConfigurationUpdate(Subject subject, int compatibleGroupId,
- Map<Integer, Configuration> memberPluginConfigurations) throws SchedulerException {
+ Map<Integer, Configuration> memberPluginConfigurations) throws SchedulerException {
if (memberPluginConfigurations == null) {
throw new IllegalArgumentException(
- "GroupPluginConfigurationUpdate must have non-null member configurations.");
+ "GroupPluginConfigurationUpdate must have non-null member configurations.");
}
ResourceGroup group = getCompatibleGroupIfAuthorized(subject, compatibleGroupId);
@@ -1530,7 +1524,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
Configuration memberResourceConfiguration = memberPluginConfigurations.get(resourceId);
Resource flyWeight = new Resource(resourceId);
PluginConfigurationUpdate memberUpdate = new PluginConfigurationUpdate(flyWeight,
- memberResourceConfiguration, subject.getName());
+ memberResourceConfiguration, subject.getName());
memberUpdate.setGroupConfigurationUpdate(groupUpdate);
entityManager.persist(memberUpdate);
}
@@ -1553,19 +1547,19 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public int scheduleGroupResourceConfigurationUpdate(Subject subject, int compatibleGroupId,//
- @WebParam(targetNamespace = ServerVersion.namespace)//
- @XmlJavaTypeAdapter(WebServiceTypeAdapter.class)//
- Map<Integer, Configuration> newResourceConfigurationMap) {
+ @WebParam(targetNamespace = ServerVersion.namespace)//
+ @XmlJavaTypeAdapter(WebServiceTypeAdapter.class)//
+ Map<Integer, Configuration> newResourceConfigurationMap) {
if (newResourceConfigurationMap == null) {
throw new IllegalArgumentException(
- "GroupResourceConfigurationUpdate must have non-null member configurations.");
+ "GroupResourceConfigurationUpdate must have non-null member configurations.");
}
ResourceGroup group = getCompatibleGroupIfAuthorized(subject, compatibleGroupId);
if (!authorizationManager.hasGroupPermission(subject, Permission.CONFIGURE_WRITE, group.getId())) {
throw new PermissionException("User [" + subject.getName() + "] does not have permission "
- + "to modify Resource configurations for members of group [" + group + "].");
+ + "to modify Resource configurations for members of group [" + group + "].");
}
ensureNoResourceConfigurationUpdatesInProgress(group);
@@ -1591,7 +1585,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
Configuration memberResourceConfiguration = newResourceConfigurationMap.get(resourceId);
Resource flyWeight = new Resource(resourceId);
ResourceConfigurationUpdate memberUpdate = new ResourceConfigurationUpdate(flyWeight,
- memberResourceConfiguration, subject.getName());
+ memberResourceConfiguration, subject.getName());
memberUpdate.setGroupConfigurationUpdate(groupUpdate);
entityManager.persist(memberUpdate);
}
@@ -1615,7 +1609,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
log.debug("Scheduled Resource configuration update against compatible ResourceGroup[id=" + compatibleGroupId
- + "].");
+ + "].");
return updateId;
}
@@ -1628,7 +1622,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
group = resourceGroupManager.getResourceGroupById(subject, compatibleGroupId, GroupCategory.COMPATIBLE);
} catch (ResourceGroupNotFoundException e) {
throw new RuntimeException("Cannot get support operations for unknown group [" + compatibleGroupId + "]: "
- + e, e);
+ + e, e);
}
return group;
@@ -1637,36 +1631,36 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
private void ensureModifyPermission(Subject subject, Resource resource) throws PermissionException {
if (!authorizationManager.hasResourcePermission(subject, Permission.MODIFY_RESOURCE, resource.getId())) {
throw new PermissionException("User [" + subject.getName() + "] does not have permission "
- + "to modify plugin configuration for resource [" + resource + "]");
+ + "to modify plugin configuration for resource [" + resource + "]");
}
}
private void ensureModifyResourcePermission(Subject subject, ResourceGroup group) throws PermissionException {
if (!authorizationManager.hasGroupPermission(subject, Permission.MODIFY_RESOURCE, group.getId())) {
throw new PermissionException("User [" + subject.getName() + "] does not have permission "
- + "to modify plugin configuration for members of group [" + group + "]");
+ + "to modify plugin configuration for members of group [" + group + "]");
}
}
public GroupPluginConfigurationUpdate getGroupPluginConfigurationById(int configurationUpdateId) {
GroupPluginConfigurationUpdate update = entityManager.find(GroupPluginConfigurationUpdate.class,
- configurationUpdateId);
+ configurationUpdateId);
return update;
}
public GroupResourceConfigurationUpdate getGroupResourceConfigurationById(int configurationUpdateId) {
GroupResourceConfigurationUpdate update = entityManager.find(GroupResourceConfigurationUpdate.class,
- configurationUpdateId);
+ configurationUpdateId);
return update;
}
@SuppressWarnings("unchecked")
public PageList<ConfigurationUpdateComposite> findPluginConfigurationUpdateCompositesByParentId(
- int configurationUpdateId, PageControl pageControl) {
+ int configurationUpdateId, PageControl pageControl) {
pageControl.initDefaultOrderingField("cu.modifiedTime");
Query query = PersistenceUtility.createQueryWithOrderBy(entityManager,
- PluginConfigurationUpdate.QUERY_FIND_COMPOSITE_BY_PARENT_UPDATE_ID, pageControl);
+ PluginConfigurationUpdate.QUERY_FIND_COMPOSITE_BY_PARENT_UPDATE_ID, pageControl);
query.setParameter("groupConfigurationUpdateId", configurationUpdateId);
long count = getPluginConfigurationUpdateCountByParentId(configurationUpdateId);
@@ -1678,14 +1672,14 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@SuppressWarnings("unchecked")
public PageList<ConfigurationUpdateComposite> findResourceConfigurationUpdateCompositesByParentId(Subject subject,
- int configurationUpdateId, PageControl pageControl) {
+ int configurationUpdateId, PageControl pageControl) {
// will perform CONFIGURE_READ security check for us, no need to save the
getGroupResourceConfigurationUpdate(subject, configurationUpdateId);
pageControl.initDefaultOrderingField("cu.modifiedTime");
Query query = PersistenceUtility.createQueryWithOrderBy(entityManager,
- ResourceConfigurationUpdate.QUERY_FIND_COMPOSITE_BY_PARENT_UPDATE_ID, pageControl);
+ ResourceConfigurationUpdate.QUERY_FIND_COMPOSITE_BY_PARENT_UPDATE_ID, pageControl);
query.setParameter("groupConfigurationUpdateId", configurationUpdateId);
long count = getResourceConfigurationUpdateCountByParentId(configurationUpdateId);
@@ -1700,7 +1694,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
pageControl.initDefaultOrderingField("cu.modifiedTime");
Query query = PersistenceUtility.createQueryWithOrderBy(entityManager,
- PluginConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID, pageControl);
+ PluginConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID, pageControl);
query.setParameter("groupConfigurationUpdateId", configurationUpdateId);
long count = getPluginConfigurationUpdateCountByParentId(configurationUpdateId);
@@ -1712,18 +1706,18 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public long getPluginConfigurationUpdateCountByParentId(int configurationUpdateId) {
Query countQuery = PersistenceUtility.createCountQuery(entityManager,
- PluginConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID);
+ PluginConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID);
countQuery.setParameter("groupConfigurationUpdateId", configurationUpdateId);
return (Long) countQuery.getSingleResult();
}
@SuppressWarnings("unchecked")
public PageList<Integer> findResourceConfigurationUpdatesByParentId(int groupConfigurationUpdateId,
- PageControl pageControl) {
+ PageControl pageControl) {
pageControl.initDefaultOrderingField("cu.modifiedTime");
Query query = PersistenceUtility.createQueryWithOrderBy(entityManager,
- ResourceConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID, pageControl);
+ ResourceConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID, pageControl);
query.setParameter("groupConfigurationUpdateId", groupConfigurationUpdateId);
long count = getResourceConfigurationUpdateCountByParentId(groupConfigurationUpdateId);
@@ -1735,41 +1729,41 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public long getResourceConfigurationUpdateCountByParentId(int groupConfigurationUpdateId) {
Query countQuery = PersistenceUtility.createCountQuery(entityManager,
- ResourceConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID);
+ ResourceConfigurationUpdate.QUERY_FIND_BY_PARENT_UPDATE_ID);
countQuery.setParameter("groupConfigurationUpdateId", groupConfigurationUpdateId);
return (Long) countQuery.getSingleResult();
}
@SuppressWarnings("unchecked")
public Map<Integer, Configuration> getResourceConfigurationMapForGroupUpdate(Subject subject,
- Integer groupResourceConfigurationUpdateId) {
+ Integer groupResourceConfigurationUpdateId) {
// this method will perform the CONFIGURE_READ security check for us, no need to keep reference to result
getGroupResourceConfigurationUpdate(subject, groupResourceConfigurationUpdateId);
Tuple<String, Object> groupIdParameter = new Tuple<String, Object>("groupConfigurationUpdateId",
- groupResourceConfigurationUpdateId);
+ groupResourceConfigurationUpdateId);
return executeGetConfigurationMapQuery(Configuration.QUERY_GET_RESOURCE_CONFIG_MAP_BY_GROUP_UPDATE_ID, 100,
- groupIdParameter);
+ groupIdParameter);
}
@SuppressWarnings("unchecked")
public Map<Integer, Configuration> getPluginConfigurationMapForGroupUpdate(Integer groupPluginConfigurationUpdateId) {
Tuple<String, Object> groupIdParameter = new Tuple<String, Object>("groupConfigurationUpdateId",
- groupPluginConfigurationUpdateId);
+ groupPluginConfigurationUpdateId);
return executeGetConfigurationMapQuery(Configuration.QUERY_GET_PLUGIN_CONFIG_MAP_BY_GROUP_UPDATE_ID, 100,
- groupIdParameter);
+ groupIdParameter);
}
@SuppressWarnings("unchecked")
public Map<Integer, Configuration> getResourceConfigurationMapForCompatibleGroup(ResourceGroup compatibleGroup) {
Tuple<String, Object> groupIdParameter = new Tuple<String, Object>("resourceGroupId", compatibleGroup.getId());
return executeGetConfigurationMapQuery(Configuration.QUERY_GET_RESOURCE_CONFIG_MAP_BY_GROUP_ID, 100,
- groupIdParameter);
+ groupIdParameter);
}
@SuppressWarnings("unchecked")
private Map<Integer, Configuration> executeGetConfigurationMapQuery(String memberQueryName, int maxSize,
- Tuple<String, Object>... parameters) {
+ Tuple<String, Object>... parameters) {
Query countQuery = PersistenceUtility.createCountQuery(entityManager, memberQueryName);
Query query = entityManager.createNamedQuery(memberQueryName);
@@ -1784,7 +1778,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
int resultsSize;
if (count > maxSize) {
log.error("Configuration set contains more than " + maxSize + " members - " + "returning only " + maxSize
- + " Configurations (the maximum allowed).");
+ + " Configurations (the maximum allowed).");
resultsSize = maxSize;
} else {
resultsSize = (int) count;
@@ -1804,9 +1798,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
pc.initDefaultOrderingField("modifiedTime", PageOrdering.DESC);
Query query = PersistenceUtility.createQueryWithOrderBy(entityManager,
- GroupPluginConfigurationUpdate.QUERY_FIND_BY_GROUP_ID, pc);
+ GroupPluginConfigurationUpdate.QUERY_FIND_BY_GROUP_ID, pc);
Query countQuery = PersistenceUtility.createCountQuery(entityManager,
- GroupPluginConfigurationUpdate.QUERY_FIND_BY_GROUP_ID);
+ GroupPluginConfigurationUpdate.QUERY_FIND_BY_GROUP_ID);
query.setParameter("groupId", groupId);
countQuery.setParameter("groupId", groupId);
@@ -1820,18 +1814,18 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@SuppressWarnings("unchecked")
public PageList<GroupResourceConfigurationUpdate> findGroupResourceConfigurationUpdates(Subject subject,
- int groupId, PageControl pc) {
+ int groupId, PageControl pc) {
if (authorizationManager.hasGroupPermission(subject, Permission.CONFIGURE_READ, groupId) == false) {
throw new PermissionException("User[name=" + subject.getName()
- + "] does not have permission to view configuration for group[id=" + groupId + "]");
+ + "] does not have permission to view configuration for group[id=" + groupId + "]");
}
pc.initDefaultOrderingField("modifiedTime", PageOrdering.DESC);
Query query = PersistenceUtility.createQueryWithOrderBy(entityManager,
- GroupResourceConfigurationUpdate.QUERY_FIND_BY_GROUP_ID, pc);
+ GroupResourceConfigurationUpdate.QUERY_FIND_BY_GROUP_ID, pc);
Query countQuery = PersistenceUtility.createCountQuery(entityManager,
- GroupResourceConfigurationUpdate.QUERY_FIND_BY_GROUP_ID);
+ GroupResourceConfigurationUpdate.QUERY_FIND_BY_GROUP_ID);
query.setParameter("groupId", groupId);
countQuery.setParameter("groupId", groupId);
@@ -1845,10 +1839,10 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@SuppressWarnings("unchecked")
public ConfigurationUpdateStatus updateGroupPluginConfigurationUpdateStatus(int groupConfigurationUpdateId,
- String errorMessages) {
+ String errorMessages) {
GroupPluginConfigurationUpdate groupUpdate = configurationManager
- .getGroupPluginConfigurationById(groupConfigurationUpdateId);
+ .getGroupPluginConfigurationById(groupConfigurationUpdateId);
Query query = entityManager.createNamedQuery(PluginConfigurationUpdate.QUERY_FIND_STATUS_BY_PARENT_UPDATE_ID);
query.setParameter("groupConfigurationUpdateId", groupConfigurationUpdateId);
@@ -1870,13 +1864,13 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public int deleteGroupPluginConfigurationUpdates(Subject subject, Integer resourceGroupId,
- Integer[] groupPluginConfigurationUpdateIds) {
+ Integer[] groupPluginConfigurationUpdateIds) {
// TODO: use subject and resourceGroupId to perform security check
if (authorizationManager.hasGroupPermission(subject, Permission.MODIFY_RESOURCE, resourceGroupId) == false) {
log.error(subject + " attempted to delete " + groupPluginConfigurationUpdateIds.length
- + " group resource configuration updates for ResourceGroup[id" + resourceGroupId
- + "], but did not have the " + Permission.MODIFY_RESOURCE.name() + " permission for this group");
+ + " group resource configuration updates for ResourceGroup[id" + resourceGroupId
+ + "], but did not have the " + Permission.MODIFY_RESOURCE.name() + " permission for this group");
return 0;
}
@@ -1904,12 +1898,12 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
}
public int deleteGroupResourceConfigurationUpdates(Subject subject, Integer resourceGroupId,
- Integer[] groupResourceConfigurationUpdateIds) {
+ Integer[] groupResourceConfigurationUpdateIds) {
if (authorizationManager.hasGroupPermission(subject, Permission.MODIFY_RESOURCE, resourceGroupId) == false) {
log.error(subject + " attempted to delete " + groupResourceConfigurationUpdateIds.length
- + " group resource configuration updates for ResourceGroup[id" + resourceGroupId
- + "], but did not have the " + Permission.MODIFY_RESOURCE.name() + " permission for this group");
+ + " group resource configuration updates for ResourceGroup[id" + resourceGroupId
+ + "], but did not have the " + Permission.MODIFY_RESOURCE.name() + " permission for this group");
return 0;
}
@@ -1949,15 +1943,15 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
boolean supportsCascade = DatabaseTypeFactory.getDefaultDatabaseType().supportsSelfReferringCascade();
if (supportsCascade == false) {
Query breakPropertyRecursionQuery = entityManager
- .createNamedQuery(Configuration.QUERY_BREAK_PROPERTY_RECURSION_BY_CONFIGURATION_IDS);
+ .createNamedQuery(Configuration.QUERY_BREAK_PROPERTY_RECURSION_BY_CONFIGURATION_IDS);
breakPropertyRecursionQuery.setParameter("configurationIds", configurationIds);
breakPropertyRecursionQuery.executeUpdate();
}
Query rawConfigurationsQuery = entityManager
- .createNamedQuery(Configuration.QUERY_DELETE_RAW_CONFIGURATIONS_CONFIGURATION_IDS);
+ .createNamedQuery(Configuration.QUERY_DELETE_RAW_CONFIGURATIONS_CONFIGURATION_IDS);
Query configurationsQuery = entityManager
- .createNamedQuery(Configuration.QUERY_DELETE_CONFIGURATIONS_BY_CONFIGURATION_IDs);
+ .createNamedQuery(Configuration.QUERY_DELETE_CONFIGURATIONS_BY_CONFIGURATION_IDs);
rawConfigurationsQuery.setParameter("configurationIds", configurationIds);
configurationsQuery.setParameter("configurationIds", configurationIds);
@@ -1982,32 +1976,31 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
int groupId = update.getGroup().getId();
if (!authorizationManager.canViewGroup(subject, groupId)) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view group Resource configuration for [" + update.getGroup() + "]");
+ + "] does not have permission to view group Resource configuration for [" + update.getGroup() + "]");
}
return update;
}
public GroupResourceConfigurationUpdate getGroupResourceConfigurationUpdate(Subject subject,
- int configurationUpdateId) {
+ int configurationUpdateId) {
GroupResourceConfigurationUpdate update = getGroupResourceConfigurationById(configurationUpdateId);
int groupId = update.getGroup().getId();
if (authorizationManager.hasGroupPermission(subject, Permission.CONFIGURE_READ, groupId) == false) {
throw new PermissionException("User[" + subject.getName()
- + "] does not have permission to view group resourceConfiguration[id=" + configurationUpdateId
- + "]");
+ + "] does not have permission to view group resourceConfiguration[id=" + configurationUpdateId + "]");
}
return update;
}
public Configuration translateResourceConfiguration(Subject subject, int resourceId, Configuration configuration,
- boolean fromStructured) {
+ boolean fromStructured) {
if (!isStructuredAndRawSupported(resourceId)) {
throw new TranslationNotSupportedException("The translation operation is only supported for "
- + "configurations that support both structured and raw.");
+ + "configurations that support both structured and raw.");
}
Resource resource = entityManager.find(Resource.class, resourceId);
@@ -2018,7 +2011,7 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_READ, resource.getId())) {
throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to view resource configuration for [" + resource + "]");
+ + "] does not have permission to view resource configuration for [" + resource + "]");
}
try {
1
0