Return-Path: 
 <felix-commits-return-513-apmail-incubator-felix-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-felix-commits-archive@www.apache.org
Received: (qmail 85095 invoked from network); 14 Jul 2006 19:53:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Jul 2006 19:53:17 -0000
Received: (qmail 41259 invoked by uid 500); 14 Jul 2006 19:53:17 -0000
Delivered-To: apmail-incubator-felix-commits-archive@incubator.apache.org
Received: (qmail 41233 invoked by uid 500); 14 Jul 2006 19:53:17 -0000
Mailing-List: contact felix-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:felix-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:felix-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:felix-commits@incubator.apache.org>
List-Id: <felix-commits.incubator.apache.org>
Reply-To: felix-dev@incubator.apache.org
Delivered-To: mailing list felix-commits@incubator.apache.org
Received: (qmail 41216 invoked by uid 99); 14 Jul 2006 19:53:17 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2006 12:53:17 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jul 2006 12:53:16 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 293801A981A; Fri, 14 Jul 2006 12:52:56 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r422004 - in
 /incubator/felix/trunk/org.apache.felix.servicebinder: pom.xml
 src/main/java/org/apache/felix/servicebinder/parser/KxmlParser.java
Date: Fri, 14 Jul 2006 19:52:53 -0000
To: felix-commits@incubator.apache.org
From: rickhall@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060714195256.293801A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rickhall
Date: Fri Jul 14 12:52:53 2006
New Revision: 422004

URL: http://svn.apache.org/viewvc?rev=422004&view=rev
Log:
Patched Service Binder to use kxml2 to avoid licensing issues with
kxml1, thanks goes to Jan S. Rellermeyer. (FELIX-93)

Modified:
    incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml
    incubator/felix/trunk/org.apache.felix.servicebinder/src/main/java/org/apache/felix/servicebinder/parser/KxmlParser.java

Modified: incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml?rev=422004&r1=422003&r2=422004&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml (original)
+++ incubator/felix/trunk/org.apache.felix.servicebinder/pom.xml Fri Jul 14 12:52:53 2006
@@ -16,9 +16,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>kxml</groupId>
-      <artifactId>kxml</artifactId>
-      <version>1.21</version>
+      <groupId>kxml2</groupId>
+      <artifactId>kxml2</artifactId>
+      <version>2.2.2</version>
     </dependency>
   </dependencies>
   <build>

Modified: incubator/felix/trunk/org.apache.felix.servicebinder/src/main/java/org/apache/felix/servicebinder/parser/KxmlParser.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.servicebinder/src/main/java/org/apache/felix/servicebinder/parser/KxmlParser.java?rev=422004&r1=422003&r2=422004&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.servicebinder/src/main/java/org/apache/felix/servicebinder/parser/KxmlParser.java (original)
+++ incubator/felix/trunk/org.apache.felix.servicebinder/src/main/java/org/apache/felix/servicebinder/parser/KxmlParser.java Fri Jul 14 12:52:53 2006
@@ -17,13 +17,11 @@
 package org.apache.felix.servicebinder.parser;
 
 import org.apache.felix.servicebinder.XmlHandler;
-import org.kxml.parser.XmlParser;
-import org.kxml.parser.ParseEvent;
-import org.kxml.Xml;
-import org.kxml.Attribute;
-
+import org.kxml2.io.KXmlParser;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import java.io.IOException;
 import java.io.Reader;
-
 import java.util.Properties;
 
 /**
@@ -32,46 +30,50 @@
  *
  * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
  */
-public class KxmlParser extends XmlParser
+public class KxmlParser extends KXmlParser
 {
     /**
-    * The constructor for a parser, it receives a java.io.Reader.
-    *
-    * @param   r  The reader
-    * @exception   java.io.IOException thrown by the superclass
-    */
-    public KxmlParser(Reader r) throws java.io.IOException
+     * The constructor for a parser, it receives a java.io.Reader.
+     * 
+     * @param reader The reader
+     * @throws XmlPullParserException thrown by the super class.
+     */
+    public KxmlParser(final Reader reader) throws XmlPullParserException
     {
-        super(r);
+        super();
+        setInput(reader);
     }
 
     /**
-    * Parser from the reader provided in the constructor, and call
-    * the startElement and endElement in a KxmlHandler
-    *
-    * @param   handler The handler
-    * @exception   java.io.IOException thrown by the superclass
-    */
-    public void parseXML(XmlHandler handler) throws java.io.IOException, ParseException
+     * Parser from the reader provided in the constructor, and call the
+     * startElement and endElement in a KxmlHandler
+     * 
+     * @param handler The handler
+     * @throws XmlPullParserException thrown by the super class.
+     * @throws IOException thrown by the super class.
+     * @throws ParseException thrown by the handler.
+     */
+    public void parseXML(final XmlHandler handler)
+        throws XmlPullParserException, IOException, ParseException
     {
-        ParseEvent evt=null;
-        do
+        while (next() != XmlPullParser.END_DOCUMENT)
         {
-            evt = read();
-            if (evt.getType() == Xml.START_TAG)
-            {
-                Properties props = new Properties();
-                for (int i=0; i<evt.getAttributeCount();i++)
-                {
-                    Attribute attr = evt.getAttribute(i);
-                    props.put(attr.getName(),attr.getValue());
-                }
-                handler.startElement("uri",evt.getName(),evt.getName(),props);
-            }
-            if (evt.getType() == Xml.END_TAG)
+            switch (getEventType())
             {
-                handler.endElement("uri",evt.getName(),evt.getName());
+                case XmlPullParser.START_TAG:
+                    Properties props = new Properties();
+                    for (int i = 0; i < getAttributeCount(); i++)
+                    {
+                        props.put(getAttributeName(i), getAttributeValue(i));
+                    }
+                    handler.startElement(getNamespace(), getName(), getName(), props);
+                    break;
+                case XmlPullParser.END_TAG:
+                    handler.endElement(getNamespace(), getName(), getName());
+                    break;
+                default:
+                    continue;
             }
-        }while(evt.getType()!=Xml.END_DOCUMENT);
+        }
     }
-}
+}
\ No newline at end of file