svn commit: r798331 - /tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java

[rf...@apache.org]

Author: rfeng
Date: Mon Jul 27 23:29:26 2009
New Revision: 798331

URL: http://svn.apache.org/viewvc?rev=798331&view=rev
Log:
Use API to set jetty logger

Modified:
    tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java

Modified: tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java?rev=798331&r1=798330&r2=798331&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java (original)
+++ tuscany/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java Mon Jul 27 23:29:26 2009
@@ -54,6 +54,7 @@
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.jetty.servlet.ServletMapping;
 import org.mortbay.jetty.servlet.SessionHandler;
+import org.mortbay.log.Log;
 import org.mortbay.thread.ThreadPool;
 
 /**
@@ -103,14 +104,17 @@
     private Map<Integer, Port> ports = new HashMap<Integer, Port>();
 
     private String contextPath = "/";
-
-    static {
-        // Hack to replace the static Jetty logger
-        System.setProperty("org.mortbay.log.class", JettyLogger.class.getName());
-    }
+    private org.mortbay.log.Logger jettyLogger;
 
     public JettyServer(WorkScheduler workScheduler) {
         this.workScheduler = workScheduler;
+        try {
+            jettyLogger = Log.getLog();
+        } catch (Throwable e) {
+            // Ignore
+        } finally {
+            Log.setLog(new JettyLogger());
+        }
         AccessController.doPrivileged(new PrivilegedAction<Object>() {
             public Object run() {
                 trustStore = System.getProperty("javax.net.ssl.trustStore");
@@ -153,6 +157,11 @@
             }
         } catch (Exception e) {
             throw new ServletMappingException(e);
+        } finally {
+            if (jettyLogger != null) {
+                Log.setLog(jettyLogger);
+                jettyLogger = null;
+            }
         }
     }