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 872EBD07B for ; Mon, 2 Jul 2012 18:03:05 +0000 (UTC) Received: (qmail 2146 invoked by uid 500); 2 Jul 2012 18:03:05 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 2100 invoked by uid 500); 2 Jul 2012 18:03:05 -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 2091 invoked by uid 99); 2 Jul 2012 18:03:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jul 2012 18:03:05 +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; Mon, 02 Jul 2012 18:03:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 189EA2388847 for ; Mon, 2 Jul 2012 18:02:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Mon, 02 Jul 2012 18:02:43 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120702180244.189EA2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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"));