Author: struberg
Date: Sat May 31 20:13:34 2014
New Revision: 1598916
URL: http://svn.apache.org/r1598916
Log:
OWB-959 improve our scanning for webapps even more
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1598916&r1=1598915&r2=1598916&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
(original)
+++
openwebbeans/branches/owb_1.2.x/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Sat May 31 20:13:34 2014
@@ -152,11 +152,13 @@ public class WebScannerService extends A
}
else
{
- addPath = url + "META-INF/beans.xml";
-
- if(!addPath.startsWith("file:/"))
+ if (!url.startsWith("file:/") && ! url.contains("://"))
+ {
+ addPath = "file:/" + url;
+ }
+ else
{
- addPath = "file:/" + addPath;
+ addPath = url;
}
if (logger.isLoggable(Level.FINE))
