Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 61924 invoked from network); 3 Mar 2010 15:34:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Mar 2010 15:34:36 -0000 Received: (qmail 15282 invoked by uid 500); 3 Mar 2010 15:34:29 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 15253 invoked by uid 500); 3 Mar 2010 15:34:29 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 15245 invoked by uid 99); 3 Mar 2010 15:34:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Mar 2010 15:34:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Mar 2010 15:34:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DAD15238896F; Wed, 3 Mar 2010 15:34:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r918512 - in /felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime: ComponentManager.java DescriptorParam.java Date: Wed, 03 Mar 2010 15:34:08 -0000 To: commits@felix.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100303153408.DAD15238896F@eris.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 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.