svn commit: r930809 - /felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentManager.java

[pd...@apache.org]

Author: pderop
Date: Mon Apr  5 07:48:09 2010
New Revision: 930809

URL: http://svn.apache.org/viewvc?rev=930809&view=rev
Log:
applied DependencyManager.createResourceAdapterService() API modification: service name is now defined as a String, not as a Class

Modified:
    felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentManager.java

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentManager.java?rev=930809&r1=930808&r2=930809&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentManager.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentManager.java Mon Apr  5 07:48:09 2010
@@ -369,7 +369,7 @@ public class ComponentManager implements
         Class<?> adapteeService = b.loadClass(parser.getString(DescriptorParam.adapteeService));
         String adapteeFilter = parser.getString(DescriptorParam.adapteeFilter, null);
      
-        Service service = dm.createAdapterService(adapteeService, adapteeFilter, adapterService, adapterImpl, adapterProperties);
+        Service service = dm.createAdapterService(adapteeService, adapteeFilter, adapterService.getName(), adapterImpl, adapterProperties);
         setCommonServiceParams(service, parser);
         return service;
     }
@@ -411,7 +411,7 @@ public class ComponentManager implements
         Class<?> serviceClass = b.loadClass(service);
         Dictionary<String, String> properties = parser.getDictionary(DescriptorParam.properties, null);
         boolean propagate = "true".equals(parser.getString(DescriptorParam.propagate, "false"));
-        Service srv = dm.createResourceAdapterService(filter, serviceClass, properties, impl, propagate);  
+        Service srv = dm.createResourceAdapterService(filter, serviceClass.getName(), properties, impl, propagate);  
         setCommonServiceParams(srv, parser);
         return srv;
     }