Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 89652 invoked from network); 18 Feb 2010 16:46:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Feb 2010 16:46:11 -0000 Received: (qmail 28456 invoked by uid 500); 18 Feb 2010 16:46:11 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 28398 invoked by uid 500); 18 Feb 2010 16:46:11 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 28388 invoked by uid 99); 18 Feb 2010 16:46:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 16:46:11 +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, 18 Feb 2010 16:46:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 236C623888BD; Thu, 18 Feb 2010 16:45:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r911482 - /felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java Date: Thu, 18 Feb 2010 16:45:48 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100218164548.236C623888BD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Thu Feb 18 16:45:47 2010 New Revision: 911482 URL: http://svn.apache.org/viewvc?rev=911482&view=rev Log: FELIX-1621: OBR fails to take bundles into account that are already available in the framework Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java?rev=911482&r1=911481&r2=911482&view=diff ============================================================================== --- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java (original) +++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java Thu Feb 18 16:45:47 2010 @@ -201,7 +201,10 @@ // Convert bundle manifest header attributes to resource properties. convertAttributesToProperties(dict); - + + // Convert properties to bundle capability + convertAttributesToBundleCapability(); + // Convert import package declarations into requirements. convertImportPackageToRequirement(dict); @@ -330,6 +333,18 @@ } } + private void convertAttributesToBundleCapability() + { + CapabilityImpl cap = new CapabilityImpl(); + cap.setName("bundle"); + if (getPresentationName() != null) { + cap.addP(Resource.PRESENTATION_NAME, getPresentationName()); + } + cap.addP(Resource.SYMBOLIC_NAME, getSymbolicName()); + cap.addP(Resource.VERSION, getVersion()); + addCapability(cap); + } + private void convertImportPackageToRequirement(Dictionary dict) throws InvalidSyntaxException {