xmlgraphics-batik-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hill...@apache.org
Subject cvs commit: xml-batik/test-sources/org/apache/batik/test/xml XMLTestSuiteLoader.java XMLTestSuiteRunner.java XMLTestSuiteRunnerValidator.java
Date Tue, 06 Nov 2001 15:04:52 GMT
hillion     01/11/06 07:04:52

  Modified:    resources/org/apache/batik/apps/rasterizer/resources
                        Messages.properties
               sources/org/apache/batik/apps/rasterizer SVGConverter.java
               sources/org/apache/batik/swing/svg JSVGComponent.java
               test-resources/org/apache/batik/test/svg/resources
                        Configuration.properties
               test-resources/org/apache/batik/test/xml/resources
                        Messages.properties
               test-sources/org/apache/batik/apps/rasterizer
                        SVGConverterTest.java
               test-sources/org/apache/batik/dom SetAttributeTest.java
               test-sources/org/apache/batik/test/svg
                        SVGRenderingAccuracyTest.java
               test-sources/org/apache/batik/test/xml
                        XMLTestSuiteLoader.java XMLTestSuiteRunner.java
                        XMLTestSuiteRunnerValidator.java
  Log:
  Removed explicit references to crimson.
  
  Revision  Changes    Path
  1.4       +0 -3      xml-batik/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties
  
  Index: Messages.properties
  ===================================================================
  RCS file: /home/cvs/xml-batik/resources/org/apache/batik/apps/rasterizer/resources/Messages.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Messages.properties	2001/10/31 09:54:25	1.3
  +++ Messages.properties	2001/11/06 15:04:51	1.4
  @@ -60,9 +60,6 @@
   Error. Invalid area of interest. Start y is after end y. \
   The value was: {0}
   
  -SVGConverter.config.xml.parser.class.name = \
  -org.apache.crimson.parser.XMLReaderImpl
  -
   
   Main.usage = \
   SVG Rasterizer options are: \n \
  
  
  
  1.6       +1 -11     xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverter.java
  
  Index: SVGConverter.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/rasterizer/SVGConverter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGConverter.java	2001/10/31 09:54:25	1.5
  +++ SVGConverter.java	2001/11/06 15:04:51	1.6
  @@ -80,7 +80,7 @@
    * <li>pixelToMillimeter: defines the size of a pixel when processing the SVG documents.</li>
    * </ul>
    *
  - * @version $Id: SVGConverter.java,v 1.5 2001/10/31 09:54:25 vhardy Exp $
  + * @version $Id: SVGConverter.java,v 1.6 2001/11/06 15:04:51 hillion Exp $
    * @author Henri Ruini
    * @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
    */
  @@ -168,12 +168,6 @@
           = "SVGConverter.error.while.rasterizing.file";
   
       //
  -    // Configuration
  -    //
  -    public static final String CONFIG_XML_PARSER_CLASS_NAME
  -        = "SVGConverter.config.xml.parser.class.name";
  -
  -    //
       // Class variables and constants 
       //
   
  @@ -662,10 +656,6 @@
           if (area != null) {
               map.put(ImageTranscoder.KEY_AOI, area);           
           }
  -
  -        // Set parser. -------------------------------------------------------
  -        map.put(ImageTranscoder.KEY_XML_PARSER_CLASSNAME, 
  -                Messages.formatMessage(CONFIG_XML_PARSER_CLASS_NAME, null));
   
           // Set image quality. ------------------------------------------------
           if (quality > 0) {
  
  
  
  1.29      +3 -2      xml-batik/sources/org/apache/batik/swing/svg/JSVGComponent.java
  
  Index: JSVGComponent.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/svg/JSVGComponent.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JSVGComponent.java	2001/10/24 14:52:36	1.28
  +++ JSVGComponent.java	2001/11/06 15:04:51	1.29
  @@ -51,6 +51,7 @@
   import org.apache.batik.swing.gvt.JGVTComponent;
   
   import org.apache.batik.util.SVGConstants;
  +import org.apache.batik.util.XMLResourceDescriptor;
   
   import org.w3c.dom.Element;
   
  @@ -152,7 +153,7 @@
    * building/rendering a document (invalid XML file, missing attributes...).</p>
    *
    * @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
  - * @version $Id: JSVGComponent.java,v 1.28 2001/10/24 14:52:36 tkormann Exp $
  + * @version $Id: JSVGComponent.java,v 1.29 2001/11/06 15:04:51 hillion Exp $
    */
   public class JSVGComponent extends JGVTComponent {
   
  @@ -907,7 +908,7 @@
               if (svgUserAgent != null) {
                   return svgUserAgent.getXMLParserClassName();
               }
  -            return "org.apache.crimson.parser.XMLReaderImpl";
  +            return XMLResourceDescriptor.getXMLParserClassName();
           }
   
   	/**
  
  
  
  1.2       +0 -4      xml-batik/test-resources/org/apache/batik/test/svg/resources/Configuration.properties
  
  Index: Configuration.properties
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-resources/org/apache/batik/test/svg/resources/Configuration.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Configuration.properties	2001/04/10 22:04:55	1.1
  +++ Configuration.properties	2001/11/06 15:04:51	1.2
  @@ -6,10 +6,6 @@
   # the LICENSE file.                                                         #
   #############################################################################
   
  -# The XML parser class name.
  -
  -org.xml.sax.driver = org.apache.crimson.parser.XMLReaderImpl
  -
   # Prefix for temp files
   temp.file.prefix = SVGRenderingAccuracyTest
   
  
  
  
  1.7       +0 -7      xml-batik/test-resources/org/apache/batik/test/xml/resources/Messages.properties
  
  Index: Messages.properties
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-resources/org/apache/batik/test/xml/resources/Messages.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Messages.properties	2001/10/08 11:37:46	1.6
  +++ Messages.properties	2001/11/06 15:04:51	1.7
  @@ -49,10 +49,3 @@
   
   XMLTestSuiteRunner.messages.error.running.test.suite = \
   Error while running test suite : {0}
  -
  -#
  -# Config: XML Parser
  -#
  -XMLTestSuiteRunner.config.xml.parser = \
  -org.apache.crimson.parser.XMLReaderImpl
  -
  
  
  
  1.10      +1 -11     xml-batik/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java
  
  Index: SVGConverterTest.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SVGConverterTest.java	2001/10/31 09:54:26	1.9
  +++ SVGConverterTest.java	2001/11/06 15:04:51	1.10
  @@ -24,7 +24,7 @@
    * of source and destination sources.
    *
    * @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
  - * @version $Id: SVGConverterTest.java,v 1.9 2001/10/31 09:54:26 vhardy Exp $
  + * @version $Id: SVGConverterTest.java,v 1.10 2001/11/06 15:04:51 hillion Exp $
    */
   public class SVGConverterTest extends DefaultTestSuite {
       public SVGConverterTest(){
  @@ -681,7 +681,6 @@
   class TranscoderConfigTest extends AbstractConfigTest {
       static final String SOURCE_FILE = "samples/anne.svg";
       static final String DEST_FILE_NAME = "samples/anne";
  -    static final String XML_PARSER = "org.apache.crimson.parser.XMLReaderImpl";
   
       protected DestinationType dstType;
       /**
  @@ -705,7 +704,6 @@
           config.dest = dest;
   
           HashMap hints = new HashMap();
  -        hints.put(ImageTranscoder.KEY_XML_PARSER_CLASSNAME, XML_PARSER);
           config.hints = hints;
                     
           setExpectedConfig(config);
  @@ -725,13 +723,10 @@
   /**
    * Provides a simple string array constructor which allows the user to 
    * create a test checking for a specific hint configuration.
  - * The KEY_XML_PARSER_CLASSNAME  hint is always added to the list
  - * passed to the test.
    */
   class HintsConfigTest extends AbstractConfigTest {
       static final String SOURCE_FILE = "samples/anne.svg";
       static final String DEST_FILE_NAME = "samples/anne";
  -    static final String XML_PARSER = "org.apache.crimson.parser.XMLReaderImpl";
       static final Class EXPECTED_TRANSCODER_CLASS = org.apache.batik.transcoder.image.PNGTranscoder.class;
       static final DestinationType DST_TYPE = DestinationType.PNG;
   
  @@ -750,7 +745,6 @@
           config.dest = dest;
   
           HashMap hints = new HashMap();
  -        hints.put(ImageTranscoder.KEY_XML_PARSER_CLASSNAME, XML_PARSER);
   
           //
           // Add hints from constructor argument
  @@ -787,7 +781,6 @@
    * which ommit the ".svg" extension.
    */
   class SourcesConfigTest extends AbstractConfigTest {
  -    static final String XML_PARSER = "org.apache.crimson.parser.XMLReaderImpl";
       static final Class EXPECTED_TRANSCODER_CLASS = org.apache.batik.transcoder.image.PNGTranscoder.class;
       static final DestinationType DST_TYPE = DestinationType.PNG;
       static final String SVG_EXTENSION = ".svg";
  @@ -808,7 +801,6 @@
           config.dest = dest;
   
           HashMap hints = new HashMap();
  -        hints.put(ImageTranscoder.KEY_XML_PARSER_CLASSNAME, XML_PARSER);
           config.hints = hints;
                     
           setExpectedConfig(config);
  @@ -834,7 +826,6 @@
    * content.
    */
   class DestConfigTest extends AbstractConfigTest {
  -    static final String XML_PARSER = "org.apache.crimson.parser.XMLReaderImpl";
       static final Class EXPECTED_TRANSCODER_CLASS = org.apache.batik.transcoder.image.PNGTranscoder.class;
       static final DestinationType DST_TYPE = DestinationType.PNG;
       String[] sourcesStrings;
  @@ -860,7 +851,6 @@
           config.dest = dest;
   
           HashMap hints = new HashMap();
  -        hints.put(ImageTranscoder.KEY_XML_PARSER_CLASSNAME, XML_PARSER);
           config.hints = hints;
                     
           setExpectedConfig(config);
  
  
  
  1.2       +3 -2      xml-batik/test-sources/org/apache/batik/dom/SetAttributeTest.java
  
  Index: SetAttributeTest.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-sources/org/apache/batik/dom/SetAttributeTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetAttributeTest.java	2001/10/05 13:14:06	1.1
  +++ SetAttributeTest.java	2001/11/06 15:04:51	1.2
  @@ -13,12 +13,13 @@
   import java.io.*;
   import java.net.*;
   import org.apache.batik.dom.util.*;
  +import org.apache.batik.util.*;
   
   import org.apache.batik.test.*;
   
   /**
    * @author <a href="mailto:shillion@ilog.fr">Stephane Hillion</a>
  - * @version $Id: SetAttributeTest.java,v 1.1 2001/10/05 13:14:06 vhardy Exp $
  + * @version $Id: SetAttributeTest.java,v 1.2 2001/11/06 15:04:51 hillion Exp $
    */
   public class SetAttributeTest extends AbstractTest {
       protected String testFileName;
  @@ -27,7 +28,7 @@
       protected String targetAttribute;
       protected String targetValue;
   
  -    protected String parserClassName = "org.apache.crimson.pars                ";
  +    protected String parserClassName = XMLResourceDescriptor.getXMLParserClassName();
   
       public static String ERROR_GET_ELEMENT_BY_ID_FAILED 
           = "error.get.element.by.id.failed";
  
  
  
  1.21      +1 -9      xml-batik/test-sources/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java
  
  Index: SVGRenderingAccuracyTest.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-sources/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- SVGRenderingAccuracyTest.java	2001/11/02 15:03:46	1.20
  +++ SVGRenderingAccuracyTest.java	2001/11/06 15:04:51	1.21
  @@ -64,7 +64,7 @@
    * all pixel values are the same).
    *
    * @author <a href="mailto:vhardy@apache.lorg">Vincent Hardy</a>
  - * @version $Id: SVGRenderingAccuracyTest.java,v 1.20 2001/11/02 15:03:46 vhardy Exp $
  + * @version $Id: SVGRenderingAccuracyTest.java,v 1.21 2001/11/06 15:04:51 hillion Exp $
    */
   public class SVGRenderingAccuracyTest extends AbstractTest {
       /**
  @@ -220,12 +220,6 @@
           = configuration.getString("temp.file.suffix");
   
       /**
  -     * Parser class name
  -     */
  -    public static final String PARSER_CLASS_NAME 
  -        = configuration.getString("org.xml.sax.driver");
  -
  -    /**
        * The URL where the SVG can be found.
        */
       protected URL svgURL;
  @@ -883,8 +877,6 @@
        */
       public ImageTranscoder getTestImageTranscoder(){
           ImageTranscoder t = new InternalPNGTranscoder();
  -        t.addTranscodingHint(PNGTranscoder.KEY_XML_PARSER_CLASSNAME,
  -                             PARSER_CLASS_NAME);
           t.addTranscodingHint(PNGTranscoder.KEY_FORCE_TRANSPARENT_WHITE,
                                new Boolean(false));
           t.addTranscodingHint(PNGTranscoder.KEY_BACKGROUND_COLOR,
  
  
  
  1.5       +4 -7      xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteLoader.java
  
  Index: XMLTestSuiteLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLTestSuiteLoader.java	2001/10/16 10:38:10	1.4
  +++ XMLTestSuiteLoader.java	2001/11/06 15:04:52	1.5
  @@ -31,6 +31,8 @@
   import org.apache.batik.dom.util.SAXDocumentFactory;
   import org.apache.batik.dom.svg.SVGDOMImplementation;
   
  +import org.apache.batik.util.XMLResourceDescriptor;
  +
   import org.xml.sax.InputSource;
   
   import org.w3c.dom.Element;
  @@ -43,14 +45,9 @@
    * into a <tt>TestSuite</tt> object.
    *
    * @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
  - * @version $Id: XMLTestSuiteLoader.java,v 1.4 2001/10/16 10:38:10 vhardy Exp $
  + * @version $Id: XMLTestSuiteLoader.java,v 1.5 2001/11/06 15:04:52 hillion Exp $
    */
   public class XMLTestSuiteLoader implements XTSConstants {
  -    /**
  -     * Configuration parameter. Use same parser as XMLTestSuiteRunner
  -     */
  -    public static final String XML_PARSER = 
  -        "XMLTestSuiteRunner.config.xml.parser";
   
       /**
        * An error happened while loading a test suite document.
  @@ -91,7 +88,7 @@
           throws TestException{
           DocumentFactory df 
               = new SAXDocumentFactory(SVGDOMImplementation.getDOMImplementation(), 
  -                                     Messages.formatMessage(XML_PARSER, null));
  +                                     XMLResourceDescriptor.getXMLParserClassName());
   
           Document doc = null;
   
  
  
  
  1.9       +4 -8      xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteRunner.java
  
  Index: XMLTestSuiteRunner.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteRunner.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XMLTestSuiteRunner.java	2001/10/04 08:25:37	1.8
  +++ XMLTestSuiteRunner.java	2001/11/06 15:04:52	1.9
  @@ -35,6 +35,8 @@
   import org.apache.batik.dom.util.SAXDocumentFactory;
   import org.apache.batik.dom.svg.SVGDOMImplementation;
   
  +import org.apache.batik.util.XMLResourceDescriptor;
  +
   import org.xml.sax.InputSource;
   
   import org.w3c.dom.Element;
  @@ -58,7 +60,7 @@
    * generated by the various <tt>TestSuites</tt>.<br />
    * 
    * @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
  - * @version $Id: XMLTestSuiteRunner.java,v 1.8 2001/10/04 08:25:37 vhardy Exp $
  + * @version $Id: XMLTestSuiteRunner.java,v 1.9 2001/11/06 15:04:52 hillion Exp $
    */
   public class XMLTestSuiteRunner implements XTRunConstants, XTSConstants{
       /**
  @@ -496,12 +498,6 @@
       public static final String ERROR_RUNNING_TEST_SUITE 
           = "XMLTestSuiteRunner.messages.error.running.test.suite";
   
  -    /**
  -     * Configuration parameter
  -     */
  -    public static final String XML_PARSER = 
  -        "XMLTestSuiteRunner.config.xml.parser";
  -
       public static void main(String[] args) {
           if(args.length < 1){
               System.err.println(Messages.formatMessage(USAGE, null));
  @@ -538,7 +534,7 @@
   
           DocumentFactory df 
               = new SAXDocumentFactory(SVGDOMImplementation.getDOMImplementation(), 
  -                                     Messages.formatMessage(XML_PARSER, null));
  +                                     XMLResourceDescriptor.getXMLParserClassName());
   
           Document doc = null;
   
  
  
  
  1.3       +4 -2      xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteRunnerValidator.java
  
  Index: XMLTestSuiteRunnerValidator.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/test-sources/org/apache/batik/test/xml/XMLTestSuiteRunnerValidator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLTestSuiteRunnerValidator.java	2001/10/15 11:21:44	1.2
  +++ XMLTestSuiteRunnerValidator.java	2001/11/06 15:04:52	1.3
  @@ -30,6 +30,8 @@
   import org.apache.batik.dom.util.SAXDocumentFactory;
   import org.apache.batik.dom.svg.SVGDOMImplementation;
   
  +import org.apache.batik.util.XMLResourceDescriptor;
  +
   /**
    * Validates the operation of the <tt>XMLTestSuireRunner</tt> by checking
    * that it runs the tests specified by the command line parameter and 
  @@ -57,7 +59,7 @@
    * where all the leaf test pass. <br />
    *
    * @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
  - * @version $Id: XMLTestSuiteRunnerValidator.java,v 1.2 2001/10/15 11:21:44 vhardy Exp
$
  + * @version $Id: XMLTestSuiteRunnerValidator.java,v 1.3 2001/11/06 15:04:52 hillion Exp
$
    */
   public class XMLTestSuiteRunnerValidator extends DefaultTestSuite {
       public static final String ERROR_TEST_NOT_RUN
  @@ -294,7 +296,7 @@
           protected Document loadDummyTestRun() throws Exception{
               DocumentFactory df 
                   = new SAXDocumentFactory(SVGDOMImplementation.getDOMImplementation(), 
  -                                         Messages.formatMessage(XMLTestSuiteRunner.XML_PARSER,
null));
  +                                         XMLResourceDescriptor.getXMLParserClassName());
               
               URL url = (new File(XMLTestSuiteRunnerValidator.dummyTestRun)).toURL();
               return df.createDocument(null,
  
  
  

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


Mime
View raw message