You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by da...@apache.org on 2012/03/08 14:31:33 UTC
svn commit: r1298388 - in /aries/trunk/spi-fly/spi-fly-core/src:
main/java/org/apache/aries/spifly/ test/java/org/apache/aries/spifly/
Author: davidb
Date: Thu Mar 8 13:31:32 2012
New Revision: 1298388
URL: http://svn.apache.org/viewvc?rev=1298388&view=rev
Log:
Remove commented out code
Modified:
aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ConsumerHeaderProcessor.java
aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
Modified: aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ConsumerHeaderProcessor.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ConsumerHeaderProcessor.java?rev=1298388&r1=1298387&r2=1298388&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ConsumerHeaderProcessor.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ConsumerHeaderProcessor.java Thu Mar 8 13:31:32 2012
@@ -235,25 +235,13 @@ public class ConsumerHeaderProcessor {
return null;
}
-
-// private static GenericMetadata findMetadata(List<GenericMetadata> requirements, String namespace, String type) {
-// for (GenericMetadata req : requirements) {
-// if (namespace.equals(req.getNamespace())) {
-// if (type.equals(req.getAttributes().get(namespace))) {
-// return req;
-// }
-// }
-// }
-// return null;
-// }
-
- private static Collection<GenericMetadata> findAllMetadata(List<GenericMetadata> requirements, String namespace) {
- List<GenericMetadata> reqs = new ArrayList<ManifestHeaderProcessor.GenericMetadata>();
- for (GenericMetadata req : requirements) {
- if (namespace.equals(req.getNamespace())) {
- reqs.add(req);
+ private static Collection<GenericMetadata> findAllMetadata(List<GenericMetadata> metadata, String namespace) {
+ List<GenericMetadata> matching = new ArrayList<ManifestHeaderProcessor.GenericMetadata>();
+ for (GenericMetadata md : metadata) {
+ if (namespace.equals(md.getNamespace())) {
+ matching.add(md);
}
}
- return reqs;
+ return matching;
}
}
Modified: aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java?rev=1298388&r1=1298387&r2=1298388&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizer.java Thu Mar 8 13:31:32 2012
@@ -221,49 +221,6 @@ public class ProviderBundleTrackerCustom
}
}
return serviceNames;
-
-/*
- //******************
- Object capabilityHeaderxx = headers.get(SpiFlyConstants.REQUIRE_CAPABILITY);
- if (capabilityHeader == null)
- return null;
-
- // Find the extender namespace and check that its filter matches serviceloader.registrar
- // if so, find all capabilties in osgi.serviceloader namespace,
- List<GenericMetadata> capabilitiesxx = ManifestHeaderProcessor.parseCapabilityString(capabilityHeader.toString());
- for (GenericMetadata cap : capabilities) {
- if (!SpiFlyConstants.EXTENDER_CAPABILITY_NAMESPACE.equals(cap.getNamespace()))
- continue;
-
- for (Map.Entry<String, Object> entry : cap.getAttributes().entrySet()) {
- if (SpiFlyConstants.EXTENDER_CAPABILITY_NAMESPACE.equals(entry.getKey()))
- continue;
-
- customAttributes.put(entry.getKey(), entry.getValue());
- }
-
- List<String> serviceNames = new ArrayList<String>();
- for (Map.Entry<String, String> entry : cap.getDirectives().entrySet()) {
- if ("filter".equals(entry.getKey()))
- continue;
- if ("resolution".equals(entry.getKey()))
- continue;
-
- if (SpiFlyConstants.PROVIDED_SPI_DIRECTIVE.equals(entry.getKey())) {
- if (entry.getValue() != null) {
- for (String s : entry.getValue().split(",")) {
- serviceNames.add(s.trim());
- }
- }
- } else {
- directives.put(entry.getKey(), entry.getValue());
- }
- }
-
- return serviceNames;
- }
- return null;
- */
}
// null means don't register,
@@ -327,6 +284,27 @@ public class ProviderBundleTrackerCustom
return urls;
}
+ private GenericMetadata findCapability(List<GenericMetadata> capabilities, String namespace, String spiName) {
+ for (GenericMetadata cap : capabilities) {
+ if (namespace.equals(cap.getNamespace())) {
+ if (spiName.equals(cap.getAttributes().get(namespace))) {
+ return cap;
+ }
+ }
+ }
+ return null;
+ }
+
+ private static Collection<GenericMetadata> findAllMetadata(List<GenericMetadata> requirements, String namespace) {
+ List<GenericMetadata> reqs = new ArrayList<ManifestHeaderProcessor.GenericMetadata>();
+ for (GenericMetadata req : requirements) {
+ if (namespace.equals(req.getNamespace())) {
+ reqs.add(req);
+ }
+ }
+ return reqs;
+ }
+
public void modifiedBundle(Bundle bundle, BundleEvent event, Object registrations) {
// should really be doing something here...
}
@@ -367,25 +345,4 @@ public class ProviderBundleTrackerCustom
}
return null;
}
-
- private GenericMetadata findCapability(List<GenericMetadata> capabilities, String namespace, String spiName) {
- for (GenericMetadata cap : capabilities) {
- if (namespace.equals(cap.getNamespace())) {
- if (spiName.equals(cap.getAttributes().get(namespace))) {
- return cap;
- }
- }
- }
- return null;
- }
-
- private static Collection<GenericMetadata> findAllMetadata(List<GenericMetadata> requirements, String namespace) {
- List<GenericMetadata> reqs = new ArrayList<ManifestHeaderProcessor.GenericMetadata>();
- for (GenericMetadata req : requirements) {
- if (namespace.equals(req.getNamespace())) {
- reqs.add(req);
- }
- }
- return reqs;
- }
}
Modified: aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java?rev=1298388&r1=1298387&r2=1298388&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java Thu Mar 8 13:31:32 2012
@@ -392,10 +392,6 @@ public class ProviderBundleTrackerCustom
return implBC;
}
- private Bundle mockSPIBundle(BundleContext implBC) throws ClassNotFoundException {
- return mockSPIBundle(implBC, SpiFlyConstants.PROVIDER_REQUIREMENT);
- }
-
private Bundle mockSPIBundle(BundleContext implBC, String spiProviderHeader) throws ClassNotFoundException {
Dictionary<String, String> headers = new Hashtable<String, String>();
headers.put(SpiFlyConstants.REQUIRE_CAPABILITY, spiProviderHeader);