svn commit: r398186 - in /geronimo/branches/1.1/modules: kernel/src/java/org/apache/geronimo/kernel/util/ naming-builder/src/java/org/apache/geronimo/naming/deployment/

[am...@apache.org]

Author: ammulder
Date: Sat Apr 29 08:58:37 2006
New Revision: 398186

URL: http://svn.apache.org/viewcvs?rev=398186&view=rev
Log:
A little debugging

Added:
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/util/
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/util/ClassLoaderDumper.java   (with props)
Modified:
    geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java

Added: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/util/ClassLoaderDumper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/util/ClassLoaderDumper.java?rev=398186&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/util/ClassLoaderDumper.java (added)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/util/ClassLoaderDumper.java Sat Apr 29 08:58:37 2006
@@ -0,0 +1,76 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.kernel.util;
+
+import java.net.URLClassLoader;
+import java.net.URL;
+import org.apache.geronimo.kernel.config.MultiParentClassLoader;
+
+/**
+ * Shows the ID and contents of a ClassLoader
+ *
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public class ClassLoaderDumper {
+    public static void dump(Object o) {
+        if(o != null) dump(o.getClass().getClassLoader());
+    }
+    public static void dump(Class cls) {
+        System.out.println("ClassLoader dump for "+cls.getName());
+        dump(cls.getClassLoader());
+    }
+    public static void dump(ClassLoader loader) {
+        dumpIDs("", loader);
+        dumpContents("", loader);
+    }
+    private static void dumpIDs(String prefix, ClassLoader loader) {
+        if(loader == null) return;
+        System.out.println(prefix+"ClassLoader is "+loader);
+
+        if(loader instanceof MultiParentClassLoader) {
+            MultiParentClassLoader mp = (MultiParentClassLoader) loader;
+            ClassLoader[] parents = mp.getParents();
+            for (int i = 0; i < parents.length; i++) {
+                dumpIDs(prefix+"  ", parents[i]);
+            }
+        } else {
+            dumpIDs(prefix+"  ", loader.getParent());
+        }
+    }
+    private static void dumpContents(String prefix, ClassLoader loader) {
+        if(loader == null) return;
+        System.out.println(prefix+"ClassLoader is "+loader);
+
+        if(loader instanceof URLClassLoader) {
+            URLClassLoader url = (URLClassLoader) loader;
+            URL[] entries = url.getURLs();
+            for (int i = 0; i < entries.length; i++) {
+                URL entry = entries[i];
+                System.out.println(prefix+"  "+entry);
+            }
+        }
+        if(loader instanceof MultiParentClassLoader) {
+            MultiParentClassLoader mp = (MultiParentClassLoader) loader;
+            ClassLoader[] parents = mp.getParents();
+            for (int i = 0; i < parents.length; i++) {
+                dumpContents(prefix+"    ", parents[i]);
+            }
+        } else {
+            dumpContents(prefix+"    ", loader.getParent());
+        }
+    }
+}

Propchange: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/util/ClassLoaderDumper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=398186&r1=398185&r2=398186&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Sat Apr 29 08:58:37 2006
@@ -288,6 +288,8 @@
                 //well, we know for sure an admin object is not going to be defined in a modules that can have a message-destination
                 int pos = linkName.indexOf('#');
                 if (pos > -1) {
+                    //AMM -- the following line causes blowups; e.g. to look in DayTrader EJB module for a RA -- why is that?!?
+                    //moduleURI = linkName.substring(0, pos);
                     linkName = linkName.substring(pos + 1);
                 }
             }