svn commit: r491623 - in /incubator/wicket/trunk/wicket/src/main/java/wicket/util: file/OsgiPath.java resource/locator/ResourceFinderResourceStreamLocator.java

[jd...@apache.org]

Author: jdonnerstag
Date: Mon Jan  1 12:23:24 2007
New Revision: 491623

URL: http://svn.apache.org/viewvc?view=rev&rev=491623
Log:
log classloader issue

Modified:
    incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiPath.java
    incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java

Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiPath.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiPath.java?view=diff&rev=491623&r1=491622&r2=491623
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiPath.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiPath.java Mon Jan  1 12:23:24 2007
@@ -18,6 +18,9 @@
 
 import java.net.URL;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * A Finder (note: it is not a Path) for working with OSGi bundles.
  * 
@@ -25,6 +28,8 @@
  */
 public final class OsgiPath implements IResourceFinder
 {
+	private final Logger log = LoggerFactory.getLogger(OsgiPath.class);
+	
 	/** ClassLoader to be used for locating resources. */
 	final ClassLoader classLoader;
 
@@ -48,7 +53,11 @@
 	 */
 	public URL find(final String pathname)
 	{
-		String resourcePathName = "/" + pathname;
+		String resourcePathName = /* "/" + */ pathname;
+		if (log.isDebugEnabled())
+		{
+			log.debug("classLoader: " + classLoader.toString());
+		}
 		return classLoader.getResource(resourcePathName);
 	}
 }

Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java?view=diff&rev=491623&r1=491622&r2=491623
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java Mon Jan  1 12:23:24 2007
@@ -35,7 +35,8 @@
 public class ResourceFinderResourceStreamLocator extends AbstractResourceStreamLocator
 {
 	/** Logging */
-	private static final Logger log = LoggerFactory.getLogger(ResourceFinderResourceStreamLocator.class);
+	private static final Logger log = LoggerFactory
+			.getLogger(ResourceFinderResourceStreamLocator.class);
 
 	/** The finder to use to locate the resource stream */
 	private IResourceFinder finder;
@@ -71,7 +72,23 @@
 		if (file != null)
 		{
 			// Return file resource
-			return new UrlResourceStream(file);
+			IResourceStream stream = new UrlResourceStream(file);
+
+			if (log.isDebugEnabled())
+			{
+				if (stream != null)
+				{
+					log.error("ResourceFinder found a file (URL) but the locator failed to create the UrlResourceStream. Maybe a classloader issue?");
+				}
+				else
+				{
+					log.debug("'file' classLoader: " + file.getClass().getClassLoader().toString()
+							+ "; 'stream' classLoader: "
+							+ stream.getClass().getClassLoader().toString());
+				}
+			}
+
+			return stream;
 		}
 		return null;
 	}