# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /Users/ludo/acvs/v3/admin/rest/src/main/java/org/glassfish/admin/rest/resources # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: LeafResource.java --- LeafResource.java Base (BASE) +++ LeafResource.java Locally Modified (Based On LOCAL) @@ -175,7 +175,7 @@ protected ActionReportResult buildActionReportResult() { RestActionReporter ar = new RestActionReporter(); - final String typeKey = upperCaseFirstLetter((decode(getName()))); + final String typeKey = (decode(getName())); ar.setActionDescription(typeKey); ar.getExtraProperties().put("entityLeaf", getEntity()); Index: PropertiesBagResource.java --- PropertiesBagResource.java Base (BASE) +++ PropertiesBagResource.java Locally Modified (Based On LOCAL) @@ -114,7 +114,7 @@ RestActionReporter ar = new RestActionReporter(); ar.setActionExitCode(ActionReport.ExitCode.SUCCESS); - ar.setActionDescription("Property"); + ar.setActionDescription("property"); List properties = new ArrayList(); for (Dom child : entities) { @@ -179,7 +179,7 @@ protected ActionReportResult clearThenSaveProperties(List> properties) { RestActionReporter ar = new RestActionReporter(); - ar.setActionDescription("Property"); + ar.setActionDescription("property"); try { Map existing = getExistingProperties(); deleteMissingProperties(existing, properties); Index: TemplateListOfResource.java --- TemplateListOfResource.java Base (BASE) +++ TemplateListOfResource.java Locally Modified (Based On LOCAL) @@ -246,7 +246,7 @@ return ResourceUtil.getActionReportResult(404, errorMessage, requestHeaders, uriInfo); } RestActionReporter ar = new RestActionReporter(); - final String typeKey = upperCaseFirstLetter((decode(getName(uriInfo.getPath(), '/')))); \ No newline at end of file + final String typeKey = (decode(getName(uriInfo.getPath(), '/'))); \ No newline at end of file ar.setActionDescription(typeKey); OptionsResult optionsResult = new OptionsResult(Util.getResourceName(uriInfo)); Index: TemplateRestResource.java --- TemplateRestResource.java Base (BASE) +++ TemplateRestResource.java Locally Modified (Based On LOCAL) @@ -64,7 +64,6 @@ import java.util.logging.Logger; import static org.glassfish.admin.rest.Util.eleminateHypen; -import static org.glassfish.admin.rest.Util.upperCaseFirstLetter; /** * @author Ludovic Champenois ludo@dev.java.net @@ -88,6 +87,7 @@ protected Dom parent; protected String tagName; protected ConfigModel childModel; //good model even if the child entity is null + protected String childID; // id of the current child if part of a list, might be null public final static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(TemplateRestResource.class); final private static List attributesToSkip = new ArrayList() { { @@ -338,6 +338,7 @@ } public void setBeanByKey(List parentList, String id) { + childID = id; if (parentList != null) { // Believe it or not, this can happen for (Dom c : parentList) { String keyAttributeName = null; @@ -371,8 +372,11 @@ RestActionReporter ar = new RestActionReporter(); ar.setExtraProperties(new Properties()); ConfigBean entity = (ConfigBean) getEntity(); - if (childModel != null) { - ar.setActionDescription(upperCaseFirstLetter(childModel.getTagName())); + if (childID!=null){ + ar.setActionDescription(childID); + + }else if (childModel != null) { + ar.setActionDescription(childModel.getTagName()); } if (showEntityValues) { if (entity != null) {