diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java
index 21b14f976fe..d53b2d84ec9 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java
@@ -319,6 +319,7 @@ private ResourceType parsePlatformDescriptor(PlatformDescriptor platformDescript
ResourceCategory.PLATFORM, null);
platformResourceType.setDescription(platformDescriptor.getDescription());
+ platformResourceType.setDisplayName(platformDescriptor.getDisplayName());
LOG.debug("Parsed platform resource type: " + platformResourceType);
parseResourceDescriptor(platformDescriptor, platformResourceType, null, null, null);
@@ -353,6 +354,7 @@ private ResourceType parseServerDescriptor(ServerDescriptor serverDescriptor, Re
serverResourceType = new ResourceType(serverDescriptor.getName(), pluginDescriptor.getName(),
ResourceCategory.SERVER, parentServerType);
serverResourceType.setDescription(serverDescriptor.getDescription());
+ serverResourceType.setDisplayName(serverDescriptor.getDisplayName());
serverResourceType.setSubCategory(serverDescriptor.getSubCategory());
serverResourceType.setCreationDataType(convertCreationDataType(serverDescriptor.getCreationDataType()));
serverResourceType
@@ -477,6 +479,7 @@ private ResourceType parseServiceDescriptor(ServiceDescriptor serviceDescriptor,
serviceResourceType = new ResourceType(serviceDescriptor.getName(), pluginDescriptor.getName(),
ResourceCategory.SERVICE, parentType);
serviceResourceType.setDescription(serviceDescriptor.getDescription());
+ serviceResourceType.setDisplayName(serviceDescriptor.getDisplayName());
serviceResourceType.setSubCategory(serviceDescriptor.getSubCategory());
serviceResourceType.setCreationDataType(convertCreationDataType(serviceDescriptor.getCreationDataType()));
serviceResourceType.setCreateDeletePolicy(convertCreateDeletePolicy(serviceDescriptor
@@ -521,7 +524,7 @@ private ResourceType parseServiceDescriptor(ServiceDescriptor serviceDescriptor,
// values.
serviceResourceType.setDescription(serviceDescriptor.getDescription());
serviceResourceType.setSubCategory(serviceDescriptor.getSubCategory());
-
+ serviceResourceType.setDisplayName(serviceDescriptor.getDisplayName());
serviceResourceType.setCreationDataType(convertCreationDataType(serviceDescriptor.getCreationDataType()));
serviceResourceType.setCreateDeletePolicy(convertCreateDeletePolicy(serviceDescriptor
.getCreateDeletePolicy()));
@@ -623,6 +626,9 @@ private void parseResourceDescriptor(ResourceDescriptor resourceDescriptor, Reso
if (resourceType.getDescription() == null) {
resourceType.setDescription(resourceDescriptor.getDescription());
}
+ if (resourceType.getDisplayName() == null) {
+ resourceType.setDisplayName(resourceDescriptor.getDisplayName());
+ }
if (resourceType.getSubCategory() == null) {
resourceType.setSubCategory(resourceDescriptor.getSubCategory());
diff --git a/modules/core/client-api/src/main/resources/rhq-plugin.xsd b/modules/core/client-api/src/main/resources/rhq-plugin.xsd
index 7c8967c297e..042bb5c3905 100644
--- a/modules/core/client-api/src/main/resources/rhq-plugin.xsd
+++ b/modules/core/client-api/src/main/resources/rhq-plugin.xsd
@@ -960,6 +960,13 @@
+
+
+
+ Formatted name displayed to the user. If this is omitted, the value "name" attribute will be used.
+
+
+
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index de0e4749000..b7a16054d92 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -18,7 +18,7 @@
Database schema setup, upgrade and other utilities
- 2.163
+ 2.164
${rhq.test.ds.type-mapping}
${rhq.test.ds.server-name}
${rhq.test.ds.db-name}
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
index 8712485c7d4..b9cc5368398 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml
@@ -26,6 +26,7 @@
+
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 9094576b1bd..daa72420ed1 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2426,7 +2426,7 @@
WHERE job_class_name='org.rhq.enterprise.server.scheduler.jobs.AlertAvailabilityDurationJob'
-
+
@@ -2568,9 +2568,16 @@
+
+
+
+
+
+
+
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
index a09c7ada508..13df7f2f921 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
@@ -371,6 +371,9 @@ public class ResourceType implements Serializable, Comparable {
@Column(name = "SUBCATEGORY")
private String subCategory;
+ @Column(name = "DISPLAY_NAME")
+ private String displayName;
+
@OneToMany(mappedBy = "resourceType", cascade = CascadeType.ALL)
@OrderBy
// primary key
@@ -473,6 +476,14 @@ public void setName(String name) {
this.name = name;
}
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
public ResourceCategory getCategory() {
return this.category;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/util/ResourceTypeUtility.java b/modules/core/domain/src/main/java/org/rhq/core/domain/util/ResourceTypeUtility.java
index f3484f80221..f3c26a935d6 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/util/ResourceTypeUtility.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/util/ResourceTypeUtility.java
@@ -75,6 +75,12 @@ public static OperationDefinition getOperationDefinition(ResourceType type, Stri
return null;
}
+ public static String displayName(ResourceType resourceType) {
+ if (resourceType == null)
+ return null;
+ return resourceType.getDisplayName() == null ? resourceType.getName() : resourceType.getDisplayName();
+ }
+
private ResourceTypeUtility() {
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/IgnoreResourceTypesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/IgnoreResourceTypesView.java
index 505732aa21d..9cf6e657efb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/IgnoreResourceTypesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/IgnoreResourceTypesView.java
@@ -40,6 +40,7 @@
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceTypeTemplateCountComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.IconEnum;
import org.rhq.coregui.client.ImageManager;
@@ -108,8 +109,9 @@ public void onPermissionsLoaded(Set permissions) {
}
final boolean newIgnoreFlag = !type.isIgnored();
- String msg = newIgnoreFlag ? MSG.view_adminConfig_ignoreResourceTypes_confirmIgnore(type.getName())
- : MSG.view_adminConfig_ignoreResourceTypes_confirmUnignore(type.getName());
+ String msg = newIgnoreFlag ? MSG.view_adminConfig_ignoreResourceTypes_confirmIgnore(ResourceTypeUtility
+ .displayName(type)) : MSG.view_adminConfig_ignoreResourceTypes_confirmUnignore(ResourceTypeUtility
+ .displayName(type));
SC.ask(MSG.common_msg_areYouSure(), msg, new BooleanCallback() {
public void execute(Boolean value) {
if (Boolean.TRUE.equals(value)) {
@@ -128,8 +130,10 @@ public void onSuccess(Void result) {
type.setIgnored(newIgnoreFlag); // this type reference is inside our cache so make sure we update it
String msg = newIgnoreFlag ? MSG
- .view_adminConfig_ignoreResourceTypes_successIgnore(type.getName()) : MSG
- .view_adminConfig_ignoreResourceTypes_successUnignore(type.getName());
+ .view_adminConfig_ignoreResourceTypes_successIgnore(ResourceTypeUtility
+ .displayName(type)) : MSG
+ .view_adminConfig_ignoreResourceTypes_successUnignore(ResourceTypeUtility
+ .displayName(type));
CoreGUI.getMessageCenter().notify(new Message(msg));
// refresh the listgrid
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/MissingPolicyResourceTypesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/MissingPolicyResourceTypesView.java
index 4308d149c0d..17c365d6070 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/MissingPolicyResourceTypesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/MissingPolicyResourceTypesView.java
@@ -44,6 +44,7 @@
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceTypeTemplateCountComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.IconEnum;
import org.rhq.coregui.client.ImageManager;
@@ -217,7 +218,7 @@ public void onSuccess(Void result) {
type.setMissingPolicy(newPolicy);
String msg = MSG.view_adminConfig_missingResourcePolicy_success(
- getPolicyDisplay(newPolicy), type.getName());
+ getPolicyDisplay(newPolicy), ResourceTypeUtility.displayName(type));
CoreGUI.getMessageCenter().notify(new Message(msg));
// refresh the grid
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
index f202e2f58fe..e81cdaf514f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
@@ -35,6 +35,7 @@
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceTypeTemplateCountComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.Messages;
@@ -220,7 +221,7 @@ protected ResourceTypeListGridRecord(ResourceTypeTemplateCountComposite composit
this.id = resourceType.getId();
setAttribute(ATTRIB_ID, String.valueOf(id));
- setAttribute(ATTRIB_NAME, resourceType.getName());
+ setAttribute(ATTRIB_NAME, ResourceTypeUtility.displayName(resourceType));
setAttribute(ATTRIB_PLUGIN, resourceType.getPlugin());
setAttribute(ATTRIB_CATEGORY, resourceType.getCategory().name());
setAttribute(ATTRIB_EDIT, ImageManager.getEditIcon());
@@ -260,7 +261,7 @@ protected ResourceTypeTreeNode(ResourceTypeTemplateCountComposite composite, Str
this.parentId = parentId;
setAttribute(ATTRIB_ID, id);
- setAttribute(ATTRIB_NAME, resourceType.getName());
+ setAttribute(ATTRIB_NAME, ResourceTypeUtility.displayName(resourceType));
setAttribute(ATTRIB_PLUGIN, resourceType.getPlugin());
setAttribute(ATTRIB_CATEGORY, resourceType.getCategory().name());
setAttribute(ATTRIB_EDIT, ImageManager.getEditIcon());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/TemplateSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/TemplateSchedulesView.java
index 246370fc3f2..ef1ba4ca693 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/TemplateSchedulesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/TemplateSchedulesView.java
@@ -26,6 +26,7 @@
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.inventory.common.AbstractSchedulesView;
import org.rhq.coregui.client.util.message.Message;
@@ -49,7 +50,7 @@ public TemplateSchedulesView(ResourceType type, Set globalPermission
}
public static String getTitle(ResourceType type) {
- return MSG.view_adminConfig_metricTemplates() + " [" + type.getName() + "]";
+ return MSG.view_adminConfig_metricTemplates() + " [" + ResourceTypeUtility.displayName(type) + "]";
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
index 5e0791a15ad..1a6ca0dce52 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
@@ -56,6 +56,7 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.alert.definitions.ResourceOperationNotificationInfo.ResourceSelectionMode;
import org.rhq.coregui.client.components.configuration.ConfigurationEditor;
@@ -293,7 +294,7 @@ private void populateRelativeDropDownMenus(final Integer selectedResourceTypeId,
public void onSuccess(ArrayList results) {
LinkedHashMap map = new LinkedHashMap(results.size());
for (ResourceType rt : results) {
- map.put(String.valueOf(rt.getId()), rt.getName());
+ map.put(String.valueOf(rt.getId()), ResourceTypeUtility.displayName(rt));
}
ancestorTypeSelectItem.setValueMap(map);
if (selectedResourceTypeId != null) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
index 6dbbe5d9fb5..a12b2957ce2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
@@ -34,6 +34,7 @@
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -79,7 +80,7 @@ public void onTypesLoaded(ResourceType type) {
}
public static String getTitle(ResourceType type) {
- return MSG.view_adminConfig_alertDefTemplates() + " [" + type.getName() + "]";
+ return MSG.view_adminConfig_alertDefTemplates() + " [" + ResourceTypeUtility.displayName(type) + "]";
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/DriftDefinitionTemplatesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/DriftDefinitionTemplatesView.java
index 89467c9a73c..a49f337069a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/DriftDefinitionTemplatesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/DriftDefinitionTemplatesView.java
@@ -49,6 +49,7 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.LinkManager;
@@ -124,7 +125,7 @@ protected ListGrid createListGrid() {
}
public static String getTitle(ResourceType type) {
- return DriftDefinitionTemplateTypeView.VIEW_ID.getTitle() + " [" + type.getName() + "]";
+ return DriftDefinitionTemplateTypeView.VIEW_ID.getTitle() + " [" + ResourceTypeUtility.displayName(type) + "]";
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftAddDefinitionWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftAddDefinitionWizard.java
index 23034eb2d34..890f9072469 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftAddDefinitionWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftAddDefinitionWizard.java
@@ -29,6 +29,7 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.components.table.Table;
import org.rhq.coregui.client.components.wizard.WizardStep;
@@ -71,10 +72,10 @@ public String getWindowTitle() {
public String getTitle() {
switch (getEntityContext().getType()) {
case SubsystemView:
- return MSG.view_drift_wizard_addTemplate_title(getType().getName());
+ return MSG.view_drift_wizard_addTemplate_title(ResourceTypeUtility.displayName(getType()));
default:
- return MSG.view_drift_wizard_addDef_title(getType().getName());
+ return MSG.view_drift_wizard_addDef_title(ResourceTypeUtility.displayName(getType()));
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftPinTemplateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftPinTemplateWizard.java
index 24912e63add..e098ae1e7f6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftPinTemplateWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftPinTemplateWizard.java
@@ -29,6 +29,7 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.LinkManager;
import org.rhq.coregui.client.components.wizard.WizardStep;
@@ -61,7 +62,7 @@ public String getWindowTitle() {
@Override
public String getTitle() {
return MSG.view_drift_wizard_pinTemplate_title(String.valueOf(getSnapshotVersion()), getSnapshotDriftDef()
- .getName(), getResourceType().getName());
+ .getName(), ResourceTypeUtility.displayName(getResourceType()));
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index 8a6dca51666..32b473c9a5e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -45,6 +45,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.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.Messages;
@@ -225,7 +226,8 @@ public ListGridRecord copyValues(ResourceGroupComposite from) {
if (from.getResourceGroup().getResourceType() != null) {
record.setAttribute("resourceType", from.getResourceGroup().getResourceType());
- record.setAttribute(TYPE.propertyName(), from.getResourceGroup().getResourceType().getName());
+ record.setAttribute(TYPE.propertyName(),
+ ResourceTypeUtility.displayName(from.getResourceGroup().getResourceType()));
record.setAttribute(PLUGIN.propertyName(), from.getResourceGroup().getResourceType().getPlugin());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupsDataSource.java
index e8b21d04550..6f9f94138e6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupsDataSource.java
@@ -41,6 +41,7 @@
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
import org.rhq.coregui.client.gwt.ResourceGroupGWTServiceAsync;
@@ -163,7 +164,7 @@ public ListGridRecord copyValues(ResourceGroup from) {
if (from.getResourceType() != null) {
record.setAttribute("resourceType", from.getResourceType());
- record.setAttribute(TYPE.propertyName(), from.getResourceType().getName());
+ record.setAttribute(TYPE.propertyName(), ResourceTypeUtility.displayName(from.getResourceType()));
record.setAttribute(PLUGIN.propertyName(), from.getResourceType().getPlugin());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java
index e76ed160b8b..4d102c86928 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java
@@ -51,6 +51,7 @@
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.Messages;
import org.rhq.coregui.client.components.form.SortedSelectItem;
@@ -503,8 +504,9 @@ public void onSuccess(PageList result) {
if (result != null && !result.isEmpty()) {
ArrayList typeNames = new ArrayList();
for (ResourceType type : result) {
- typeNames.add(type.getName());
- resourceTypeIds.put(type.getName(), Integer.valueOf(type.getId()));
+ String typeName = ResourceTypeUtility.displayName(type);
+ typeNames.add(typeName);
+ resourceTypeIds.put(typeName, Integer.valueOf(type.getId()));
}
resourceTypeItem.setValueMap(typeNames.toArray(new String[typeNames.size()]));
} else {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/GeneralProperties.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/GeneralProperties.java
index d78f57b7257..e4dc86d7931 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/GeneralProperties.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/GeneralProperties.java
@@ -32,6 +32,7 @@
import org.rhq.core.domain.resource.group.GroupDefinition;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.LinkManager;
import org.rhq.coregui.client.components.form.CheckboxEditableFormItem;
@@ -138,8 +139,8 @@ public void onSuccess(Void result) {
if (type != null) {
// compatible group
typeItem.setTooltip(MSG.common_title_plugin() + ": " + type.getPlugin() + "\n
"
- + MSG.common_title_type() + ": " + type.getName());
- typeItem.setValue(type.getName() + " (" + type.getPlugin() + ")");
+ + MSG.common_title_type() + ": " + ResourceTypeUtility.displayName(type));
+ typeItem.setValue(ResourceTypeUtility.displayName(type) + " (" + type.getPlugin() + ")");
} else {
// mixed group
typeItem.setValue("" + MSG.view_group_summary_mixed() + "");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java
index 4460a961c84..5af1fefbad2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java
@@ -45,6 +45,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.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.LinkManager;
import org.rhq.coregui.client.Messages;
@@ -141,7 +142,7 @@ private void buildResourceGroupContextMenu(final VLayout treeView, final TreeGri
setItems(new MenuItem(group.getName()));
// type name
- addItem(new MenuItem("Type: " + resourceType.getName()));
+ addItem(new MenuItem("Type: " + ResourceTypeUtility.displayName(resourceType)));
// Mixed group refresh is not needed as there is only a single top node. Compat group
// refresh makes sense after a group membership change but we already perform a CoreGUI refresh to
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index e51f323d408..10c0db007bc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -38,6 +38,7 @@
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite.GroupAvailabilityType;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.UserSessionManager;
@@ -260,7 +261,7 @@ public void setGroup(ResourceGroupComposite groupComposite, boolean isRefresh) {
// case, because recursive compat groups are typically used specifically for groups of logically equivalent
// resources, like cloned AS instances. The problem is that it is not localized. Change it on the fly.
if (isAutoCluster) {
- String typeName = group.getResourceType().getName();
+ String typeName = ResourceTypeUtility.displayName(group.getResourceType());
String cannedName = "Group of " + typeName;
if (cannedName.equals(group.getName())) {
group.setName(MSG.group_tree_groupOfResourceType(typeName));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 8c5b813a601..b94dcae7a9e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -54,6 +54,7 @@
import org.rhq.core.domain.resource.group.composite.ClusterFlyweight;
import org.rhq.core.domain.resource.group.composite.ClusterKeyFlyweight;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.BookmarkableView;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
@@ -573,7 +574,7 @@ private ResourceGroupEnhancedTreeNode createClusterGroupNode(ClusterKey parentKe
// used specifically for groups of logically equivalent resources, like cloned AS instances.
String childName = child.getName();
if ("...".equals(childName)) {
- childName = MSG.group_tree_groupOfResourceType(type.getName());
+ childName = MSG.group_tree_groupOfResourceType(ResourceTypeUtility.displayName(type));
}
ResourceGroupEnhancedTreeNode node = new ResourceGroupEnhancedTreeNode(childName);
@@ -614,7 +615,7 @@ private ResourceGroupEnhancedTreeNode createAutoTypeGroupNode(ClusterKey parentK
// an auto type group node of type WAR means our group members each have multiple WARs deployed to them,
// so this node represents the parent to all the different WARs cluster nodes).
// This node will be associated with only a resource type (not a cluster key)
- String name = StringUtility.pluralize(type.getName());
+ String name = StringUtility.pluralize(ResourceTypeUtility.displayName(type));
ResourceGroupEnhancedTreeNode autoTypeGroupNode = new ResourceGroupEnhancedTreeNode(name);
String parentId = parentKey.getKey();
String autoTypeGroupNodeId = "rt" + String.valueOf(type.getId());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
index 100da28ffa0..6fec948c9fc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
@@ -41,6 +41,7 @@
import org.rhq.core.domain.resource.composite.ResourcePermission;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.LinkManager;
import org.rhq.coregui.client.RefreshableView;
@@ -54,8 +55,8 @@
import org.rhq.coregui.client.inventory.resource.detail.ResourceDetailView;
import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.coregui.client.util.enhanced.EnhancedIButton;
-import org.rhq.coregui.client.util.enhanced.EnhancedVLayout;
import org.rhq.coregui.client.util.enhanced.EnhancedIButton.ButtonColor;
+import org.rhq.coregui.client.util.enhanced.EnhancedVLayout;
import org.rhq.coregui.client.util.message.Message;
import org.rhq.coregui.client.util.message.MessageCenter;
@@ -220,7 +221,8 @@ private void save() {
resourceConfigurations, new AsyncCallback() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(
- MSG.view_group_resConfig_edit_saveFailure(group.getResourceType().getName(), group.getName()),
+ MSG.view_group_resConfig_edit_saveFailure(
+ ResourceTypeUtility.displayName(group.getResourceType()), group.getName()),
caught);
}
@@ -230,7 +232,8 @@ public void onSuccess(Void result) {
ResourceDetailView.Tab.Configuration.SubTab.HISTORY);
String configHistoryView = configHistoryUrl.substring(1); // chop off the leading '#'
Message message = new Message(MSG.view_group_resConfig_edit_saveInitiated_concise(), MSG
- .view_group_resConfig_edit_saveInitiated_full(group.getResourceType().getName(),
+ .view_group_resConfig_edit_saveInitiated_full(
+ ResourceTypeUtility.displayName(group.getResourceType()),
group.getName()), Message.Severity.Info);
CoreGUI.goToView(configHistoryView, message);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
index 240bac41eb5..7448e392c87 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
@@ -38,6 +38,7 @@
import org.rhq.core.domain.resource.composite.ResourcePermission;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.RefreshableView;
import org.rhq.coregui.client.components.configuration.ConfigurationEditor;
@@ -50,8 +51,8 @@
import org.rhq.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.coregui.client.util.enhanced.EnhancedIButton;
-import org.rhq.coregui.client.util.enhanced.EnhancedVLayout;
import org.rhq.coregui.client.util.enhanced.EnhancedIButton.ButtonColor;
+import org.rhq.coregui.client.util.enhanced.EnhancedVLayout;
import org.rhq.coregui.client.util.message.Message;
import org.rhq.coregui.client.util.message.Message.Severity;
import org.rhq.coregui.client.util.message.MessageCenter;
@@ -215,7 +216,7 @@ private void save() {
GWTServiceLookup.getConfigurationService().updatePluginConfigurationsForGroup(this.group.getId(),
resourceConfigurations, new AsyncCallback() {
public void onFailure(Throwable caught) {
- String typeName = group.getResourceType().getName();
+ String typeName = ResourceTypeUtility.displayName(group.getResourceType());
CoreGUI.getErrorHandler().handleError(
MSG.view_group_pluginConfig_edit_saveFailure(typeName, group.getName()), caught);
}
@@ -223,7 +224,8 @@ public void onFailure(Throwable caught) {
public void onSuccess(Void result) {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_group_pluginConfig_edit_saveInitiated_concise(), MSG
- .view_group_pluginConfig_edit_saveInitiated_full(group.getResourceType().getName(),
+ .view_group_pluginConfig_edit_saveInitiated_full(
+ ResourceTypeUtility.displayName(group.getResourceType()),
group.getName()), Message.Severity.Info));
refresh();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java
index 0db5843678f..98af1d0d5f0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java
@@ -61,6 +61,7 @@
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.LinkManager;
@@ -349,7 +350,7 @@ public void onTypesLoaded(Map types) {
Integer typeId = record.getAttributeAsInt(TYPE.propertyName());
ResourceType type = types.get(typeId);
if (type != null) {
- record.setAttribute(TYPE.propertyName(), type.getName());
+ record.setAttribute(TYPE.propertyName(), ResourceTypeUtility.displayName(type));
record.setAttribute(TYPE_ID.propertyName(), type.getId());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/AncestryUtil.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/AncestryUtil.java
index fe9837002bc..cdb3a5d0c94 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/AncestryUtil.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/AncestryUtil.java
@@ -32,6 +32,7 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.LinkManager;
import org.rhq.coregui.client.util.StringUtility;
@@ -190,7 +191,7 @@ private static StringBuilder addFormattedType(StringBuilder sb, ResourceType typ
sb.append(" [");
sb.append(type.getPlugin());
sb.append(", ");
- sb.append(type.getName());
+ sb.append(ResourceTypeUtility.displayName(type));
sb.append("]");
return sb;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceCompositeDataSource.java
index 07c7d57ade9..4165bd50003 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceCompositeDataSource.java
@@ -60,6 +60,7 @@
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
@@ -156,7 +157,7 @@ public void onTypesLoaded(Map types) {
Integer typeId = record.getAttributeAsInt(TYPE.propertyName());
ResourceType type = types.get(typeId);
if (type != null) {
- record.setAttribute(TYPE.propertyName(), type.getName());
+ record.setAttribute(TYPE.propertyName(), ResourceTypeUtility.displayName(type));
}
// To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceCompositeSearchView.java
index da60d50019d..903f0de6ef2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceCompositeSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceCompositeSearchView.java
@@ -44,6 +44,7 @@
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.resource.composite.ResourcePermission;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.components.table.AbstractTableAction;
import org.rhq.coregui.client.components.table.TableActionEnablement;
@@ -360,7 +361,7 @@ private static Map getDisplayNames(Set types
}
Map results = new TreeMap();
for (ResourceType type : types) {
- String displayName = type.getName();
+ String displayName = ResourceTypeUtility.displayName(type);
if (repeatedNames.contains(type.getName())) {
displayName += " (" + type.getPlugin() + " plugin)";
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceDatasource.java
index e66e9e301e3..a8c8a33fd43 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/ResourceDatasource.java
@@ -59,6 +59,7 @@
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
@@ -227,7 +228,7 @@ public void onTypesLoaded(Map types) {
Integer typeId = record.getAttributeAsInt(TYPE.propertyName());
ResourceType type = types.get(typeId);
if (type != null) {
- record.setAttribute(TYPE.propertyName(), type.getName());
+ record.setAttribute(TYPE.propertyName(), ResourceTypeUtility.displayName(type));
record.setAttribute(TYPE_ID.propertyName(), type.getId());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ChildHistoryDetails.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ChildHistoryDetails.java
index 3b43cc7b9ae..c62bb8b6360 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ChildHistoryDetails.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ChildHistoryDetails.java
@@ -27,6 +27,7 @@
import org.rhq.core.domain.resource.CreateResourceHistory;
import org.rhq.core.domain.resource.DeleteResourceHistory;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.coregui.client.util.enhanced.EnhancedVLayout;
@@ -120,7 +121,7 @@ private DynamicForm buildForCreate(CreateResourceHistory history) {
StaticTextItem createdResourceType = new StaticTextItem("createdResourceType", MSG.common_title_resource_type());
if (history.getResourceType() != null) {
- createdResourceType.setValue(history.getResourceType().getName());
+ createdResourceType.setValue(ResourceTypeUtility.displayName(history.getResourceType()));
} else {
createdResourceType.setValue(MSG.common_status_unknown());
}
@@ -192,7 +193,7 @@ private DynamicForm buildForDelete(DeleteResourceHistory history) {
if (history.getResource() != null) {
deletedResourceName.setValue(history.getResource().getName());
if (history.getResource().getResourceType() != null) {
- deletedResourceType.setValue(history.getResource().getResourceType().getName());
+ deletedResourceType.setValue(ResourceTypeUtility.displayName(history.getResource().getResourceType()));
} else {
deletedResourceType.setValue(MSG.common_status_unknown());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/OpenSupportCaseMenuItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/OpenSupportCaseMenuItem.java
index 9f259a44259..a616f325168 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/OpenSupportCaseMenuItem.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/OpenSupportCaseMenuItem.java
@@ -29,6 +29,7 @@
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.help.RhAccessView;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/OverviewForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/OverviewForm.java
index 9b6693343a3..1075a6b8219 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/OverviewForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/OverviewForm.java
@@ -39,6 +39,7 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceComposite;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.components.form.EditableFormItem;
import org.rhq.coregui.client.components.form.EnhancedDynamicForm;
@@ -147,7 +148,7 @@ private void buildForm(ResourceType type) {
// Type
StaticTextItem typeItem = new StaticTextItem("type", MSG.view_summaryOverviewForm_field_type());
typeItem.setTooltip(MSG.common_title_plugin() + ": " + type.getPlugin() + "\n
" + MSG.common_title_type()
- + ": " + type.getName());
+ + ": " + ResourceTypeUtility.displayName(type));
typeItem.setValue(AncestryUtil.getFormattedType(type));
formItems.add(typeItem);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index 65eedad076f..7d8d439e8b1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -47,6 +47,7 @@
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.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.UserSessionManager;
@@ -493,7 +494,8 @@ void displayResourceName(String resourceName) {
resource.setName(resourceName); // the name must have been changed by the user via the editable field
}
this.title.setContents(" " + resource.getResourceType().getName() + "");
+ + " " + ResourceTypeUtility.displayName(resource.getResourceType())
+ + "");
this.title.markForRedraw();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
index 16323ddf4e0..59dc4665dbc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
@@ -35,7 +35,6 @@
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
-import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.tree.Tree;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
@@ -44,6 +43,7 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.Messages;
import org.rhq.coregui.client.ViewChangedException;
@@ -481,7 +481,7 @@ private AutoGroupTreeNode(Resource resource) {
}
setParentID(parentId);
- String name = StringUtility.pluralize(this.resourceType.getName());
+ String name = StringUtility.pluralize(ResourceTypeUtility.displayName(this.resourceType));
setName(name);
setAttribute(Attributes.DESCRIPTION, this.resourceType.getDescription());
@@ -503,7 +503,8 @@ public ResourceType getResourceType() {
* @return The name of the backing group.
*/
public String getBackingGroupName() {
- return this.getParentResource().getName() + " ( " + this.getResourceType().getName() + " )";
+ return this.getParentResource().getName() + " ( " + ResourceTypeUtility.displayName(this.resourceType)
+ + " )";
}
public Integer getResourceGroupId() {
@@ -542,7 +543,7 @@ public static String idOf(Resource parentResource, ResourceType resourceType) {
}
public void disambiguateName() {
- String typeName = StringUtility.pluralize(this.resourceType.getName());
+ String typeName = StringUtility.pluralize(ResourceTypeUtility.displayName(this.resourceType));
String name = typeName + " (" + this.resourceType.getPlugin() + " "
+ MSG.common_title_plugin().toLowerCase() + ")";
setName(name);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java
index a8343cc6290..7cabee02d5c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -38,7 +38,6 @@
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.types.SelectionStyle;
-import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
import com.smartgwt.client.widgets.grid.events.SelectionEvent;
@@ -65,8 +64,8 @@
import org.rhq.core.domain.resource.composite.ResourcePermission;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
-import org.rhq.coregui.client.ImageManager;
import org.rhq.coregui.client.LinkManager;
import org.rhq.coregui.client.ViewId;
import org.rhq.coregui.client.ViewPath;
@@ -452,8 +451,8 @@ private void buildAndShowResourceContextMenu(final ResourceTreeNode node,
resourceContextMenu.setItems(new MenuItem(resource.getName()));
// resource type name
- resourceContextMenu.addItem(new MenuItem(MSG.view_tree_common_contextMenu_type_name_label(resourceType
- .getName())));
+ resourceContextMenu.addItem(new MenuItem(MSG.view_tree_common_contextMenu_type_name_label(ResourceTypeUtility
+ .displayName(resourceType))));
// separator
resourceContextMenu.addItem(new MenuItemSeparator());
@@ -1036,7 +1035,7 @@ private static Map getDisplayNames(Set types
}
Map results = new TreeMap();
for (ResourceType type : types) {
- String displayName = type.getName();
+ String displayName = ResourceTypeUtility.displayName(type);
if (repeatedNames.contains(type.getName())) {
displayName += " (" + type.getPlugin() + " plugin)";
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java
index d17c41671dd..c42fb6fff80 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java
@@ -42,6 +42,7 @@
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.Messages;
import org.rhq.coregui.client.PermissionsLoadedListener;
@@ -289,7 +290,7 @@ private ResourceTreeNode(Resource resource) {
setAttribute("id", id);
setAttribute("parentId", parentId);
setAttribute("name", resource.getName());
- setAttribute("typeName", resource.getResourceType().getName());
+ setAttribute("typeName", ResourceTypeUtility.displayName(resource.getResourceType()));
setAttribute("resourceKey", resource.getResourceKey());
setAttribute("description", resource.getDescription());
setAttribute("ctime", new Date(resource.getCtime()));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java
index c83492e885a..b7d7651854b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java
@@ -32,6 +32,7 @@
import org.rhq.core.domain.resource.CannotConnectToAgentException;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.components.wizard.WizardStep;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
@@ -108,7 +109,7 @@ public String getWindowTitle() {
}
public String getTitle() {
- return MSG.widget_resourceFactoryWizard_createWizardTitle(getChildType().getName());
+ return MSG.widget_resourceFactoryWizard_createWizardTitle(ResourceTypeUtility.displayName(getChildType()));
}
public String getSubtitle() {
@@ -147,7 +148,8 @@ public void onFailure(Throwable caught) {
public void onSuccess(Void result) {
CoreGUI.getMessageCenter().notify(
- new Message(MSG.widget_resourceFactoryWizard_createSubmitType(getChildType().getName()),
+ new Message(MSG.widget_resourceFactoryWizard_createSubmitType(ResourceTypeUtility
+ .displayName(getChildType())),
Message.Severity.Info));
getView().closeDialog();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java
index bf4104f12b5..ea2d0fec06d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java
@@ -21,7 +21,6 @@
import static org.rhq.coregui.client.CoreGUI.getErrorHandler;
import static org.rhq.coregui.client.CoreGUI.getMessageCenter;
-import static org.rhq.coregui.client.util.message.Message.Severity;
import java.util.ArrayList;
import java.util.EnumSet;
@@ -38,11 +37,13 @@
import org.rhq.core.domain.resource.ImportResourceResponse;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.components.wizard.WizardStep;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
import org.rhq.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.coregui.client.util.message.Message;
+import org.rhq.coregui.client.util.message.Message.Severity;
/**
* @author Jay Shaughnessy
@@ -85,7 +86,7 @@ public String getWindowTitle() {
@Override
public String getTitle() {
- return MSG.widget_resourceFactoryWizard_importWizardTitle(getChildType().getName());
+ return MSG.widget_resourceFactoryWizard_importWizardTitle(ResourceTypeUtility.displayName(getChildType()));
}
@Override
@@ -124,7 +125,7 @@ public void onSuccess(final ImportResourceResponse result) {
public void run() {
boolean resourceAlreadyExisted = result.isResourceAlreadyExisted();
Resource resource = result.getResource();
- String resourceTypeName = resource.getResourceType().getName();
+ String resourceTypeName = ResourceTypeUtility.displayName(resource.getResourceType());
String resourceKey = resource.getResourceKey();
String conciseMessage;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java
index c347e75d737..a0944e485dd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java
@@ -22,6 +22,7 @@
import com.smartgwt.client.widgets.form.events.FormSubmitFailedEvent;
import com.smartgwt.client.widgets.form.events.FormSubmitFailedHandler;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.components.upload.DynamicFormHandler;
import org.rhq.coregui.client.components.upload.DynamicFormSubmitCompleteEvent;
@@ -46,8 +47,9 @@ public ResourceFactoryPackageStep(ResourceFactoryCreateWizard wizard) {
public Canvas getCanvas() {
if (null == uploadForm) {
- uploadForm = new PackageVersionFileUploadForm(wizard.getNewResourcePackageType().getId(), wizard
- .getChildType().getName(), wizard.getNewResourceVersion(), wizard.getNewResourceArchitectureId(), null,
+ uploadForm = new PackageVersionFileUploadForm(wizard.getNewResourcePackageType().getId(),
+ ResourceTypeUtility.displayName(wizard.getChildType()), wizard.getNewResourceVersion(),
+ wizard.getNewResourceArchitectureId(), null,
true, true, null);
uploadForm.setPadding(20);
uploadForm.addFormHandler(new DynamicFormHandler() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java
index 3d36eba6a39..4a0547e39d8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java
@@ -39,6 +39,7 @@
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.IconEnum;
import org.rhq.coregui.client.ImageManager;
@@ -253,10 +254,8 @@ private ResourceTypeTreeNode(String parentId, String id, ResourceType resourceTy
setAttribute(ID, id);
setAttribute(PARENT_ID, parentId);
setAttribute(ITEM_ID, resourceType.getId());
- setAttribute(NAME, resourceType.getName());
+ setAttribute(NAME, ResourceTypeUtility.displayName(resourceType));
setAttribute(PLUGIN, resourceType.getPlugin());
- setAttribute("category", resourceType.getCategory().getDisplayName());
-
setIcon(ImageManager.getResourceIcon(resourceType.getCategory()));
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java
index fdaf847e435..69729b270a0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java
@@ -38,6 +38,7 @@
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.Messages;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
@@ -340,7 +341,7 @@ public void onSuccess(PageList types) {
if (Log.isDebugEnabled()) {
Set typeNames = new LinkedHashSet(topLevelServerAndServiceTypes.size());
for (ResourceType type : topLevelServerAndServiceTypes) {
- typeNames.add(type.getPlugin() + ":" + type.getName());
+ typeNames.add(type.getPlugin() + ":" + ResourceTypeUtility.displayName(type));
}
Log.debug("Loaded " + typeNames.size() + " top-level server and service types: " + typeNames);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java
index b3d66273e7d..d0c3b765a8c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java
@@ -35,6 +35,7 @@
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.core.domain.util.ResourceTypeUtility;
import org.rhq.coregui.client.CoreGUI;
import org.rhq.coregui.client.Messages;
import org.rhq.coregui.client.gwt.GWTServiceLookup;
@@ -231,10 +232,9 @@ private ResourceTypeTreeNode(ResourceType resourceType, String parentId) {
setAttribute("id", id);
setAttribute("parentId", parentId);
- setAttribute("name", resourceType.getName());
+ setAttribute("name", ResourceTypeUtility.displayName(resourceType));
setAttribute("plugin", resourceType.getPlugin());
setAttribute("category", resourceType.getCategory().getDisplayName());
-
setIsFolder(true);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
index 9c476027a0a..2403bafbbdd 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
@@ -382,6 +382,7 @@ private void mergeExistingType(ResourceType resourceType, ResourceType existingT
existingType.setCreateDeletePolicy(resourceType.getCreateDeletePolicy());
existingType.setCreationDataType(resourceType.getCreationDataType());
existingType.setDescription(resourceType.getDescription());
+ existingType.setDisplayName(resourceType.getDisplayName());
existingType.setSingleton(resourceType.isSingleton());
existingType.setSupportsManualAdd(resourceType.isSupportsManualAdd());
existingType.setSupportsMissingAvailabilityType(resourceType.isSupportsMissingAvailabilityType());