Return-Path: X-Original-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Delivered-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DE2859109 for ; Fri, 17 May 2013 22:09:47 +0000 (UTC) Received: (qmail 6899 invoked by uid 500); 17 May 2013 22:09:48 -0000 Delivered-To: apmail-geronimo-xbean-scm-archive@geronimo.apache.org Received: (qmail 6872 invoked by uid 500); 17 May 2013 22:09:48 -0000 Mailing-List: contact xbean-scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: xbean-scm@geronimo.apache.org Delivered-To: mailing list xbean-scm@geronimo.apache.org Received: (qmail 6865 invoked by uid 99); 17 May 2013 22:09:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 May 2013 22:09:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 17 May 2013 22:09:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E63B923889DA; Fri, 17 May 2013 22:09:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1484013 - /geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java Date: Fri, 17 May 2013 22:09:26 -0000 To: xbean-scm@geronimo.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130517220926.E63B923889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Fri May 17 22:09:26 2013 New Revision: 1484013 URL: http://svn.apache.org/r1484013 Log: reverting win hack in ResourceFinder since it was induced by an issue in surefire handling fixed in previous commit Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java?rev=1484013&r1=1484012&r2=1484013&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java (original) +++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ResourceFinder.java Fri May 17 22:09:26 2013 @@ -32,7 +32,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Vector; @@ -44,8 +43,6 @@ import java.util.jar.JarFile; * @version $Rev$ $Date$ */ public class ResourceFinder { - private static final boolean WIN = System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("win"); - private final URL[] urls; private final String path; private final ClassLoader classLoader; @@ -1021,9 +1018,6 @@ public class ResourceFinder { StringBuffer buf = new StringBuffer(2 + hostLength + baseFile.length() + resourceName.length()); if (hostLength > 0) { - if (WIN && "file".equals(protocol)) { - buf.append(":"); - } buf.append("//").append(host); } // baseFile should always ends with '/'