Return-Path: Delivered-To: apmail-incubator-felix-commits-archive@www.apache.org Received: (qmail 6586 invoked from network); 25 Sep 2006 18:30:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Sep 2006 18:30:10 -0000 Received: (qmail 55696 invoked by uid 500); 25 Sep 2006 18:30:10 -0000 Delivered-To: apmail-incubator-felix-commits-archive@incubator.apache.org Received: (qmail 55674 invoked by uid 500); 25 Sep 2006 18:30:10 -0000 Mailing-List: contact felix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: felix-dev@incubator.apache.org Delivered-To: mailing list felix-commits@incubator.apache.org Received: (qmail 55663 invoked by uid 99); 25 Sep 2006 18:30:10 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Sep 2006 11:30:10 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=rickhall@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from [140.211.166.113] ([140.211.166.113:57486] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id E4/AE-13750-22028154 for ; Mon, 25 Sep 2006 11:29:55 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 50BC81A981A; Mon, 25 Sep 2006 11:29:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449768 - in /incubator/felix/trunk/framework/src/main/java/org/apache/felix: framework/ framework/searchpolicy/ moduleloader/ Date: Mon, 25 Sep 2006 18:29:28 -0000 To: felix-commits@incubator.apache.org From: rickhall@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060925182929.50BC81A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rickhall Date: Mon Sep 25 11:29:27 2006 New Revision: 449768 URL: http://svn.apache.org/viewvc?view=rev&rev=449768 Log: Modified IContentLoader to include a getResourceFromContent() method to avoid the class cast exception being reported in FELIX-149. Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?view=diff&rev=449768&r1=449767&r2=449768 ============================================================================== --- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original) +++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Mon Sep 25 11:29:27 2006 @@ -1003,8 +1003,8 @@ { throw new IllegalStateException("The bundle is uninstalled."); } - return ((ContentLoaderImpl) bundle.getInfo().getCurrentModule() - .getContentLoader()).getResourceFromContent(name); + return bundle.getInfo().getCurrentModule() + .getContentLoader().getResourceFromContent(name); } /** Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java?view=diff&rev=449768&r1=449767&r2=449768 ============================================================================== --- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java (original) +++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/FindEntriesEnumeration.java Mon Sep 25 11:29:27 2006 @@ -119,9 +119,8 @@ if (checkSubstring(m_filePattern, lastElement)) { // Convert entry name into an entry URL. - return ((ContentLoaderImpl) m_bundle.getInfo() - .getCurrentModule().getContentLoader()) - .getResourceFromContent(entryName); + return m_bundle.getInfo().getCurrentModule() + .getContentLoader().getResourceFromContent(entryName); } } } Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java?view=diff&rev=449768&r1=449767&r2=449768 ============================================================================== --- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java (original) +++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/SystemBundleContentLoader.java Mon Sep 25 11:29:27 2006 @@ -91,6 +91,12 @@ return getClass().getClassLoader().getResource(name); } + public URL getResourceFromContent(String name) + { + // There is no content for the system bundle, so return null. + return null; + } + public boolean hasInputStream(String urlPath) throws IOException { return (getClass().getClassLoader().getResource(urlPath) != null); Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java?view=diff&rev=449768&r1=449767&r2=449768 ============================================================================== --- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java (original) +++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentLoaderImpl.java Mon Sep 25 11:29:27 2006 @@ -176,7 +176,8 @@ return v.elements(); } - // TODO: API: Investigate making this an API call. + // TODO: API: Investigate how to handle this better, perhaps we need + // multiple URL policies, one for content -- one for class path. public URL getResourceFromContent(String name) { URL url = null; Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java?view=diff&rev=449768&r1=449767&r2=449768 ============================================================================== --- incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java (original) +++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/moduleloader/IContentLoader.java Mon Sep 25 11:29:27 2006 @@ -37,6 +37,7 @@ public Class getClass(String name); public URL getResource(String name); + public URL getResourceFromContent(String name); public boolean hasInputStream(String urlPath) throws IOException;