Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A7D48106DD for ; Fri, 10 Jan 2014 09:09:28 +0000 (UTC) Received: (qmail 63083 invoked by uid 500); 10 Jan 2014 09:09:28 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 62973 invoked by uid 500); 10 Jan 2014 09:09:26 -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 62966 invoked by uid 99); 10 Jan 2014 09:09:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jan 2014 09:09:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 10 Jan 2014 09:09:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 78D6B2388860; Fri, 10 Jan 2014 09:09:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1557061 - in /felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin: SCRDescriptorGenerator.java helper/ClassScanner.java Date: Fri, 10 Jan 2014 09:09:04 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140110090904.78D6B2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Jan 10 09:09:04 2014 New Revision: 1557061 URL: http://svn.apache.org/r1557061 Log: FELIX-4379 : Properties, references and services from inherited classes are only used if the class has the component annotation Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java?rev=1557061&r1=1557060&r2=1557061&view=diff ============================================================================== --- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java (original) +++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java Fri Jan 10 09:09:04 2014 @@ -383,11 +383,11 @@ public class SCRDescriptorGenerator { componentDesc.setSpecVersion(SpecVersion.VERSION_1_1); } - // services, properties, references - this.processServices(current, container); - this.processProperties(current, container, ocd); - this.processReferences(current, container); } + // services, properties, references + this.processServices(current, container); + this.processProperties(current, container, ocd); + this.processReferences(current, container); // go up in the class hierarchy Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java?rev=1557061&r1=1557060&r2=1557061&view=diff ============================================================================== --- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java (original) +++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java Fri Jan 10 09:09:04 2014 @@ -419,7 +419,7 @@ public class ClassScanner { public ClassDescription getDescription(final Class clazz) throws SCRDescriptorException, SCRDescriptorFailureException { final String name = clazz.getName(); - // do don't need to scan classes in the java. or javax. package namespace + // we don't need to scan classes in the java. or javax. package namespace if ( name.startsWith("java.") || name.startsWith("javax.") ) { return null; }