Changeset 13700

Timestamp:

11/29/11 12:25:08 (12 years ago)

Author:

Mark Evenson

Message:

weblogic: ABCL loads under the Weblogic 10.3 application server.

If the Pathname parsing try to parse a URI but get an empty authority,
don't push the values to the HOST element. Addtionally warn if we
parse a null authority via the Debug.trace() facility.

Weblogic uses the "zip" scheme which more or less maps to ABCL's
nesting of "file" within "jar". This patch doesn't systematically
follow the logical consequences of that disinction, but it does allow
ABCL to load its own fasls under weblogic-10.3. The right thing will
be to establish some sort of ability to run the ABCL tests inside of
various application server containers, but that will take a fair amount of resources.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Debug.java (modified) (2 diffs)
• Load.java (modified) (2 diffs)
• Pathname.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/Debug.java

@@ -35 +35 @@
 
 import static org.armedbear.lisp.Lisp.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 
 public final class Debug
@@ -45 +47 @@
             System.err.println(msg);
             Error e = new Error(msg);
-            e.printStackTrace();
-            throw e;
+            e.printStackTrace(System.err);
+      
+      StringBuffer buffer = new StringBuffer();
+      final String CR = "\n";
+      buffer.append(msg).append(CR);
+      StackTraceElement[] stack = e.getStackTrace();
+      for (int i = 0; i < stack.length; i++) {
+    buffer.append(stack[i].toString()).append(CR);
+      }
+            throw new Error(buffer.toString());
         }
+    }
+    public static final void assertViolation(String msg) {
+  final String m = "Assert violation: " + msg;
+  Error e = new Error(m);
+
+  System.err.println(m);
+  e.printStackTrace(System.err);
+
+  StringBuffer buffer = new StringBuffer();
+  final String CR = "\n";
+  buffer.append(msg).append(CR);
+  StackTraceElement[] stack = e.getStackTrace();
+  for (int i = 0; i < stack.length; i++) {
+      buffer.append(stack[i].toString()).append(CR);
+  }
+  throw new Error(buffer.toString());
     }
 

trunk/abcl/src/org/armedbear/lisp/Load.java

@@ -158 +158 @@
                 n = "jar:" + n + "!/" + name + "."
                     + COMPILE_FILE_INIT_FASL_TYPE;
+      } else if (n.startsWith("zip:")) {
+                n = "zip:" + n + "!/" + name + "."
+                    + COMPILE_FILE_INIT_FASL_TYPE;
             } else {
                 n = "jar:file:" + Pathname.uriEncode(n) + "!/" + name + "."
@@ -178 +181 @@
                   String errorMessage
                       = "Loadable FASL not found for "
-                      + "'" + pathname + "'"
+                      + "'" + pathname.printObject() + "'"
                       + " in "
-                      + "'" + mergedPathname + "'";
+                      + "'" + mergedPathname.printObject() + "'";
                   if (ifDoesNotExist) {
                       return error(new FileError(errorMessage, mergedPathname));

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -44 +44 @@
 import java.net.URL;
 import java.net.URLConnection;
+import java.text.MessageFormat;
 import java.util.Enumeration;
 import java.util.StringTokenizer;
@@ -402 +403 @@
             }
             String authority = uri.getAuthority();
-            Debug.assertTrue(authority != null);
+      if (authority == null) {
+    authority = url.getAuthority();
+    if (authority == null) {
+        Debug.trace(MessageFormat.format("{0} has a null authority.",
+                 url));
+    }
+      }
 
             host = NIL;
             host = host.push(SCHEME);
             host = host.push(new SimpleString(scheme));
-            host = host.push(AUTHORITY);
-            host = host.push(new SimpleString(authority));
+
+      if (authority != null) {
+    host = host.push(AUTHORITY);
+    host = host.push(new SimpleString(authority));
+      }
 
             device = NIL;