felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r985128 - in /felix/trunk/dependencymanager: annotation/src/main/java/org/apache/felix/dm/annotation/api/ annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/ runtime/src/main/java/org/apache/felix/dm/runtime/ test/src/main/j...
Date Fri, 13 Aug 2010 08:36:53 GMT
Author: pderop
Date: Fri Aug 13 08:36:53 2010
New Revision: 985128

URL: http://svn.apache.org/viewvc?rev=985128&view=rev
Log:
replaced misspelled provide attribute by provides attribute

Modified:
    felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java
    felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
    felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
    felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java
    felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java
    felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java
    felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java
    felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/temporal/TemporalTest.java

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java?rev=985128&r1=985127&r2=985128&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java
(original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/Service.java
Fri Aug 13 08:36:53 2010
@@ -136,7 +136,7 @@ public @interface Service
     /**
      * Sets list of provided interfaces. By default, the directly implemented interfaces
are provided.
      */
-    Class<?>[] provide() default {};
+    Class<?>[] provides() default {};
 
     /**
      * Sets list of provided service properties.

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java?rev=985128&r1=985127&r2=985128&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
(original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
Fri Aug 13 08:36:53 2010
@@ -263,8 +263,8 @@ public class AnnotationCollector extends
         // properties attribute
         parseProperties(annotation, EntryParam.properties, writer);
 
-        // provide attribute
-        writer.putClassArray(annotation, EntryParam.provide, m_interfaces);
+        // provides attribute
+        writer.putClassArray(annotation, EntryParam.provides, m_interfaces);
 
         // factorySet attribute
         writer.putString(annotation, EntryParam.factorySet, null);

Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java?rev=985128&r1=985127&r2=985128&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
(original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/EntryParam.java
Fri Aug 13 08:36:53 2010
@@ -10,7 +10,7 @@ public enum EntryParam
     stop, 
     destroy, 
     impl, 
-    provide, 
+    provides, 
     properties, 
     composition, 
     service, 

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java?rev=985128&r1=985127&r2=985128&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java
(original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactorySet.java
Fri Aug 13 08:36:53 2010
@@ -149,13 +149,13 @@ public class FactorySet extends Abstract
      * @param b the bundle containing the Service annotated with the factory attribute
      * @param impl The Service implementation class
      * @param serviceProperties The Service properties
-     * @param provide The Services provided by this Service
+     * @param provides The Services provided by this Service
      * @param factoryConfigure The configure callback invoked in order to pass configurations
added in this Set.
      */
     public FactorySet(Bundle b, MetaData srvMeta, List<MetaData> depsMeta)
     {
         m_serviceProperties = srvMeta.getDictionary(Params.properties, null);
-        m_provide = srvMeta.getStrings(Params.provide, null);
+        m_provide = srvMeta.getStrings(Params.provides, null);
         m_configure = srvMeta.getString(Params.factoryConfigure, null);
         m_bundle = b;
         m_srvMeta = srvMeta;

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java?rev=985128&r1=985127&r2=985128&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java
(original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/Params.java
Fri Aug 13 08:36:53 2010
@@ -29,7 +29,7 @@ public enum Params
     stop,
     destroy,
     impl,
-    provide,
+    provides,
     properties,
     composition,
     service,

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java?rev=985128&r1=985127&r2=985128&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java
(original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceBuilder.java
Fri Aug 13 08:36:53 2010
@@ -73,7 +73,7 @@ public class ServiceBuilder extends Serv
             
             // Set the provided services
             Dictionary<String, Object> properties = srvMeta.getDictionary(Params.properties,
null);
-            String[] services = srvMeta.getStrings(Params.provide, null);
+            String[] services = srvMeta.getStrings(Params.provides, null);
             String publisherField = srvMeta.getString(Params.publisher, null);
             String unpublisherField = srvMeta.getString(Params.unpublisher, null);
             if (publisherField == null) 

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java?rev=985128&r1=985127&r2=985128&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java
(original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider2.java
Fri Aug 13 08:36:53 2010
@@ -25,7 +25,7 @@ import org.apache.felix.dm.annotation.ap
 import org.apache.felix.dm.annotation.api.ServiceDependency;
 import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
 
-@Service(provide = { ServiceProvider2.class }, factoryMethod="create")
+@Service(provides = { ServiceProvider2.class }, factoryMethod="create")
 public class ServiceProvider2
 {
     Composite m_composite = new Composite();

Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/temporal/TemporalTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/temporal/TemporalTest.java?rev=985128&r1=985127&r2=985128&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/temporal/TemporalTest.java
(original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/temporal/TemporalTest.java
Fri Aug 13 08:36:53 2010
@@ -27,7 +27,7 @@ import org.apache.felix.dm.test.bundle.a
 /**
  * Service using an annotated Temporal Service dependendency.
  */
-@Service(provide = {})
+@Service(provides = {})
 public class TemporalTest implements Runnable
 {
     Thread m_thread;



Mime
View raw message