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/23 11:37:52 UTC
svn commit: r1470863 - in /felix/trunk/scrplugin: generator/changelog.txt
generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
maven-scr-plugin/changelog.txt scrtask/changelog.txt
Author: cziegeler
Date: Tue Apr 23 09:37:52 2013
New Revision: 1470863
URL: http://svn.apache.org/r1470863
Log:
FELIX-4030 - Generated metatype file contains all metatype infos
Modified:
felix/trunk/scrplugin/generator/changelog.txt
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.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=1470863&r1=1470862&r2=1470863&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/changelog.txt (original)
+++ felix/trunk/scrplugin/generator/changelog.txt Tue Apr 23 09:37:52 2013
@@ -1,3 +1,8 @@
+Changes from 1.6.0 to 1.5.0
+---------------------------
+** Bug
+ * [FELIX-4030] - Generated metatype file contains all metatype infos
+
Changes from 1.5.0 to 1.4.0
----------------------------
** Bug
Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java?rev=1470863&r1=1470862&r2=1470863&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java (original)
+++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java Tue Apr 23 09:37:52 2013
@@ -168,7 +168,7 @@ public class MetaTypeIO {
contentHandler.startElement(namespace, METADATA_ELEMENT, METADATA_ELEMENT_QNAME, ai);
IOUtils.newline(contentHandler);
- for(final ComponentContainer comp : metaData.getComponents()) {
+ for(final ComponentContainer comp : components) {
if ( comp.getMetatypeContainer() != null ) {
generateOCDXML(comp.getMetatypeContainer(), contentHandler);
generateDesignateXML(comp.getMetatypeContainer(), contentHandler);
Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1470863&r1=1470862&r2=1470863&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Tue Apr 23 09:37:52 2013
@@ -1,7 +1,8 @@
Changes from 1.12.0 to 1.11.0
-----------------------------
** Bug
- * [FELIX-4023] - SCR-Plugin not working reliably in m2e 1.3.1
+ * [FELIX-4030] - Generated metatype file contains all metatype infos
+ * [FELIX-4023] - SCR-Plugin not working reliably in m2e 1.3.1
Changes from 1.11.0 to 1.10.0
Modified: felix/trunk/scrplugin/scrtask/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/changelog.txt?rev=1470863&r1=1470862&r2=1470863&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/changelog.txt (original)
+++ felix/trunk/scrplugin/scrtask/changelog.txt Tue Apr 23 09:37:52 2013
@@ -1,3 +1,8 @@
+Changes from 1.6.0 to 1.5.0
+---------------------------
+** Bug
+ * [FELIX-4030] - Generated metatype file contains all metatype infos
+
Changes from 1.5.0 to 1.4.0
----------------------------
** Bug