commit bdc1375ae6641ac27f4015b503184f4c8c65eab8
author Guillaume Nodet <gnodet@apache.org> Thu Mar 25 08:21:15 2010 +0000
committer Guillaume Nodet <gnodet@apache.org> Thu Mar 25 08:21:15 2010 +0000
tree 528831f9d89f4ce8e351db245c93483f97368c11
parent 9337c34237c52652e9628e8c0a5254f6b3f3717e

[bundleplugin] fix parsing of the obr.xml file

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@927300 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java
index 0d9f719..6c9fe01 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java
@@ -192,36 +192,6 @@
         {
             m_logger.info( "Adding " + m_obrXml );
 
-            try
-            {
-                KXmlParser kxp = new KXmlParser();
-                kxp.setInput(new FileInputStream(new File(m_obrXml)), null);
-                PullParser parser = new PullParser();
-                for (int event = kxp.nextTag(); event != XmlPullParser.START_TAG; event = kxp.nextTag())
-                {
-                    if (RepositoryParser.CATEGORY.equals(kxp.getName()))
-                    {
-                        m_resourceBundle.addCategory(parser.parseCategory(kxp));
-                    }
-                    else if (RepositoryParser.REQUIRE.equals(kxp.getName()))
-                    {
-                        m_resourceBundle.addRequire(parser.parseRequire(kxp));
-                    }
-                    else if (RepositoryParser.CAPABILITY.equals(kxp.getName()))
-                    {
-                        m_resourceBundle.addCapability(parser.parseCapability(kxp));
-                    }
-                    else
-                    {
-                        parser.ignoreTag(kxp);
-                    }
-                }
-
-            }
-            catch (Exception e)
-            {
-                throw new MojoExecutionException("Unable to parse obr xml: " + m_obrXml, e);
-            }
             // URL url = getClass().getResource("/SchemaObr.xsd");
             // TODO validate obr.xml file
 
@@ -339,7 +309,8 @@
             {
                 KXmlParser kxp = new KXmlParser();
                 kxp.setInput(is, null);
-                kxp.nextTag();
+                kxp.nextTag(); // skip top level element
+                kxp.nextTag(); // go to first child element
                 parseObrXml(kxp);
             }
             finally