aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tjwat...@apache.org
Subject svn commit: r1686947 - in /aries/trunk/subsystem: subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ subsystem-itests/ subsystem-itests/src/test/bundles/tb1/META-INF/ subsystem-itests/src/test/bundles/tb2/META-INF/
Date Mon, 22 Jun 2015 21:48:07 GMT
Author: tjwatson
Date: Mon Jun 22 21:48:06 2015
New Revision: 1686947

URL: http://svn.apache.org/r1686947
Log:
ARIES-1307 - mandatory matching directive on exported packages cause all importers to fail

Modified:
    aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageRequirement.java
    aries/trunk/subsystem/subsystem-itests/pom.xml
    aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb1/META-INF/MANIFEST.MF
    aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb2/META-INF/MANIFEST.MF

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageRequirement.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageRequirement.java?rev=1686947&r1=1686946&r2=1686947&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageRequirement.java
(original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/archive/ImportPackageRequirement.java
Mon Jun 22 21:48:06 2015
@@ -43,10 +43,15 @@ public class ImportPackageRequirement ex
 		if (versionRange != null) {
 			versionRange.appendToFilter(filter);
 		}
+		for(Attribute packageAttribute : clause.getAttributes()) {
+			if (!(packageAttribute instanceof  VersionRangeAttribute)) {
+			    packageAttribute.appendToFilter(filter);
+			}
+		}
 		directives.put(DIRECTIVE_FILTER, filter.append(')').toString());
 		this.resource = resource;
 	}
-	
+
 	@Override
 	public Map<String, Object> getAttributes() {
 		return Collections.emptyMap();

Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1686947&r1=1686946&r2=1686947&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Mon Jun 22 21:48:06 2015
@@ -141,7 +141,7 @@
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.core</artifactId>
             <scope>test</scope>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>2.0.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.osgi</groupId>

Modified: aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb1/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb1/META-INF/MANIFEST.MF?rev=1686947&r1=1686946&r2=1686947&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb1/META-INF/MANIFEST.MF (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb1/META-INF/MANIFEST.MF Mon Jun
22 21:48:06 2015
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: TB1
 Bundle-SymbolicName: org.apache.aries.subsystem.itests.tb1
 Bundle-Version: 1.0.0
-Export-Package: org.apache.aries.subsystem.itests.tb1
+Export-Package: org.apache.aries.subsystem.itests.tb1; vendor="Balcones Fault Software";
mandatory:=vendor
 Import-Package: org.apache.aries.subsystem.itests.tb3

Modified: aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb2/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb2/META-INF/MANIFEST.MF?rev=1686947&r1=1686946&r2=1686947&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb2/META-INF/MANIFEST.MF (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/bundles/tb2/META-INF/MANIFEST.MF Mon Jun
22 21:48:06 2015
@@ -4,4 +4,4 @@ Bundle-Name: TB2
 Bundle-SymbolicName: org.apache.aries.subsystem.itests.tb2
 Bundle-Version: 2.0.0
 Export-Package: org.apache.aries.subsystem.itests.tb2
-Import-Package: org.apache.aries.subsystem.itests.tb1
+Import-Package: org.apache.aries.subsystem.itests.tb1; vendor="Balcones Fault Software"



Mime
View raw message