Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 92316 invoked from network); 13 Jan 2011 22:56:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Jan 2011 22:56:55 -0000 Received: (qmail 59086 invoked by uid 500); 13 Jan 2011 22:56:55 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 59056 invoked by uid 500); 13 Jan 2011 22:56:55 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 59048 invoked by uid 99); 13 Jan 2011 22:56:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jan 2011 22:56:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jan 2011 22:56:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 22EA423888EC; Thu, 13 Jan 2011 22:56:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1058780 - /openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java Date: Thu, 13 Jan 2011 22:56:26 -0000 To: commits@openwebbeans.apache.org From: gpetracek@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110113225626.22EA423888EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gpetracek Date: Thu Jan 13 22:56:25 2011 New Revision: 1058780 URL: http://svn.apache.org/viewvc?rev=1058780&view=rev Log: OWB-500 fix for wls 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=1058780&r1=1058779&r2=1058780&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 Thu Jan 13 22:56:25 2011 @@ -95,18 +95,15 @@ public class WebScannerService extends A protected Set createURLFromMarkerFile() throws Exception { Set listURL = new HashSet(); - URL[] urls = null; // Root with beans.xml marker. - urls = ClasspathUrlFinder.findResourceBases("META-INF/beans.xml", WebBeansUtil.getCurrentClassLoader()); + URL[] urls = ClasspathUrlFinder.findResourceBases("META-INF/beans.xml", WebBeansUtil.getCurrentClassLoader()); if (urls != null) { + URL addPath; for (URL url : urls) { - - URL addPath = null; - String fileDir = url.getFile(); if (fileDir.endsWith(".jar!/")) { @@ -119,6 +116,7 @@ public class WebScannerService extends A } addPath = new URL("jar:" + fileDir); + url = new URL("jar:" + fileDir); } else {