cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration ConfigurationBuilder.java

[donaldp]

donaldp     2002/09/06 16:37:13

  Modified:    src/java/org/apache/avalon/phoenix/tools/configuration Tag:
                        RELEASE_402-branch ConfigurationBuilder.java
  Log:
  Support DTDs located in new dtd directorys
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +16 -7     
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/ConfigurationBuilder.java
  
  Index: ConfigurationBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/ConfigurationBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ConfigurationBuilder.java 6 Aug 2002 11:57:42 -0000       1.7
  +++ ConfigurationBuilder.java 6 Sep 2002 23:37:12 -0000       1.7.2.1
  @@ -35,6 +35,15 @@
                        "org/apache/avalon/phoenix/tools/assembly.dtd" ),
           new DTDInfo( "-//PHOENIX/Mx Info DTD Version 1.0//EN",
                        "http://jakarta.apache.org/phoenix/mxinfo_1_0.dtd";,
  +                     "org/apache/avalon/phoenix/tools/mxinfo.dtd" ),
  +        new DTDInfo( "-//PHOENIX/Block Info DTD Version 1.0//EN",
  +                     
"http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1_0.dtd";,
  +                     "org/apache/avalon/phoenix/tools/blockinfo.dtd" ),
  +        new DTDInfo( "-//PHOENIX/Assembly DTD Version 1.0//EN",
  +                     
"http://jakarta.apache.org/avalon/dtds/phoenix/assembly_1_0.dtd";,
  +                     "org/apache/avalon/phoenix/tools/assembly.dtd" ),
  +        new DTDInfo( "-//PHOENIX/Mx Info DTD Version 1.0//EN",
  +                     "http://jakarta.apache.org/avalon/dtds/phoenix/mxinfo_1_0.dtd";,
                        "org/apache/avalon/phoenix/tools/mxinfo.dtd" )
       };
   
  @@ -65,17 +74,17 @@
        */
       private static void setupXMLReader( final XMLReader reader,
                                           final SAXConfigurationHandler handler,
  -                                        final boolean validate)
  +                                        final boolean validate )
           throws SAXException
       {
           reader.setEntityResolver( c_resolver );
           reader.setContentHandler( handler );
           reader.setErrorHandler( handler );
   
  -        if (validate)
  +        if( validate )
           {
               // Request validation
  -            reader.setFeature("http://xml.org/sax/features/validation";, true);
  +            reader.setFeature( "http://xml.org/sax/features/validation";, true );
           }
       }
   
  @@ -89,7 +98,7 @@
       }
   
       /**
  -     * Build a configuration object using an URI, and 
  +     * Build a configuration object using an URI, and
        * optionally validate the xml against the DTD.
        */
       public static Configuration build( final String uri, boolean validate )
  @@ -108,7 +117,7 @@
       }
   
       /**
  -     * Build a configuration object using an XML InputSource object, and 
  +     * Build a configuration object using an XML InputSource object, and
        * optionally validate the xml against the DTD.
        */
       public static Configuration build( final InputSource input, boolean validate )
  @@ -119,5 +128,5 @@
           setupXMLReader( reader, handler, validate );
           reader.parse( input );
           return handler.getConfiguration();
  -    }   
  +    }
   }
  
  
  

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