Index: appserver/value-add/das-recovery/cli/src/main/java/com/sun/glassfish/dasrecovery/LocalStrings.properties =================================================================== --- appserver/value-add/das-recovery/cli/src/main/java/com/sun/glassfish/dasrecovery/LocalStrings.properties (revision 3396) +++ appserver/value-add/das-recovery/cli/src/main/java/com/sun/glassfish/dasrecovery/LocalStrings.properties (working copy) @@ -102,14 +102,14 @@ schedule.list.name=The name of the schedule to list. If a name is not provided all schedules will be listed. schedule.list.verbose=List schedule details. schedule.list.notfound=The named schedule was not found. -schedule.list.nameofschedule=NAME -schedule.list.second=SECOND -schedule.list.minute=MINUTE -schedule.list.hour=HOUR -schedule.list.dayofweek=DAY OF WEEK -schedule.list.dayofmonth=DAY OF MONTH -schedule.list.monthofyear=MONTH -schedule.list.year=YEAR +schedule.list.nameofschedule=Name +schedule.list.second=Second +schedule.list.minute=Minute +schedule.list.hour=Hour +schedule.list.dayofweek=Day of Week +schedule.list.dayofmonth=Day of Month +schedule.list.monthofyear=Month +schedule.list.year=Year Index: appserver/value-add/monitoring/scripting/server/src/main/java/com/sun/enterprise/monitor/script/cli/LocalStrings.properties =================================================================== --- appserver/value-add/monitoring/scripting/server/src/main/java/com/sun/enterprise/monitor/script/cli/LocalStrings.properties (revision 3396) +++ appserver/value-add/monitoring/scripting/server/src/main/java/com/sun/enterprise/monitor/script/cli/LocalStrings.properties (working copy) @@ -16,6 +16,6 @@ success=Script successfully running on {0} ### New Messages -- starting September 2010 successfulEval=Successfully Loaded Script onto {0}. -internalError=INTERNAL ERROR: {0} +internalError=Internal Error: {0} loading=Loading monitoring-scripting-client application on {0} deployError=Failed to deploy monitoring-scripting-client application on {0}: {1} Index: appserver/value-add/monitoring/scripting/asadmin/src/main/java/com/sun/enterprise/monitor/script/cli/LocalStrings.properties =================================================================== --- appserver/value-add/monitoring/scripting/asadmin/src/main/java/com/sun/enterprise/monitor/script/cli/LocalStrings.properties (revision 3396) +++ appserver/value-add/monitoring/scripting/asadmin/src/main/java/com/sun/enterprise/monitor/script/cli/LocalStrings.properties (working copy) @@ -3,10 +3,9 @@ connectionTerminatedExiting=Connection terminated by server, exiting the client runscript.badport=Bad httpport argument({0}). It must be an integer between 1 and 65535 inclusive. runscript.noscriptname=The java script filename is required. -runscript.missingScript=can''t be located. -runscript.cantread=exists but we can''t read it. -runscript.emptyscript=exists but it is empty. -runscript.scriptError=The specified java script ({0}) +runscript.missingScript=The specified java script ({0}) can''t be located. +runscript.cantread= The specified java script ({0}) exists but we can''t read it. +runscript.emptyscript=The specified java script ({0}) exists but it is empty. runscript.missingID=The servlet was called with no ID. ########## bnevins September 2010 connectionEnded=Connection to {0} ended. Index: appserver/value-add/monitoring/scripting/asadmin/src/main/java/com/sun/enterprise/monitor/script/cli/RunScriptLocalCommand.java =================================================================== --- appserver/value-add/monitoring/scripting/asadmin/src/main/java/com/sun/enterprise/monitor/script/cli/RunScriptLocalCommand.java (revision 3396) +++ appserver/value-add/monitoring/scripting/asadmin/src/main/java/com/sun/enterprise/monitor/script/cli/RunScriptLocalCommand.java (working copy) @@ -82,14 +82,12 @@ @Override protected void validate() throws CommandException { // make sure it exists, can be read, and has at least one character in it... - String start = Strings.get("runscript.scriptError", script) + " "; - if(script == null || !script.exists()) - throw new CommandException(start + Strings.get("runscript.missingScript")); + throw new CommandException(Strings.get("runscript.missingScript", script)); if(!script.canRead()) - throw new CommandException(start + Strings.get("runscript.cantread")); + throw new CommandException(Strings.get("runscript.cantread", script)); if(script.length() <= 0) - throw new CommandException(start + Strings.get("runscript.emptyscript")); + throw new CommandException(Strings.get("runscript.emptyscript", script)); } @Override