You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jw...@apache.org on 2012/07/03 21:12:17 UTC
svn commit: r1356872 - in /aries/trunk/subsystem:
subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/RequireCapabilityRequirement.java
subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoRequirementFilterTest.java
Author: jwross
Date: Tue Jul 3 19:12:16 2012
New Revision: 1356872
URL: http://svn.apache.org/viewvc?rev=1356872&view=rev
Log:
ARIES-825: Fixed NPE when given a Require-Capability header with no filter directive. It is legal to not have a filter directive, in which case the requirement will match any capability within the same namespace. If there is no filter directive, one will now be generated in the form (<namespace>=*). A new test to sniff this out was added as well.
Added:
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoRequirementFilterTest.java
Modified:
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/RequireCapabilityRequirement.java
Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/RequireCapabilityRequirement.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/RequireCapabilityRequirement.java?rev=1356872&r1=1356871&r2=1356872&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/RequireCapabilityRequirement.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/RequireCapabilityRequirement.java Tue Jul 3 19:12:16 2012
@@ -18,8 +18,12 @@ public class RequireCapabilityRequiremen
public RequireCapabilityRequirement(RequireCapabilityHeader.Clause clause, Resource resource) {
namespace = clause.getNamespace();
Directive filter = clause.getDirective(RequireCapabilityHeader.Clause.DIRECTIVE_FILTER);
- if (filter != null)
- directives.put(DIRECTIVE_FILTER, filter.getValue());
+ // It is legal for requirements to have no filter directive, in which
+ // case the requirement would match any capability from the same
+ // namespace.
+ if (filter == null)
+ filter = new FilterDirective('(' + namespace + "=*)");
+ directives.put(DIRECTIVE_FILTER, filter.getValue());
this.resource = resource;
}
Added: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoRequirementFilterTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoRequirementFilterTest.java?rev=1356872&view=auto
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoRequirementFilterTest.java (added)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/NoRequirementFilterTest.java Tue Jul 3 19:12:16 2012
@@ -0,0 +1,91 @@
+package org.apache.aries.subsystem.itests;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
+import org.osgi.service.subsystem.Subsystem;
+import org.osgi.service.subsystem.SubsystemConstants;
+
+@RunWith(JUnit4TestRunner.class)
+public class NoRequirementFilterTest extends SubsystemTest {
+ /*
+ * Subsystem-SymbolicName: application.a.esa
+ * Subsystem-Content: bundle.a.jar
+ */
+ private static final String APPLICATION_A = "application.a.esa";
+ /*
+ * Bundle-SymbolicName: bundle.a.jar
+ * Require-Capability: y
+ */
+ private static final String BUNDLE_A = "bundle.a.jar";
+ /*
+ * Bundle-SymbolicName: bundle.b.jar
+ * Provide-Capability: y;y=foo
+ */
+ private static final String BUNDLE_B = "bundle.b.jar";
+
+ private static void createApplicationA() throws IOException {
+ createApplicationAManifest();
+ createSubsystem(APPLICATION_A, BUNDLE_A);
+ }
+
+ private static void createApplicationAManifest() throws IOException {
+ Map<String, String> attributes = new HashMap<String, String>();
+ attributes.put(SubsystemConstants.SUBSYSTEM_SYMBOLICNAME, APPLICATION_A);
+ attributes.put(SubsystemConstants.SUBSYSTEM_CONTENT, BUNDLE_A);
+ createManifest(APPLICATION_A + ".mf", attributes);
+ }
+
+ private static void createBundleA() throws IOException {
+ Map<String, String> headers = new HashMap<String, String>();
+ headers.put(Constants.REQUIRE_CAPABILITY, "y");
+ createBundle(BUNDLE_A, headers);
+ }
+
+ private static void createBundleB() throws IOException {
+ Map<String, String> headers = new HashMap<String, String>();
+ headers.put(Constants.PROVIDE_CAPABILITY, "y;y=foo");
+ createBundle(BUNDLE_B, headers);
+ }
+
+ private static boolean createdTestFiles;
+ @Before
+ public static void createTestFiles() throws Exception {
+ if (createdTestFiles)
+ return;
+ createBundleA();
+ createBundleB();
+ createApplicationA();
+ createdTestFiles = true;
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+ registerRepositoryService(BUNDLE_A);
+ }
+
+ @Test
+ public void testRequireCapability() throws Exception {
+ Bundle bundleB = installBundleFromFile(BUNDLE_B);
+ try {
+ Subsystem subsystem = installSubsystemFromFile(APPLICATION_A);
+ try {
+ startSubsystem(subsystem);
+ stopSubsystem(subsystem);
+ }
+ finally {
+ uninstallSubsystemSilently(subsystem);
+ }
+ }
+ finally {
+ uninstallSilently(bundleB);
+ }
+ }
+}