Changeset 1901

Timestamp:

2011-04-22 07:22:04 (13 months ago)

Author:

bruno

Message:

Make sure Restlet logging gets redirected through slf4j/log4j (and also introduced some newlines).

File:

• trunk/core/kauri-runtime-cli/src/main/java/org/kauriproject/runtime/cli/KauriRuntimeCli.java (modified) (6 diffs)

trunk/core/kauri-runtime-cli/src/main/java/org/kauriproject/runtime/cli/KauriRuntimeCli.java

@@ -51 +51 @@
 import org.kauriproject.util.xml.SimpleNamespaceContext;
 import org.kauriproject.util.io.IOUtils;
+import org.restlet.engine.Engine;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 import org.w3c.dom.Document;
@@ -68 +69 @@
 
     private void run(String[] args) throws Exception {
+        // Let Restlet configure its log now, since next we are going to redirect the JDK logging, and otherwise
+        // when the Restlet Engine is initialized it will undo that.
+        Engine.configureLog();
+
         // Forward JDK logging to SLF4J
         LogManager.getLogManager().reset();
@@ -78 +83 @@
         .withArgName("confdir")
         .hasArg()
-        .withDescription("The Kauri runtime configuration directory. Can be multiple paths separated by " + File.pathSeparator)
+        .withDescription("The Kauri runtime configuration directory. Can be multiple paths separated by " +
+                File.pathSeparator)
         .withLongOpt("confdir")
         .create('c');
@@ -86 +92 @@
                 .withArgName("maven-repo-path")
                 .hasArg()
-                .withDescription("Location of the (Maven-style) artifact repository. Use comma-separated entries to specify multiple locations which will be searched in the order as specified.")
+                .withDescription("Location of the (Maven-style) artifact repository. Use comma-separated entries to " +
+                        "specify multiple locations which will be searched in the order as specified.")
                 .withLongOpt("repository")
                 .create('r');
@@ -108 +115 @@
                 .withArgName("loglevel")
                 .hasArg()
-                .withDescription("Enable logging to console for the root log category with specified loglevel (debug, info, warn, error)")
+                .withDescription("Enable logging to console for the root log category with specified loglevel " +
+                        "(debug, info, warn, error)")
                 .withLongOpt("console-logging")
                 .create('l');
@@ -203 +211 @@
             File confDir = new File(DEFAULT_CONF_DIR).getAbsoluteFile();
             if (!confDir.exists()) {
-                System.out.println("Default configuration directory " + DEFAULT_CONF_DIR + " not found in current directory: " + confDir.getAbsolutePath());
+                System.out.println("Default configuration directory " + DEFAULT_CONF_DIR +
+                        " not found in current directory: " + confDir.getAbsolutePath());
                 System.out.println("To specify another location, use the -" + confDirsOption.getOpt() + " argument");
                 System.exit(1);