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 2003/08/24 13:20:17 UTC
cvs commit: incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/command AbstractCommand.java
jdillon 2003/08/24 04:20:17
Modified: modules/twiddle/src/java/org/apache/geronimo/twiddle
Twiddle.java
modules/twiddle/src/java/org/apache/geronimo/twiddle/cli
Main.java
modules/twiddle/src/java/org/apache/geronimo/twiddle/command
AbstractCommand.java
Log:
o More logging
Revision Changes Path
1.7 +6 -1 incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/Twiddle.java
Index: Twiddle.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/Twiddle.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Twiddle.java 14 Aug 2003 20:24:34 -0000 1.6
+++ Twiddle.java 24 Aug 2003 11:20:17 -0000 1.7
@@ -61,6 +61,9 @@
import java.io.StringWriter;
import java.io.PrintWriter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.geronimo.common.NullArgumentException;
import org.apache.geronimo.twiddle.config.Configuration;
@@ -84,6 +87,8 @@
*/
public class Twiddle
{
+ private static final Log log = LogFactory.getLog(Twiddle.class);
+
/** The input/output context. */
protected IOContext io;
1.7 +11 -4 incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/cli/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/cli/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Main.java 16 Aug 2003 15:14:12 -0000 1.6
+++ Main.java 24 Aug 2003 11:20:17 -0000 1.7
@@ -63,6 +63,9 @@
import java.net.URL;
import java.net.URLDecoder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.commons.cli.Options;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.CommandLine;
@@ -85,6 +88,8 @@
*/
public class Main
{
+ private static final Log log = LogFactory.getLog(Main.class);
+
/** Platform dependent line separator. */
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
@@ -172,9 +177,11 @@
URL homeURL = homeDir.toURL();
URL configURL = new URL(homeURL, filename);
- System.out.println("home directory: " + homeDir);
- System.out.println("home url: " + homeURL);
- System.out.println("configuration url: " + configURL);
+ if (log.isDebugEnabled()) {
+ log.debug("Home directory: " + homeDir);
+ log.debug("Home URL: " + homeURL);
+ log.debug("Configuration URL: " + configURL);
+ }
ConfigurationReader reader = new ConfigurationReader();
Configuration config = reader.read(configURL);
1.7 +7 -1 incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/command/AbstractCommand.java
Index: AbstractCommand.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/command/AbstractCommand.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractCommand.java 16 Aug 2003 15:14:12 -0000 1.6
+++ AbstractCommand.java 24 Aug 2003 11:20:17 -0000 1.7
@@ -59,6 +59,9 @@
import java.io.PrintWriter;
import java.io.Reader;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.geronimo.common.CloneableObject;
import org.apache.geronimo.common.NullArgumentException;
@@ -75,6 +78,9 @@
{
/** Platform dependent line separator. */
protected static final String LINE_SEPARATOR = System.getProperty("line.separator");
+
+ /** The command logger. */
+ protected Log log = LogFactory.getLog(this.getClass());
/** The command information. */
private CommandInfo info;