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/02/21 17:23:47 UTC

svn commit: r1291891 - in /aries/trunk/spi-fly: spi-fly-core/src/main/java/org/apache/aries/spifly/api/ spi-fly-dynamic-bundle/ spi-fly-examples/spi-fly-example-client2-bundle/ spi-fly-examples/spi-fly-example-provider2-bundle/

Author: davidb
Date: Tue Feb 21 16:23:47 2012
New Revision: 1291891

URL: http://svn.apache.org/viewvc?rev=1291891&view=rev
Log:
Update capability namespaces.

Modified:
    aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/api/SpiFlyConstants.java
    aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
    aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
    aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml

Modified: aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/api/SpiFlyConstants.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/api/SpiFlyConstants.java?rev=1291891&r1=1291890&r2=1291891&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/api/SpiFlyConstants.java (original)
+++ aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/api/SpiFlyConstants.java Tue Feb 21 16:23:47 2012
@@ -27,8 +27,8 @@ public interface SpiFlyConstants {
 
     String EXTENDER_CAPABILITY_NAMESPACE = "osgi.extender";
 
-    String CLIENT_EXTENDER_NAME = "spi.consumer.mediator";
-    String PROVIDER_EXTENDER_NAME = "spi.provider.mediator";
+    String CLIENT_EXTENDER_NAME = "serviceloader.processor";
+    String PROVIDER_EXTENDER_NAME = "serviceloader.registrar";
 
     String CLIENT_REQUIREMENT = EXTENDER_CAPABILITY_NAMESPACE + "; " + EXTENDER_CAPABILITY_NAMESPACE + "=" + CLIENT_EXTENDER_NAME;
     String PROVIDER_REQUIREMENT = EXTENDER_CAPABILITY_NAMESPACE + "; " + EXTENDER_CAPABILITY_NAMESPACE + "=" + PROVIDER_EXTENDER_NAME;

Modified: aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml?rev=1291891&r1=1291890&r2=1291891&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml Tue Feb 21 16:23:47 2012
@@ -107,7 +107,7 @@ JRE through META-INF/services resources)
                             org.apache.aries.spifly.dynamic
                         </Private-Package>
                         <Embed-Dependency>org.apache.aries.spifly.*;scope=compile;inline=true</Embed-Dependency>
-                        <Provide-Capability>osgi.extender;osgi.extender=spi.consumer.mediator,osgi.extender;osgi.extender=spi.provider.mediator</Provide-Capability>
+                        <Provide-Capability>osgi.extender;osgi.extender=serviceloader.registrar,osgi.extender;osgi.extender=serviceloader.processor</Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml?rev=1291891&r1=1291890&r2=1291891&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-client2-bundle/pom.xml Tue Feb 21 16:23:47 2012
@@ -65,7 +65,7 @@
                             org.apache.aries.spifly.examples.client2.impl
                         </Private-Package>
                         <Bundle-Activator>org.apache.aries.spifly.examples.client2.impl.Activator</Bundle-Activator>
-                        <Require-Capability>osgi.extender; osgi.extender=spi.consumer.mediator</Require-Capability>
+                        <Require-Capability>osgi.extender; osgi.extender=serviceloader.processor</Require-Capability>
                     </instructions>
                 </configuration>
             </plugin>

Modified: aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml?rev=1291891&r1=1291890&r2=1291891&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/spi-fly-example-provider2-bundle/pom.xml Tue Feb 21 16:23:47 2012
@@ -59,7 +59,7 @@
                         <Private-Package>
                             org.apache.aries.spifly.mysvc.impl2
                         </Private-Package>
-                        <Require-Capability>osgi.extender; osgi.extender=spi.provider.mediator</Require-Capability>
+                        <Require-Capability>osgi.extender; osgi.extender=serviceloader.registrar</Require-Capability>
                     </instructions>
                 </configuration>
             </plugin>