Author: tjwatson
Date: Wed Sep 7 15:38:55 2016
New Revision: 1759624
URL: http://svn.apache.org/viewvc?rev=1759624&view=rev
Log:
Merged latest trunk/subsystem changes to java6support branch.
Added:
aries/branches/java6support/subsystem/subsystem-itests/src/test/bundles/aries1608provider/
- copied from r1759621,
aries/trunk/subsystem/subsystem-itests/src/test/bundles/aries1608provider/
aries/branches/java6support/subsystem/subsystem-itests/src/test/bundles/aries1608required/
- copied from r1759621,
aries/trunk/subsystem/subsystem-itests/src/test/bundles/aries1608required/
aries/branches/java6support/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1608Test.java
- copied unchanged from r1759621,
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1608Test.java
Modified:
aries/branches/java6support/subsystem/ (props changed)
aries/branches/java6support/subsystem/subsystem-itests/pom.xml
aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixCapabilityAdapter.java
Propchange: aries/branches/java6support/subsystem/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 7 15:38:55 2016
@@ -1,2 +1,2 @@
/aries/branches/1.0-prototype/subsystem:1306564-1337594
-/aries/trunk/subsystem:1728111-1746297
+/aries/trunk/subsystem:1728111-1759621
Modified: aries/branches/java6support/subsystem/subsystem-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-itests/pom.xml?rev=1759624&r1=1759623&r2=1759624&view=diff
==============================================================================
--- aries/branches/java6support/subsystem/subsystem-itests/pom.xml (original)
+++ aries/branches/java6support/subsystem/subsystem-itests/pom.xml Wed Sep 7
15:38:55 2016
@@ -580,7 +580,45 @@
</execution>
<!-- End of new pom for hello tests, part 1 -->
-
+
+ <execution>
+ <id>aries1608provider</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+
<manifestFile>src/test/bundles/aries1608provider/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+
<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+ <includes>
+
<include>org/apache/aries/subsystem/itests/aries1608provider/**</include>
+ </includes>
+
<outputDirectory>${project.build.directory}/test-classes/aries1608</outputDirectory>
+ <finalName>aries1608provider</finalName>
+ </configuration>
+ <phase>process-test-classes</phase>
+ </execution>
+
+ <execution>
+ <id>aries.bundlearies1608required</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+
<manifestFile>src/test/bundles/aries1608required/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+
<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+ <includes>
+
<include>org/apache/aries/subsystem/itests/aries1608required/**</include>
+ </includes>
+
<outputDirectory>${project.build.directory}/test-classes/aries1608</outputDirectory>
+ <finalName>aries1608required</finalName>
+ </configuration>
+ <phase>process-test-classes</phase>
+ </execution>
+
<execution>
<id>aries1523host</id>
<goals>
@@ -717,7 +755,32 @@
</execution>
<!-- End of new pom for hello tests, part 2 -->
-
+ <execution>
+ <id>add-source-aries1608provider</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>src/test/bundles/aries1608provider</source>
+ </sources>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>add-source-aries1608required</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>src/test/bundles/aries1608required</source>
+ </sources>
+ </configuration>
+ </execution>
+
<execution>
<id>add-source-aries1523host</id>
<phase>generate-sources</phase>
Modified:
aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixCapabilityAdapter.java
URL:
http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixCapabilityAdapter.java?rev=1759624&r1=1759623&r2=1759624&view=diff
==============================================================================
---
aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixCapabilityAdapter.java
(original)
+++
aries/branches/java6support/subsystem/subsystem-obr/src/main/java/org/apache/aries/subsystem/util/felix/FelixCapabilityAdapter.java
Wed Sep 7 15:38:55 2016
@@ -38,8 +38,10 @@ public class FelixCapabilityAdapter exte
String namespace = getNamespace();
if (ServiceNamespace.SERVICE_NAMESPACE.equals(namespace))
result.put(ServiceNamespace.CAPABILITY_OBJECTCLASS_ATTRIBUTE,
result.get(ServiceNamespace.CAPABILITY_OBJECTCLASS_ATTRIBUTE.toLowerCase()));
- else if (BundleNamespace.BUNDLE_NAMESPACE.equals(namespace))
+ else if (BundleNamespace.BUNDLE_NAMESPACE.equals(namespace)) {
result.put(BundleNamespace.BUNDLE_NAMESPACE,
result.get(org.apache.felix.bundlerepository.Resource.SYMBOLIC_NAME));
+
result.put(BundleNamespace.CAPABILITY_BUNDLE_VERSION_ATTRIBUTE,
result.get(org.apache.felix.bundlerepository.Resource.VERSION));
+ }
else
result.put(namespace, result.get(capability.getName()));
return result;
