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

[ma...@apache.org]

Author: marrs
Date: Wed Mar  3 15:34:08 2010
New Revision: 918512

URL: http://svn.apache.org/viewvc?rev=918512&view=rev
Log:
Attempt to implement aspect API change in the runtime.

Modified:
    felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ComponentManager.java
    felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParam.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=918512&r1=918511&r2=918512&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 Wed Mar  3 15:34:08 2010
@@ -332,7 +332,8 @@
         String serviceFilter = parser.getString(DescriptorParam.filter, null);
         Class<?> aspectImplementation = b.loadClass(parser.getString(DescriptorParam.impl));
         Dictionary<String, String> aspectProperties = parser.getDictionary(DescriptorParam.properties, null);
-        Service service = dm.createAspectService(serviceInterface, serviceFilter, aspectImplementation, aspectProperties);
+        int ranking = parser.getInt(DescriptorParam.ranking, 1);
+        Service service = dm.createAspectService(serviceInterface, serviceFilter, ranking, aspectImplementation, aspectProperties);
         setServiceCallbacks(service, parser);
         setServiceComposition(service, parser);
         return service;

Modified: felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParam.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParam.java?rev=918512&r1=918511&r2=918512&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParam.java (original)
+++ felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/DescriptorParam.java Wed Mar  3 15:34:08 2010
@@ -65,7 +65,7 @@
     /* ServiceDependency attribute for the service default impl (the parsed value is a String) */
     defaultImpl,
 
-    /* ServiceDependency attribute for the required booleean (the parsed value is a String ("false"|"true") */
+    /* ServiceDependency attribute for the required boolean (the parsed value is a String ("false"|"true") */
     required,
 
     /* ServiceDependency attribute for the added callback name (the parsed value is a String) */
@@ -105,7 +105,10 @@
     adapteeFilter,
     
     /* BundleDependency attribute for the state mask bundle (the parsed value is a string) */
-    stateMask;
+    stateMask,
+    
+    /* The ranking of an aspect (the parsed value is an int) */
+    ranking;
     
     /**
      * Indicates if a given attribute is a Service attribute.