svn commit: r947481 - in /felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime: AspectServiceBuilder.java Params.java

[pderop]

Author: pderop
Date: Sun May 23 20:10:05 2010
New Revision: 947481

URL: http://svn.apache.org/viewvc?rev=947481&view=rev
Log:
added field attribute in Aspect annotation

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

Modified: 
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java?rev=947481&r1=947480&r2=947481&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
 (original)
+++ 
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/AspectServiceBuilder.java
 Sun May 23 20:10:05 2010
@@ -47,13 +47,12 @@ public class AspectServiceBuilder extend
 
         Class<?> serviceInterface = 
b.loadClass(serviceMetaData.getString(Params.service));
         String serviceFilter = serviceMetaData.getString(Params.filter, null);
-        Dictionary<String, Object> aspectProperties = 
serviceMetaData.getDictionary(Params.properties,
-            null);
+        Dictionary<String, Object> aspectProperties = 
serviceMetaData.getDictionary(Params.properties, null);
         int ranking = serviceMetaData.getInt(Params.ranking, 1);
         String implClass = serviceMetaData.getString(Params.impl);
-        Object impl = b.loadClass(implClass);
-        // TODO add attribute name
-        Service service = dm.createAspectService(serviceInterface, 
serviceFilter, ranking, null)
+        Object impl = b.loadClass(implClass);        
+        String field = serviceMetaData.getString(Params.field, null);        
+        Service service = dm.createAspectService(serviceInterface, 
serviceFilter, ranking, field)
                             .setImplementation(impl)
                             .setServiceProperties(aspectProperties);
         setCommonServiceParams(service, serviceMetaData);

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=947481&r1=947480&r2=947481&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
 Sun May 23 20:10:05 2010
@@ -53,5 +53,6 @@ public enum Params
     factoryPid,    
     factory,
     factoryConfigure,
-    name
+    name,
+    field
 }