Return-Path: 
 <commons-dev-return-66911-apmail-jakarta-commons-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org
Received: (qmail 63496 invoked from network); 30 Jan 2005 22:51:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 30 Jan 2005 22:51:36 -0000
Received: (qmail 52924 invoked by uid 500); 30 Jan 2005 22:51:35 -0000
Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org
Received: (qmail 52493 invoked by uid 500); 30 Jan 2005 22:51:34 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 52479 invoked by uid 500); 30 Jan 2005 22:51:34 -0000
Received: (qmail 52472 invoked by uid 99); 30 Jan 2005 22:51:34 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sun, 30 Jan 2005 14:51:33 -0800
Received: (qmail 63437 invoked by uid 65534); 30 Jan 2005 22:51:32 -0000
Message-ID: <20050130225132.63436.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Sun, 30 Jan 2005 22:51:32 -0000
Subject: svn commit: r149174 - in jakarta/commons/sandbox/feedparser/trunk: ./
 src/java/org/apache/commons/feedparser/ xdocs/
To: commons-cvs@jakarta.apache.org
From: burton@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: burton
Date: Sun Jan 30 14:51:30 2005
New Revision: 149174

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D149174
Log:
Support for onFeedVersion in other parsers including opml, foaf, etc

Modified:
    jakarta/commons/sandbox/feedparser/trunk/TODO
    jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/ChangesFeedParser.java
    jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/FOAFFeedParser.java
    jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/FeedVersion.java
    jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/HTMLFeedParser.java
    jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/OPMLFeedParser.java
    jakarta/commons/sandbox/feedparser/trunk/xdocs/index.xml

Modified: jakarta/commons/sandbox/feedparser/trunk/TODO
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/feedparser/trunk=
/TODO?view=3Ddiff&r1=3D149173&r2=3D149174
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/feedparser/trunk/TODO (original)
+++ jakarta/commons/sandbox/feedparser/trunk/TODO Sun Jan 30 14:51:30 2005
@@ -24,6 +24,9 @@
=20
 - (DONE) Atom GUIDs and RSS 2.0 GUIDs
=20
+- (DONE) Rework the factory mechanism to support multiple FeedParsers... s=
hould
+  be an interface.
+
 - BUG:
=20
     Make SURE that all these tests work
@@ -37,9 +40,6 @@
 - Do we support multiple content items in Atom?
=20
 - We do not support multipart/alternative in the feedparser.
-
-- Rework the factory mechanism to support multiple FeedParsers... should b=
e an
-  interface.
 =20
 - Migrate away from JDOM (slower than just using DOM/SAX)
=20

