Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F15AC944 for ; Tue, 11 Jun 2013 15:45:56 +0000 (UTC) Received: (qmail 39659 invoked by uid 500); 11 Jun 2013 15:45:55 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 39604 invoked by uid 500); 11 Jun 2013 15:45:55 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 39579 invoked by uid 99); 11 Jun 2013 15:45:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jun 2013 15:45:55 +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; Tue, 11 Jun 2013 15:45:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D0DD623889ED; Tue, 11 Jun 2013 15:45:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1491849 - /aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java Date: Tue, 11 Jun 2013 15:45:34 -0000 To: commits@aries.apache.org From: jwross@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130611154534.D0DD623889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jwross Date: Tue Jun 11 15:45:34 2013 New Revision: 1491849 URL: http://svn.apache.org/r1491849 Log: [aries-1072] Fix subsystem with satisfied BREE requirement does not install. Requirements with the osgi.ee namespace were being ignored while computing the Require-Capability header for an application's subsystem manifest. Consequently, osgi.ee capabilities were not allowed by the region's sharing policy. Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java?rev=1491849&r1=1491848&r2=1491849&view=diff ============================================================================== --- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java (original) +++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java Tue Jun 11 15:45:34 2013 @@ -49,6 +49,7 @@ import org.apache.aries.util.manifest.Ma import org.apache.aries.util.manifest.ManifestProcessor; import org.osgi.framework.Version; import org.osgi.framework.namespace.BundleNamespace; +import org.osgi.framework.namespace.ExecutionEnvironmentNamespace; import org.osgi.framework.namespace.IdentityNamespace; import org.osgi.framework.namespace.PackageNamespace; import org.osgi.namespace.service.ServiceNamespace; @@ -350,7 +351,10 @@ public class RawSubsystemResource implem return null; ArrayList clauses = new ArrayList(); for (Requirement requirement : requirements) { - if (requirement.getNamespace().startsWith("osgi.")) + String namespace = requirement.getNamespace(); + if (namespace.startsWith("osgi.") && + // Don't filter out the osgi.ee namespace. + !namespace.equals(ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE)) continue; clauses.add(new RequireCapabilityHeader.Clause(requirement)); }