svn commit: r1356384 - in /felix/trunk/scrplugin: annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java

[cziegeler]

Author: cziegeler
Date: Mon Jul  2 18:02:41 2012
New Revision: 1356384

URL: http://svn.apache.org/viewvc?rev=1356384&view=rev
Log:
FELIX-3550 : Reimplement the SCR Generator

Modified:
    
felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
    
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java

Modified: 
felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java?rev=1356384&r1=1356383&r2=1356384&view=diff
==============================================================================
--- 
felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
 (original)
+++ 
felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
 Mon Jul  2 18:02:41 2012
@@ -404,7 +404,6 @@ public class SCRAnnotationProcessor impl
                         }
                     }
                 } else {
-                    prop.setType(PropertyType.String);
                     final Object value = 
fieldAnnotation.getAnnotatedFieldValue();
                     if (value != null) {
                         name = value.toString();

Modified: 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java?rev=1356384&r1=1356383&r2=1356384&view=diff
==============================================================================
--- 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
 (original)
+++ 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
 Mon Jul  2 18:02:41 2012
@@ -522,6 +522,9 @@ public class ComponentDescriptorIO {
                                 iLog.addWarning("Invalid value for attribute 
type : " + type, this.location);
                             }
                         }
+                        if ( prop.getType() == null ) {
+                            prop.setType(PropertyType.String);
+                        }
 
                         if (attributes.getValue("value") != null) {
                             prop.setValue(attributes.getValue("value"));