Author: ips Date: 2008-10-23 17:07:01 -0400 (Thu, 23 Oct 2008) New Revision: 20 Modified: trunk/core/src/main/java/org/jboss/on/embedded/Constants.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java trunk/core/src/main/webapp/WEB-INF/classes/messages.properties Log: make some of the success/failure messages a little more informative Modified: trunk/core/src/main/java/org/jboss/on/embedded/Constants.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/Constants.java 2008-10-23 00:54:28 UTC (rev 19) +++ trunk/core/src/main/java/org/jboss/on/embedded/Constants.java 2008-10-23 21:07:01 UTC (rev 20) @@ -42,9 +42,8 @@ * action outcome indicating there was an error */ public static final String OUTCOME_ERROR = "error"; - /** - * action outcome indidating that the ROOT summary page should be displayed + * action outcome indicating that the ROOT summary page should be displayed */ public static final String OUTCOME_ROOT = "root"; /** @@ -52,7 +51,7 @@ */ public static final String OUTCOME_CATEGORY_TABLE = "table"; /** - * action outcome indicating that thenavigation should simply be repeated + * action outcome indicating that the navigation should simply be repeated */ public static final String OUTCOME_REPEAT_NAV = "repeatNav"; /** @@ -60,10 +59,9 @@ */ public static final String OUTCOME_RESOURCE_TYPE_SUMMARY = "resourceSummary"; /** - * action outcome indicating that a summary of this single reosource instance should be displayed + * action outcome indicating that a summary of this single resource instance should be displayed */ public static final String OUTCOME_RESOURCE_INSTANCE = "resourceInstance"; - /** * navigation key used to store all the datasources in the nav */ @@ -72,7 +70,6 @@ * navigation key used to store all the JMS items in the nav */ public static final String RESOURCE_CATEGORY_JMS = "jms"; - /** * used to retrieve all the no-tx datasource ResourceTypes from the ResourceManager */ @@ -105,5 +102,4 @@ public static final String TAB_METRIC = "metric"; public static final String TAB_OPERATION = "operation"; public static final String TAB_CONTENT = "content"; - } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2008-10-23 00:54:28 UTC (rev 19) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2008-10-23 21:07:01 UTC (rev 20) @@ -128,7 +128,7 @@ log.info("resource to be removed: " + resource); manager.removeResource(resource); - facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.remove.success"); + facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.remove.success", resource.getResourceType().getName(), resource.getName()); Events.instance().raiseEvent("resourceDeleted", resource); // TODO remove this, not used Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-10-23 00:54:28 UTC (rev 19) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-10-23 21:07:01 UTC (rev 20) @@ -194,7 +194,8 @@ } else { - facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.update.success"); + facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.update.success", + this.serviceType.getName(), this.listItem.getResource().getName()); result = Constants.OUTCOME_SUCCESS; } @@ -220,7 +221,7 @@ { case SUCCESS: { - facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.create.success"); + facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.create.success", serviceType.getName()); result = Constants.OUTCOME_SUCCESS; Events.instance().raiseEvent("resourceCreated", serviceType); break; Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties =================================================================== --- trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-10-23 00:54:28 UTC (rev 19) +++ trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-10-23 21:07:01 UTC (rev 20) @@ -49,11 +49,11 @@ resource.configuration.null=There was an error retrieving the configuration for this resource. resource.status.create.failure=Failed to add Resource (see app server log for additional details): -resource.status.create.success=Successfully added resource. +resource.status.create.success=Successfully added new {0}. resource.status.update.failure=Failed to update Resource (see app server log for additional details): -resource.status.update.success=Successfully updated resource. -resource.status.remove.failure=Failed to remove Resource, please see app server log for more information. -resource.status.remove.success=Successfully removed resource. +resource.status.update.success=Successfully updated {0} '{1}'. +resource.status.remove.failure=Failed to delete Resource, please see app server log for more information. +resource.status.remove.success=Successfully deleted {0} '{1}'. resource.status.invalidProps=One or more property values was invalid - see below for details. resource.edit.title=Edit Resource