felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
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 GMT
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;
         }



Mime
View raw message