You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/09/06 23:11:07 UTC
svn commit: r573379 - in /geronimo/sandbox/gshell/trunk:
gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/
gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/
Author: jdillon
Date: Thu Sep 6 14:11:06 2007
New Revision: 573379
URL: http://svn.apache.org/viewvc?rev=573379&view=rev
Log:
Tidy up some logging
Modified:
geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
Modified: geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=573379&r1=573378&r2=573379&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java Thu Sep 6 14:11:06 2007
@@ -242,6 +242,7 @@
runner.setErrorHandler(new Console.ErrorHandler() {
public Result handleError(Throwable error) {
+ // Must use string concat here to get the error passed in as a Throwable for rendering
log.error("Execution failed: " + error, error);
return Result.CONTINUE;
Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java?rev=573379&r1=573378&r2=573379&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java Thu Sep 6 14:11:06 2007
@@ -148,7 +148,7 @@
private void setProperty(final String namevalue) {
NameValue nv = parse(namevalue);
- log.info("Setting system property: " + nv.name + "=" + nv.value);
+ log.info("Setting system property: {}={}", nv.name, nv.value);
ensureIsIdentifier(nv.name);
@@ -158,7 +158,7 @@
private void setVariable(final String namevalue) {
NameValue nv = parse(namevalue);
- log.info("Setting variable: " + nv.name + "=" + nv.value);
+ log.info("Setting variable: {}={}", nv.name, nv.value);
ensureIsIdentifier(nv.name);
Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java?rev=573379&r1=573378&r2=573379&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java Thu Sep 6 14:11:06 2007
@@ -64,13 +64,13 @@
if (source instanceof File) {
File file = (File)source;
- log.info("Using source file: " + file);
+ log.info("Using source file: {}", file);
reader = new BufferedReader(new FileReader(file));
}
else if (source instanceof URL) {
URL url = (URL)source;
- log.info("Using source URL: " + url);
+ log.info("Using source URL: {}", url);
reader = new BufferedReader(new InputStreamReader(url.openStream()));
}
@@ -80,14 +80,14 @@
// First try a URL
try {
URL url = new URL(tmp);
- log.info("Using source URL: " + url);
+ log.info("Using source URL: {}", url);
reader = new BufferedReader(new InputStreamReader(url.openStream()));
}
catch (MalformedURLException ignore) {
// They try a file
File file = new File(tmp);
- log.info("Using source file: " + file);
+ log.info("Using source file: {}", file);
reader = new BufferedReader(new FileReader(tmp));
}
Modified: geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java?rev=573379&r1=573378&r2=573379&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-commands/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java Thu Sep 6 14:11:06 2007
@@ -74,7 +74,7 @@
}
private void unsetProperty(final String name) {
- log.info("Unsetting system property: " + name);
+ log.info("Unsetting system property: {}", name);
ensureIsIdentifier(name);
@@ -82,7 +82,7 @@
}
private void unsetVariable(final String name) {
- log.info("Unsetting variable: " + name);
+ log.info("Unsetting variable: {}", name);
ensureIsIdentifier(name);