Modified: jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/comm=
ons/feedparser/ChangesFeedParser.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/feedparser/trunk=
/src/java/org/apache/commons/feedparser/ChangesFeedParser.java?view=3Ddiff&=
r1=3D149173&r2=3D149174
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/ChangesFeedParser.java (original)
+++ jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/ChangesFeedParser.java Sun Jan 30 14:51:30 2005
@@ -34,7 +34,7 @@
  * Handles parsing Blogger.com changes.xml files.
  *
  * @author <a href=3D"mailto:burton@apache.org">Kevin A. Burton (burtonato=
r)</a>
- * @version $Id: ChangesFeedParser.java,v 1.1 2004/08/31 21:00:32 burton E=
xp $
+ * @version $Id$
  */
 public class ChangesFeedParser {
=20
@@ -50,8 +50,9 @@
                =20
             FeedParserState state =3D new FeedParserState();
=20
-            //will result in an incorrect interface if the caller isn't us=
ing the
-            //system correctly.
+            FeedVersion v =3D new FeedVersion();
+            v.isChanges =3D true;
+            listener.onFeedVersion( v );
=20
             listener.init();
=20

Modified: jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/comm=
ons/feedparser/FOAFFeedParser.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/feedparser/trunk=
/src/java/org/apache/commons/feedparser/FOAFFeedParser.java?view=3Ddiff&r1=
=3D149173&r2=3D149174
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/FOAFFeedParser.java (original)
+++ jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/FOAFFeedParser.java Sun Jan 30 14:51:30 2005
@@ -28,7 +28,7 @@
  * Handles parsing FOAF.
  *
  * @author <a href=3D"mailto:burton@apache.org">Kevin A. Burton (burtonato=
r)</a>
- * @version $Id: FOAFFeedParser.java,v 1.5 2004/08/27 18:07:01 burton Exp $
+ * @version $Id$
  */
 public class FOAFFeedParser {
=20
@@ -44,8 +44,9 @@
                =20
             FeedParserState state =3D new FeedParserState();
=20
-            //will result in an incorrect interface if the caller isn't us=
ing the
-            //system correctly.
+            FeedVersion v =3D new FeedVersion();
+            v.isFOAF =3D true;
+            listener.onFeedVersion( v );
=20
             listener.init();
=20

Modified: jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/comm=
ons/feedparser/FeedVersion.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/feedparser/trunk=
/src/java/org/apache/commons/feedparser/FeedVersion.java?view=3Ddiff&r1=3D1=
49173&r2=3D149174
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/FeedVersion.java (original)
+++ jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/FeedVersion.java Sun Jan 30 14:51:30 2005
@@ -21,7 +21,7 @@
 /**
  *
  * @author <a href=3D"mailto:burton@apache.org">Kevin A. Burton (burtonato=
r)</a>
- * @version $Id: FeedVersion.java,v 1.2 2004/02/28 03:35:22 bayard Exp $
+ * @version $Id$
  */
 public class FeedVersion {
=20
@@ -35,4 +35,15 @@
      */
     public boolean isRSS;
    =20
+    public boolean isFOAF;
+
+    public boolean isOPML;
+
+    public boolean isXFN;
+
+    /**
+     * True if this is a changes.xml file.
+     */
+    public boolean isChanges;
+
 }

Modified: jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/comm=
ons/feedparser/HTMLFeedParser.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/feedparser/trunk=
/src/java/org/apache/commons/feedparser/HTMLFeedParser.java?view=3Ddiff&r1=
=3D149173&r2=3D149174
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/HTMLFeedParser.java (original)
+++ jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/HTMLFeedParser.java Sun Jan 30 14:51:30 2005
@@ -26,11 +26,11 @@
 /**
  *
  * Experimental class to play with supporting XFN.  HTML parsing in genera=
l is
- * interesting because I could start with teh AnchorParser and move to an =
HTML
+ * interesting because I could start with the AnchorParser and move to an =
HTML
  * parser but that might be too generic.
  *=20
  * @author <a href=3D"mailto:burton@apache.org">Kevin A. Burton (burtonato=
r)</a>
- * @version $Id: HTMLFeedParser.java,v 1.1 2005/01/20 09:00:37 burton Exp $
+ * @version $Id$
  */
 public class HTMLFeedParser extends BaseParser {
=20
@@ -40,6 +40,10 @@
=20
         if ( listener instanceof FeedDirectoryParserListener =3D=3D false )
             return;
+
+        //FIXME: only convert to using XFN if these types of links are det=
ected.
+        //If its just a plain XHTML file then we shouldn't use this interf=
ace.
+        //Also FeedVersion needs to be called.
        =20
         final FeedDirectoryParserListener directoryParserLisener =3D
             (FeedDirectoryParserListener)listener;

Modified: jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/comm=
ons/feedparser/OPMLFeedParser.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/feedparser/trunk=
/src/java/org/apache/commons/feedparser/OPMLFeedParser.java?view=3Ddiff&r1=
=3D149173&r2=3D149174
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/OPMLFeedParser.java (original)
+++ jakarta/commons/sandbox/feedparser/trunk/src/java/org/apache/commons/fe=
edparser/OPMLFeedParser.java Sun Jan 30 14:51:30 2005
@@ -34,7 +34,7 @@
  * Handles parsing OPML.
  *
  * @author <a href=3D"mailto:burton@apache.org">Kevin A. Burton (burtonato=
r)</a>
- * @version $Id: OPMLFeedParser.java,v 1.3 2004/06/28 19:59:47 burton Exp $
+ * @version $Id$
  */
 public class OPMLFeedParser {
=20
@@ -52,6 +52,10 @@
=20
             //will result in an incorrect interface if the caller isn't us=
ing the
             //system correctly.
+
+            FeedVersion v =3D new FeedVersion();
+            v.isOPML =3D true;
+            listener.onFeedVersion( v );
=20
             listener.init();
=20

Modified: jakarta/commons/sandbox/feedparser/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/feedparser/trunk=
/xdocs/index.xml?view=3Ddiff&r1=3D149173&r2=3D149174
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/commons/sandbox/feedparser/trunk/xdocs/index.xml (original)
+++ jakarta/commons/sandbox/feedparser/trunk/xdocs/index.xml Sun Jan 30 14:=
51:30 2005
@@ -152,8 +152,13 @@
         <section name=3D"API">
=20
             <p>
-                Developers place all their logic in a FeedParserListener w=
hich
-                receives callbacks from the FeedParser.  They then pass the
+                Developers place all their logic in a=20
+
+                <a href=3D"api/org/apache/commons/feedparser/FeedParserLis=
tener.html">
+                    FeedParserListener=20
+                </a>
+
+                whichreceives callbacks from the FeedParser.  They then pa=
ss the
                 FeedParser an InputStream and they are ready to get events:
             </p>
=20
@@ -255,18 +260,27 @@
=20
         </section>
=20
+        <section name=3D"Developers">
+
+            <dt>Kevin Burton</dt>
+            <dd>Developer and Project Lead</dd>
+
+            <dt>Brad Neuberg</dt>
+            <dd>Developer</dd>
+
+            <dt>Joseph Ottinger</dt>
+            <dd>Developer</dd>
+
+        </section>
+
         <section name=3D"Future Directions">
=20
             <p>
                 <ol>
-                    <li>
-                        Support FOAF parsing which correct RDF handling.
-                    </li>
=20
                     <li>
=20
-                        Better support for unique Atom features such as
-                        atom:summary.
+                        Support FOAF parsing with better arbitrary RDF han=
dling.
=20
                     </li>
=20



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org