cvs commit: avalon-sandbox/meta/src/java/org/apache/avalon/meta ConfigurationBuilder.java

[mcconnell]

mcconnell    2003/02/23 06:01:14

  Modified:    meta/src/java/org/apache/avalon/meta
                        ConfigurationBuilder.java
  Log:
  Updated DTD urls to reference avalon.apache.org.
  
  Revision  Changes    Path
  1.3       +16 -7     
avalon-sandbox/meta/src/java/org/apache/avalon/meta/ConfigurationBuilder.java
  
  Index: ConfigurationBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/ConfigurationBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfigurationBuilder.java 7 Feb 2003 15:39:50 -0000       1.2
  +++ ConfigurationBuilder.java 23 Feb 2003 14:01:14 -0000      1.3
  @@ -51,6 +51,7 @@
   package org.apache.avalon.meta;
   
   import java.io.IOException;
  +import java.net.MalformedURLException;
   import javax.xml.parsers.ParserConfigurationException;
   import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.SAXParserFactory;
  @@ -64,7 +65,6 @@
    * Utility class used to load Configuration trees from XML files.
    *
    * @author <a href="mailto:dev@avalon.apache.org";>Avalon Development Team</a>
  - * @author <a href="mailto:dev@avalon.apache.org";>Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
   public class ConfigurationBuilder
  @@ -72,16 +72,16 @@
       private static final DTDInfo[] DTD_INFO = new DTDInfo[]
       {
           new DTDInfo( "-//AVALON/Component Type DTD Version 1.0//EN",
  -                     
"http://jakarta.apache.org/avalon/dtds/meta/type_1_0.dtd";,
  +                     "http://avalon.apache.org/dtds/meta/type_1_0.dtd";,
                        "org/apache/avalon/meta/type.dtd" ),
           new DTDInfo( "-//AVALON/Component Type DTD Version 1.1//EN",
  -                     
"http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd";,
  +                     "http://avalon.apache.org/dtds/meta/type_1_1.dtd";,
                        "org/apache/avalon/meta/type.dtd" ),
           new DTDInfo( "-//AVALON/Service DTD Version 1.0//EN",
  -                     
"http://jakarta.apache.org/avalon/dtds/meta/service_1_0.dtd";,
  +                     "http://avalon.apache.org/dtds/meta/service_1_0.dtd";,
                        "org/apache/avalon/meta/service.dtd" ),
           new DTDInfo( "-//PHOENIX/Block Info DTD Version 1.0//EN",
  -                     
"http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1.0.dtd";,
  +                     
"http://avalon.apache.org/dtds/phoenix/blockinfo_1.0.dtd";,
                        "org/apache/avalon/meta/blockinfo.dtd" ),
       };
   
  @@ -130,7 +130,16 @@
       public static Configuration build( final String uri )
           throws SAXException, ParserConfigurationException, IOException
       {
  -        return build( new InputSource( uri ) );
  +        try
  +        {
  +            return build( new InputSource( uri ) );
  +        }
  +        catch( MalformedURLException mue )
  +        {
  +            final String error = 
  +              "Invalid input source uri: " + uri;
  +            throw new IOException( error );
  +        }
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]