FELIX-4379 : Properties, references and services from inherited classes are only used if the class has the component annotation
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1557061 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
index 487f217..29ce548 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
@@ -383,11 +383,11 @@
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
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
index 2eb7480..0cedbf7 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
@@ -419,7 +419,7 @@
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;
}