Changeset 9146

Timestamp:

07/05/08 03:38:16 (2 months ago)

Author:

hannes

Message:

Merge branch 'master' of git@github.com:hns/helma-ng

Conflicts:

modules/helma/logging.js
src/org/helma/web/HelmaServlet.java

Files:

• helma-ng/trunk/modules/helma/logging.js (modified) (2 diffs)
• helma-ng/trunk/src/org/helma/web/HelmaServlet.java (modified) (1 diff)

helma-ng/trunk/modules/helma/logging.js

@@ -31 +31 @@
-        if (!configured) {
-            // getResource('foo').name gets us the absolute path to a local resource
-name
+path
-        }
-        return org.apache.log4j.Logger.getLogger(name);
@@ -43 +43 @@
-        // onLogEvent() callback is called by org.helma.util.RhinoAppender
-        rhino.addCallback("onLogEvent", "responseLog", function(msg, javaStack, scriptStack) {
+            if (!global.res) {
+                return;
+            }
-            var buffer = res.getBuffer("responseLog");
-            buffer.write("<div class=\"helma-debug-line\" style=\"background: #fc3;");

helma-ng/trunk/src/org/helma/web/HelmaServlet.java

@@ -35 +35 @@
-    private ExecutorService pool;
-
-1
+3
-
-    static protected Class[] defaultHostClasses =