You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/06/02 22:52:00 UTC

svn commit: r1130807 - in /commons/sandbox/digester3/trunk/src/examples/rss/src/main: java/org/apache/commons/digester3/rss/Channel.java java/org/apache/commons/digester3/rss/RSSDigester.java resources/org/apache/commons/digester3/rss/rss-example.xml

Author: simonetripodi
Date: Thu Jun  2 20:52:00 2011
New Revision: 1130807

URL: http://svn.apache.org/viewvc?rev=1130807&view=rev
Log:
removed DTD handling, since .dtd are missing

Modified:
    commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
    commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java
    commons/sandbox/digester3/trunk/src/examples/rss/src/main/resources/org/apache/commons/digester3/rss/rss-example.xml

Modified: commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java?rev=1130807&r1=1130806&r2=1130807&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java (original)
+++ commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/Channel.java Thu Jun  2 20:52:00 2011
@@ -511,11 +511,6 @@ public class Channel
         writer.println( "?>" );
         writer.println();
 
-        writer.println( "<!DOCTYPE rss PUBLIC" );
-        writer.println( "  \"-//Netscape Communications//DTD RSS 0.91//EN\"" );
-        writer.println( "  \"http://my.netscape.com/publish/formats/rss-0.91.dtd\">" );
-        writer.println();
-
         writer.println( "<rss version=\"0.91\">" );
         writer.println();
 

Modified: commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java?rev=1130807&r1=1130806&r2=1130807&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java (original)
+++ commons/sandbox/digester3/trunk/src/examples/rss/src/main/java/org/apache/commons/digester3/rss/RSSDigester.java Thu Jun  2 20:52:00 2011
@@ -20,7 +20,6 @@ package org.apache.commons.digester3.rss
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 
 import org.apache.commons.digester3.Digester;
 import org.apache.commons.logging.LogFactory;
@@ -55,18 +54,6 @@ public class RSSDigester
      */
     protected boolean configured = false;
 
-
-    /**
-     * The set of public identifiers, and corresponding resource names,
-     * for the versions of the DTDs that we know about.
-     */
-    protected static final String registrations[] = {
-        "-//Netscape Communications//DTD RSS 0.9//EN",
-        "/org/apache/commons/digester3/rss/rss-0.9.dtd",
-        "-//Netscape Communications//DTD RSS 0.91//EN",
-        "/org/apache/commons/digester3/rss/rss-0.91.dtd",
-    };
-
     // ------------------------------------------------------------- Properties
 
     /**
@@ -222,16 +209,6 @@ public class RSSDigester
             return;
         }
 
-        // Register local copies of the DTDs we understand
-        for ( int i = 0; i < registrations.length; i += 2 )
-        {
-            URL url = this.getClass().getResource( registrations[i + 1] );
-            if ( url != null )
-            {
-                register( registrations[i], url.toString() );
-            }
-        }
-
         // FIXME - validate the "version" attribute of the rss element?
 
         // Add the rules for the Channel object

Modified: commons/sandbox/digester3/trunk/src/examples/rss/src/main/resources/org/apache/commons/digester3/rss/rss-example.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/examples/rss/src/main/resources/org/apache/commons/digester3/rss/rss-example.xml?rev=1130807&r1=1130806&r2=1130807&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/examples/rss/src/main/resources/org/apache/commons/digester3/rss/rss-example.xml (original)
+++ commons/sandbox/digester3/trunk/src/examples/rss/src/main/resources/org/apache/commons/digester3/rss/rss-example.xml Thu Jun  2 20:52:00 2011
@@ -1,7 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE rss PUBLIC
- "-//Netscape Communications//DTD RSS 0.91//EN"
- "http://my.netscape.com/publish/formats/rss-0.91.dtd">
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with