svn commit: r1070285 - /openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java

[gpetracek]

Author: gpetracek
Date: Sun Feb 13 19:52:12 2011
New Revision: 1070285

URL: http://svn.apache.org/viewvc?rev=1070285&view=rev
Log:
OWB-500 fix for solaris and improved logging

Modified:
    
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java

Modified: 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1070285&r1=1070284&r2=1070285&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
 (original)
+++ 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
 Sun Feb 13 19:52:12 2011
@@ -111,19 +111,37 @@ public class WebScannerService extends A
                 {
                     fileDir = fileDir.substring(0, fileDir.lastIndexOf("/")) + 
"/META-INF/beans.xml";
 
-                    //fix for weblogic
-                    if (!fileDir.startsWith("file:/"))
+                    //fix for weblogic and solaris
+                    if (!fileDir.startsWith("file:///"))
                     {
-                        fileDir = "file:/" + fileDir;
+                        fileDir = "file:///" + fileDir;
                         //TODO switch to a more stable approach
                         //url = new URL("jar:" + fileDir);
                     }
 
+                    if (logger.wblWillLogDebug())
+                    {
+                        logger.debug("OpenWebBeans found the following url 
while doing web scanning: " + fileDir);
+                    }
+
                     addPath = new URL("jar:" + fileDir);
+
+                    if (logger.wblWillLogDebug())
+                    {
+                        logger.debug("OpenWebBeans added the following jar 
based path while doing web scanning: " +
+                                addPath.toString());
+                    }
                 }
                 else
                 {
                     addPath = new URL("file:" + url.getFile() + 
"META-INF/beans.xml");
+
+                    if (logger.wblWillLogDebug())
+                    {
+                        logger.debug("OpenWebBeans added the following file 
based path while doing web scanning: " +
+                                addPath.toString());
+                    }
+
                 }
 
                 listURL.add(url);