You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2013/04/25 12:20:50 UTC
svn commit: r1475689 - in /felix/trunk/scrplugin: generator/changelog.txt
generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java
maven-scr-plugin/changelog.txt scrtask/changelog.txt
Author: cziegeler
Date: Thu Apr 25 10:20:50 2013
New Revision: 1475689
URL: http://svn.apache.org/r1475689
Log:
FELIX-4035 : Issue warning messages when metatype is be created, but no properties are defined
Modified:
felix/trunk/scrplugin/generator/changelog.txt
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java
felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
felix/trunk/scrplugin/scrtask/changelog.txt
Modified: felix/trunk/scrplugin/generator/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/changelog.txt?rev=1475689&r1=1475688&r2=1475689&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/changelog.txt (original)
+++ felix/trunk/scrplugin/generator/changelog.txt Thu Apr 25 10:20:50 2013
@@ -1,7 +1,8 @@
Changes from 1.6.0 to 1.5.0
---------------------------
** Improvement
- * [FELIX-4033] - Issue warning messages for redundant SCR annotation combinations
+ * [FELIX-4033] - Issue warning messages for redundant SCR annotation combinations and an error for declaring the service.id property
+ * [FELIX-4035] - Issue warning messages when metatype is be created, but no properties are defined
** Bug
* [FELIX-4030] - Generated metatype file contains all metatype infos
* [FELIX-3542] - Escape property values used as Metatype default values
Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java?rev=1475689&r1=1475688&r2=1475689&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java (original)
+++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/Validator.java Thu Apr 25 10:20:50 2013
@@ -183,6 +183,13 @@ public class Validator {
}
}
+ // additional check for metatype (FELIX-4035)
+ if ( this.container.getMetatypeContainer() != null ) {
+ if ( this.container.getProperties().size() == 0.) {
+ this.logWarn(component, "Component is defined to generate metatype information, however no properties have been " +
+ "defined; in case no properties are wanted, consider to use 'metatype=false'");
+ }
+ }
if (iLog.getNumberOfErrors() == currentIssueCount) {
// verify references
for (final ReferenceDescription ref : this.container.getReferences().values()) {
Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1475689&r1=1475688&r2=1475689&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Thu Apr 25 10:20:50 2013
@@ -1,7 +1,8 @@
Changes from 1.12.0 to 1.11.0
-----------------------------
** Improvement
- * [FELIX-4033] - Issue warning messages for redundant SCR annotation combinations
+ * [FELIX-4033] - Issue warning messages for redundant SCR annotation combinations and an error for declaring the service.id property
+ * [FELIX-4035] - Issue warning messages when metatype is be created, but no properties are defined
** Bug
* [FELIX-4030] - Generated metatype file contains all metatype infos
* [FELIX-4023] - SCR-Plugin not working reliably in m2e 1.3.1
Modified: felix/trunk/scrplugin/scrtask/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/changelog.txt?rev=1475689&r1=1475688&r2=1475689&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/changelog.txt (original)
+++ felix/trunk/scrplugin/scrtask/changelog.txt Thu Apr 25 10:20:50 2013
@@ -1,7 +1,8 @@
Changes from 1.6.0 to 1.5.0
---------------------------
** Improvement
- * [FELIX-4033] - Issue warning messages for redundant SCR annotation combinations
+ * [FELIX-4033] - Issue warning messages for redundant SCR annotation combinations and an error for declaring the service.id property
+ * [FELIX-4035] - Issue warning messages when metatype is be created, but no properties are defined
** Bug
* [FELIX-4030] - Generated metatype file contains all metatype infos
* [FELIX-3542] - Escape property values used as Metatype default values