Return-Path: Delivered-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Received: (qmail 55806 invoked from network); 16 Mar 2010 15:31:08 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Mar 2010 15:31:08 -0000 Received: (qmail 16584 invoked by uid 500); 16 Mar 2010 15:31:08 -0000 Delivered-To: apmail-geronimo-xbean-scm-archive@geronimo.apache.org Received: (qmail 16560 invoked by uid 500); 16 Mar 2010 15:31:08 -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 16549 invoked by uid 99); 16 Mar 2010 15:31:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Mar 2010 15:31:07 +0000 X-ASF-Spam-Status: No, hits=-1043.3 required=10.0 tests=ALL_TRUSTED,AWL 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; Tue, 16 Mar 2010 15:31:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E675023888D1; Tue, 16 Mar 2010 15:30:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r923807 - /geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java Date: Tue, 16 Mar 2010 15:30:46 -0000 To: xbean-scm@geronimo.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100316153046.E675023888D1@eris.apache.org> Author: gnodet Date: Tue Mar 16 15:30:46 2010 New Revision: 923807 URL: http://svn.apache.org/viewvc?rev=923807&view=rev Log: Use getResource instead of getEntry to be able to load properties from outside the bundle itself (such as using Required-Bundle header) Modified: geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java Modified: geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java?rev=923807&r1=923806&r2=923807&view=diff ============================================================================== --- geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java (original) +++ geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java Tue Mar 16 15:30:46 2010 @@ -98,7 +98,7 @@ public class XBeanNamespaceHandler imple } public XBeanNamespaceHandler(String namespace, String schemaLocation, Bundle bundle, String propertiesLocation) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException { - URL propertiesUrl = bundle.getEntry(propertiesLocation); + URL propertiesUrl = bundle.getResource(propertiesLocation); InputStream in = propertiesUrl.openStream(); Properties properties = new Properties(); try {