Merge pull request #98 from lzoubek/bugs/1119802

Bug 1119802 - RFE: Support for resource type name change
rhq-project · Nov 13, 2014 · 86968f0 · 86968f0
2 parents b081e59 + 91291e0
commit 86968f0
Show file tree

Hide file tree

Showing 44 changed files with 146 additions and 65 deletions.
diff --git a/.../client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java b/.../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
@@ -960,6 +960,13 @@
             </xs:documentation>
          </xs:annotation>
       </xs:attribute>
+      <xs:attribute name="displayName" use="optional" type="xs:string">
+         <xs:annotation>
+            <xs:documentation>
+               Formatted name displayed to the user. If this is omitted, the value "name" attribute will be used.
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       <xs:anyAttribute/>
    </xs:complexType>
 

diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
@@ -18,7 +18,7 @@
     <description>Database schema setup, upgrade and other utilities</description>
 
     <properties>
-        <db.schema.version>2.163</db.schema.version>
+        <db.schema.version>2.164</db.schema.version>
         <rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
         <rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
         <rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.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
@@ -26,6 +26,7 @@
         <column name="IGNORED" type="BOOLEAN" default="FALSE" required="TRUE"/>
         <column name="SUPPORTS_MISSING" type="BOOLEAN" default="FALSE" required="TRUE"/>
         <column name="MISSING_POLICY" type="VARCHAR2" size="16" required="true"/>
+        <column name="DISPLAY_NAME" type="VARCHAR2" size="100" />
 
         <index name="RHQ_RES_TYPE_IDX_PLG_NAME" unique="true">
             <field ref="NAME"/>

diff --git 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'
                     </statement>
                 </schema-directSQL>
-            </schemaSpec>
+              </schemaSpec>
 
             <schemaSpec version="2.155">
                 <schema-alterColumn table="RHQ_BUNDLE_DESTINATION" column="DEPLOY_DIR" nullable="true"/>
@@ -2568,9 +2568,16 @@
             <schemaSpec version="2.162">
               <schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT" column="DISCOVERY_DELAY" columnType="INTEGER" />
             </schemaSpec>
+
             <schemaSpec version="2.163">
                 <schema-addColumn table="RHQ_ALERT" column="RECOVERY_TIME" columnType="LONG" />
             </schemaSpec>
+
+            <schemaSpec version="2.164">
+                <schema-addColumn table="RHQ_RESOURCE_TYPE" column="DISPLAY_NAME" columnType="VARCHAR2" precision="100" />
+                <schema-alterColumn table="RHQ_RESOURCE_TYPE" column="DISPLAY_NAME" nullable="true" />
+            </schemaSpec>
+
         </dbupgrade>
     </target>
 </project>
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
@@ -371,6 +371,9 @@ public class ResourceType implements Serializable, Comparable<ResourceType> {
     @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
@@ -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/...coregui/src/main/java/org/rhq/coregui/client/admin/templates/IgnoreResourceTypesView.java b/...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<Permission> 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/.../src/main/java/org/rhq/coregui/client/admin/templates/MissingPolicyResourceTypesView.java b/.../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/...gui/src/main/java/org/rhq/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java b/...gui/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/...i/coregui/src/main/java/org/rhq/coregui/client/admin/templates/TemplateSchedulesView.java b/...i/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<Permission> 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/...ava/org/rhq/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java b/...ava/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<ResourceType> results) {
                     LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(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/.../src/main/java/org/rhq/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java b/.../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/.../gui/coregui/src/main/java/org/rhq/coregui/client/drift/DriftDefinitionTemplatesView.java b/.../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/...i/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftAddDefinitionWizard.java b/...i/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/...gui/coregui/src/main/java/org/rhq/coregui/client/drift/wizard/DriftPinTemplateWizard.java b/...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/...c/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/...c/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/...regui/src/main/java/org/rhq/coregui/client/inventory/groups/ResourceGroupsDataSource.java b/...regui/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/...org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java b/...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<ResourceType> result) {
                     if (result != null && !result.isEmpty()) {
                         ArrayList<String> typeNames = new ArrayList<String>();
                         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 {