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 2011/03/04 10:41:05 UTC
svn commit: r1077858 - in /aries/trunk/spi-fly/spi-fly-core/src:
main/java/org/apache/aries/spifly/ test/java/org/apache/aries/spifly/
Author: davidb
Date: Fri Mar 4 09:41:04 2011
New Revision: 1077858
URL: http://svn.apache.org/viewvc?rev=1077858&view=rev
Log:
Change value of SPI-Consumer header from "true" to "*"
Modified:
aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ClientWeavingHook.java
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ClientWeavingHookTest.java
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java
Modified: aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ClientWeavingHook.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ClientWeavingHook.java?rev=1077858&r1=1077857&r2=1077858&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ClientWeavingHook.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ClientWeavingHook.java Fri Mar 4 09:41:04 2011
@@ -145,7 +145,7 @@ public class ClientWeavingHook implement
methodRestriction = new MethodRestriction(methodName);
}
} else {
- if ("true".equalsIgnoreCase(name)) {
+ if ("*".equalsIgnoreCase(name)) {
className = ServiceLoader.class.getName();
methodName = "load";
ArgRestrictions argRestrictions = new ArgRestrictions();
Modified: aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ClientWeavingHookTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ClientWeavingHookTest.java?rev=1077858&r1=1077857&r2=1077858&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ClientWeavingHookTest.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ClientWeavingHookTest.java Fri Mar 4 09:41:04 2011
@@ -61,7 +61,7 @@ public class ClientWeavingHookTest {
@Test
public void testClientWeavingHookBasicServiveLoaderUsage() throws Exception {
Dictionary<String, String> consumerHeaders = new Hashtable<String, String>();
- consumerHeaders.put(SpiFlyConstants.SPI_CONSUMER_HEADER, "true");
+ consumerHeaders.put(SpiFlyConstants.SPI_CONSUMER_HEADER, "*");
// Register the bundle that provides the SPI implementation.
Bundle providerBundle = mockProviderBundle("impl1", 1);
@@ -97,7 +97,7 @@ public class ClientWeavingHookTest {
Bundle spiFlyBundle = mockSpiFlyBundle();
Dictionary<String, String> headers = new Hashtable<String, String>();
- headers.put(SpiFlyConstants.SPI_CONSUMER_HEADER, "true");
+ headers.put(SpiFlyConstants.SPI_CONSUMER_HEADER, "*");
Bundle consumerBundle = mockConsumerBundle(headers, spiFlyBundle);
WeavingHook wh = new ClientWeavingHook(spiFlyBundle.getBundleContext());
@@ -129,7 +129,7 @@ public class ClientWeavingHookTest {
Bundle spiFlyBundle = mockSpiFlyBundle();
Dictionary<String, String> headers = new Hashtable<String, String>();
- headers.put(SpiFlyConstants.SPI_CONSUMER_HEADER, "true");
+ headers.put(SpiFlyConstants.SPI_CONSUMER_HEADER, "*");
Bundle consumerBundle = mockConsumerBundle(headers, spiFlyBundle);
WeavingHook wh = new ClientWeavingHook(spiFlyBundle.getBundleContext());
Modified: aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java?rev=1077858&r1=1077857&r2=1077858&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerTest.java Fri Mar 4 09:41:04 2011
@@ -63,7 +63,7 @@ public class ProviderBundleTrackerCustom
Dictionary<String, String> headers = new Hashtable<String, String>();
// Specify the headers for the test bundle
- headers.put(SpiFlyConstants.SPI_PROVIDER_HEADER, "true");
+ headers.put(SpiFlyConstants.SPI_PROVIDER_HEADER, "*");
EasyMock.expect(implBundle.getHeaders()).andReturn(headers);
// List the resources found at META-INF/services in the test bundle