Author: pderop
Date: Sat Aug 14 19:57:47 2010
New Revision: 985575
URL: http://svn.apache.org/viewvc?rev=985575&view=rev
Log:
fixed inconsistency in the api, where Services were not using the same
'provides' attribute when specifying the provided service interfaces
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/AdapterService.java
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleAdapterService.java
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.java
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceAdapterService.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/AdapterServiceBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.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/ResourceAdapterServiceBuilder.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProviderAdapter.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/AdapterService.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/AdapterService.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/AdapterService.java
(original)
+++
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/AdapterService.java
Sat Aug 14 19:57:47 2010
@@ -38,13 +38,13 @@ public @interface AdapterService
/**
* Sets the adapter service interface(s). By default, the directly
implemented interface(s) is (are) used.
*/
- Class<?>[] adapterService() default {};
+ Class<?>[] provides() default {};
/**
* Sets some additional properties to use with the adapter service
registration. By default,
* the adapter will inherit all adaptee service properties.
*/
- Property[] adapterProperties() default {};
+ Property[] properties() default {};
/**
* Sets the adaptee service interface this adapter is applying to.
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleAdapterService.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleAdapterService.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleAdapterService.java
(original)
+++
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/BundleAdapterService.java
Sat Aug 14 19:57:47 2010
@@ -39,25 +39,25 @@ public @Retention(RetentionPolicy.CLASS)
@interface BundleAdapterService
{
/**
- * The filter used to match a given bundle.
+ * The interface(s) to use when registering adapters. By default, the
interface(s) directly implemented
+ * by the annotated class is (are) used.
*/
- String filter();
+ Class<?>[] provides() default {};
/**
- * the bundle state mask to apply
+ * Additional properties to use with the service registration
*/
- int stateMask() default Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE;
+ Property[] properties() default {};
- /**
- * The interface(s) to use when registering adapters. By default, the
interface(s) directly implemented
- * by the annotated class is (are) used.
+ /**
+ * The filter used to match a given bundle.
*/
- Class<?>[] service() default {};
+ String filter();
/**
- * Additional properties to use with the service registration
+ * the bundle state mask to apply
*/
- Property[] properties() default {};
+ int stateMask() default Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE;
/**
* Specifies if properties from the bundle should be propagated to the
service.
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.java
(original)
+++
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.java
Sat Aug 14 19:57:47 2010
@@ -36,6 +36,18 @@ import java.lang.annotation.Target;
public @interface FactoryConfigurationAdapterService
{
/**
+ * The interface(s) to use when registering adapters. By default, directly
implemented
+ * interfaces will be registered in the OSGi registry.
+ */
+ Class<?>[] provides() default {};
+
+ /**
+ * Adapter Service properties. Notice that public factory configuration is
also registered in service properties,
+ * (only if propagate is true). Public factory configuration properties
are those which don't starts with a dot (".").
+ */
+ Property[] properties() default {};
+
+ /**
* Returns the factory pid whose configurations will instantiate the
annotated service class. (By default, the pid is the
* service class name).
*/
@@ -54,18 +66,6 @@ public @interface FactoryConfigurationAd
boolean propagate() default false;
/**
- * The interface(s) to use when registering adapters. By default, directly
implemented
- * interfaces will be registered in the OSGi registry.
- */
- Class<?>[] service() default {};
-
- /**
- * Adapter Service properties. Notice that public factory configuration is
also registered in service properties,
- * (only if propagate is true). Public factory configuration properties
are those which don't starts with a dot (".").
- */
- Property[] properties() default {};
-
- /**
* The label used to display the tab name (or section) where the
properties are displayed. Example: "Printer Service".
* @return The label used to display the tab name where the properties are
displayed.
*/
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceAdapterService.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceAdapterService.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceAdapterService.java
(original)
+++
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ResourceAdapterService.java
Sat Aug 14 19:57:47 2010
@@ -38,20 +38,20 @@ import java.lang.annotation.Target;
public @interface ResourceAdapterService
{
/**
- * The filter condition to use with the resource.
- */
- String filter();
-
- /**
* The interface(s) to use when registering adapters
*/
- Class<?>[] service() default {};
+ Class<?>[] provides() default {};
/**
* Additional properties to use with the adapter service registration
*/
Property[] properties() default {};
+ /**
+ * The filter condition to use with the resource.
+ */
+ String filter();
+
/**
* <code>true</code> if properties from the resource should be propagated
to the service.
*/
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=985575&r1=985574&r2=985575&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
Sat Aug 14 19:57:47 2010
@@ -489,10 +489,10 @@ public class AnnotationCollector extends
writer.putClass(annotation, EntryParam.adapteeService, null);
// Parse Adapter properties.
- parseProperties(annotation, EntryParam.adapterProperties, writer);
+ parseProperties(annotation, EntryParam.properties, writer);
- // Parse the optional adapter service (use directly implemented
interface by default).
- writer.putClassArray(annotation, EntryParam.adapterService,
m_interfaces);
+ // Parse the provided adapter service (use directly implemented
interface by default).
+ writer.putClassArray(annotation, EntryParam.provides, m_interfaces);
// Parse factoryMethod attribute
writer.putString(annotation, EntryParam.factoryMethod, null);
@@ -529,7 +529,7 @@ public class AnnotationCollector extends
parseProperties(annotation, EntryParam.properties, writer);
// Parse the optional adapter service (use directly implemented
interface by default).
- writer.putClassArray(annotation, EntryParam.service, m_interfaces);
+ writer.putClassArray(annotation, EntryParam.provides, m_interfaces);
// Parse propagate attribute
writer.putString(annotation, EntryParam.propagate,
Boolean.FALSE.toString());
@@ -564,8 +564,8 @@ public class AnnotationCollector extends
// Parse Adapter properties.
parseProperties(annotation, EntryParam.properties, writer);
- // Parse the optional adapter service (use directly implemented
interface by default).
- writer.putClassArray(annotation, EntryParam.service, m_interfaces);
+ // Parse the provided adapter service (use directly implemented
interface by default).
+ writer.putClassArray(annotation, EntryParam.provides, m_interfaces);
// Parse propagate attribute
writer.putString(annotation, EntryParam.propagate,
Boolean.FALSE.toString());
@@ -598,8 +598,8 @@ public class AnnotationCollector extends
// propagate attribute
writer.putString(annotation, EntryParam.propagate,
Boolean.FALSE.toString());
- // Parse the optional adapter service (use directly implemented
interface by default).
- writer.putClassArray(annotation, EntryParam.service, m_interfaces);
+ // Parse the provided adapter service (use directly implemented
interface by default).
+ writer.putClassArray(annotation, EntryParam.provides, m_interfaces);
// Parse Adapter properties.
parseProperties(annotation, EntryParam.properties, writer);
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=985575&r1=985574&r2=985575&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
Sat Aug 14 19:57:47 2010
@@ -26,8 +26,6 @@ public enum EntryParam
propagate,
updated,
timeout,
- adapterService,
- adapterProperties,
adapteeService,
adapteeFilter,
stateMask,
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java
(original)
+++
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AdapterServiceBuilder.java
Sat Aug 14 19:57:47 2010
@@ -44,12 +44,12 @@ public class AdapterServiceBuilder exten
throws Exception
{
Class<?> adapterImplClass =
b.loadClass(srvMeta.getString(Params.impl));
- String[] adapterService = srvMeta.getStrings(Params.adapterService,
null);
- Dictionary<String, Object> adapterProperties =
srvMeta.getDictionary(Params.adapterProperties, null);
+ String[] provides = srvMeta.getStrings(Params.provides, null);
+ Dictionary<String, Object> adapterProperties =
srvMeta.getDictionary(Params.properties, null);
Class<?> adapteeService =
b.loadClass(srvMeta.getString(Params.adapteeService));
String adapteeFilter = srvMeta.getString(Params.adapteeFilter, null);
Service service = dm.createAdapterService(adapteeService,
adapteeFilter)
- .setInterface(adapterService, adapterProperties);
+ .setInterface(provides, adapterProperties);
String factoryMethod = srvMeta.getString(Params.factoryMethod, null);
if (factoryMethod == null)
{
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java
(original)
+++
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/BundleAdapterServiceBuilder.java
Sat Aug 14 19:57:47 2010
@@ -42,11 +42,11 @@ public class BundleAdapterServiceBuilder
int stateMask = srvMeta.getInt(Params.stateMask, Bundle.INSTALLED |
Bundle.RESOLVED | Bundle.ACTIVE);
String filter = srvMeta.getString(Params.filter, null);
Class<?> adapterImplClass =
b.loadClass(srvMeta.getString(Params.impl));
- String[] service = srvMeta.getStrings(Params.service, null);
+ String[] provides = srvMeta.getStrings(Params.provides, null);
Dictionary<String, Object> properties =
srvMeta.getDictionary(Params.properties, null);
boolean propagate = "true".equals(srvMeta.getString(Params.propagate,
"false"));
Service srv = dm.createBundleAdapterService(stateMask, filter,
propagate)
- .setInterface(service, properties);
+ .setInterface(provides, properties);
String factoryMethod = srvMeta.getString(Params.factoryMethod, null);
if (factoryMethod == null)
{
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java
(original)
+++
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/FactoryConfigurationAdapterServiceBuilder.java
Sat Aug 14 19:57:47 2010
@@ -42,11 +42,11 @@ public class FactoryConfigurationAdapter
Class<?> implClass = b.loadClass(srvMeta.getString(Params.impl));
String factoryPid = srvMeta.getString(Params.factoryPid);
String updated = srvMeta.getString(Params.updated);
- String[] services = srvMeta.getStrings(Params.service, null);
+ String[] provides = srvMeta.getStrings(Params.provides, null);
Dictionary<String, Object> properties =
srvMeta.getDictionary(Params.properties, null);
boolean propagate = "true".equals(srvMeta.getString(Params.propagate,
"false"));
Service srv = dm.createFactoryConfigurationAdapterService(factoryPid,
updated, propagate)
- .setInterface(services, properties);
+ .setInterface(provides, properties);
String factoryMethod = srvMeta.getString(Params.factoryMethod, null);
if (factoryMethod == null)
{
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=985575&r1=985574&r2=985575&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
Sat Aug 14 19:57:47 2010
@@ -44,8 +44,6 @@ public enum Params
propagate,
updated,
timeout,
- adapterService,
- adapterProperties,
adapteeService,
adapteeFilter,
stateMask,
Modified:
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java
(original)
+++
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ResourceAdapterServiceBuilder.java
Sat Aug 14 19:57:47 2010
@@ -41,12 +41,12 @@ public class ResourceAdapterServiceBuild
{
String filter = srvMeta.getString(Params.filter, null);
Class<?> implClass = b.loadClass(srvMeta.getString(Params.impl));
- String[] service = srvMeta.getStrings(Params.service, null);
+ String[] provides = srvMeta.getStrings(Params.provides, null);
Dictionary<String, Object> properties =
srvMeta.getDictionary(Params.properties, null);
boolean propagate = "true".equals(srvMeta.getString(Params.propagate,
"false"));
String changed = srvMeta.getString(Params.changed, null /* no change
callback if not specified explicitly */);
Service srv = dm.createResourceAdapterService(filter, propagate, null,
changed)
- .setInterface(service, properties);
+ .setInterface(provides, properties);
String factoryMethod = srvMeta.getString(Params.factoryMethod, null);
if (factoryMethod == null)
{
Modified:
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProviderAdapter.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProviderAdapter.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProviderAdapter.java
(original)
+++
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/adapter/ServiceProviderAdapter.java
Sat Aug 14 19:57:47 2010
@@ -23,7 +23,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;
-...@adapterservice(adapteeService = ServiceInterface.class,
adapterpropertie...@property(name="param2", value="value2")})
+...@adapterservice(adapteeService = ServiceInterface.class,
propertie...@property(name="param2", value="value2")})
public class ServiceProviderAdapter implements ServiceInterface3
{
// This is the adapted service
Modified:
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java?rev=985575&r1=985574&r2=985575&view=diff
==============================================================================
---
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java
(original)
+++
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/extraproperties/ExtraAdapterServiceProperties.java
Sat Aug 14 19:57:47 2010
@@ -48,7 +48,7 @@ public class ExtraAdapterServiceProperti
{
}
- @AdapterService(adapteeService=Provider.class,
adapterpropertie...@property(name="foo2", value="bar2")})
+ @AdapterService(provides=Provider2.class,
propertie...@property(name="foo2", value="bar2")},
adapteeService=Provider.class)
public static class Provider2Impl implements Provider2
{
protected Provider m_adaptee;
