You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2004/02/26 00:12:55 UTC

cvs commit: avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test JaxenTestCase.xtest Saxon6ExtTestCase.xtest Saxon6TestCase.xtest Saxon7TestCase.xtest XPathTestCase.xtest

leosutic    2004/02/25 15:12:54

  Modified:    xmlutil  project.xml
               xmlutil/src/java/org/apache/excalibur/xml/dom
                        DefaultDOMHandlerFactory.java
               xmlutil/src/java/org/apache/excalibur/xml/impl
                        JaxpParser.java
               xmlutil/src/test/org/apache/excalibur/xml/dom/test
                        DefaultDOMHandlerFactoryTestCase.xtest
               xmlutil/src/test/org/apache/excalibur/xml/xpath/test
                        JaxenTestCase.xtest Saxon6ExtTestCase.xtest
                        Saxon6TestCase.xtest Saxon7TestCase.xtest
                        XPathTestCase.xtest
  Log:
  Fixed dependencies and testcase bugs.
  
  Revision  Changes    Path
  1.5       +3 -3      avalon-excalibur/xmlutil/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	25 Feb 2004 21:15:47 -0000	1.4
  +++ project.xml	25 Feb 2004 23:12:54 -0000	1.5
  @@ -72,11 +72,11 @@
           </dependency>
           <dependency>
               <id>excalibur-component</id>
  -            <version>1.1</version>
  +            <version>1.2</version>
           </dependency>
           <dependency>
               <id>excalibur-pool</id>
  -            <version>1.0</version>
  +            <version>1.2</version>
           </dependency>
           <dependency>
               <id>excalibur-instrument</id>
  @@ -119,7 +119,7 @@
           <dependency>
               <!-- testing only -->
               <id>excalibur-testcase</id>
  -            <version>1.1</version>
  +            <version>1.2</version>
               <groupId>excalibur-component</groupId>
           </dependency>
           <dependency>
  
  
  
  1.4       +2 -1      avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DefaultDOMHandlerFactory.java
  
  Index: DefaultDOMHandlerFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/dom/DefaultDOMHandlerFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultDOMHandlerFactory.java	25 Feb 2004 10:33:20 -0000	1.3
  +++ DefaultDOMHandlerFactory.java	25 Feb 2004 23:12:54 -0000	1.4
  @@ -43,6 +43,7 @@
       public void initialize()
           throws Exception
       {
  +        m_documentBuilderFactory.setNamespaceAware( true );
           m_documentBuilder = m_documentBuilderFactory.newDocumentBuilder();
       }
   
  
  
  
  1.5       +4 -1      avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/impl/JaxpParser.java
  
  Index: JaxpParser.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/impl/JaxpParser.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JaxpParser.java	25 Feb 2004 10:33:20 -0000	1.4
  +++ JaxpParser.java	25 Feb 2004 23:12:54 -0000	1.5
  @@ -334,6 +334,9 @@
                   final String message = "Cannot produce a valid parser";
                   throw new SAXException( message, pce );
               }
  +            
  +            m_reader.setFeature( "http://xml.org/sax/features/namespaces", true );
  +            
               if( m_nsPrefixes )
               {
                   try
  
  
  
  1.3       +30 -30    avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/dom/test/DefaultDOMHandlerFactoryTestCase.xtest
  
  Index: DefaultDOMHandlerFactoryTestCase.xtest
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/dom/test/DefaultDOMHandlerFactoryTestCase.xtest,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultDOMHandlerFactoryTestCase.xtest	19 Feb 2004 08:28:34 -0000	1.2
  +++ DefaultDOMHandlerFactoryTestCase.xtest	25 Feb 2004 23:12:54 -0000	1.3
  @@ -16,37 +16,37 @@
    -->
   <!-- Author: by Mircea Toma (Allstar Tech) -->
   <testcase>
  -	<annotation><![CDATA[DOMHandler factory test
  +    <annotation><![CDATA[DOMHandler factory test
       ]]></annotation>
  -	<logkit>
  -		<factories>
  -			<factory type="file" class="org.apache.avalon.excalibur.logger.factory.FileTargetFactory"/>
  -		</factories>
  -		<targets>
  -			<file id="root">
  -				<filename>domhandler-factory-test.log</filename>
  -				<format type="extended">
  +    <logkit>
  +        <factories>
  +            <factory type="file" class="org.apache.avalon.excalibur.logger.factory.FileTargetFactory"/>
  +        </factories>
  +        <targets>
  +            <file id="root">
  +                <filename>domhandler-factory-test.log</filename>
  +                <format type="extended">
             %7.7{priority} %5.5{time}   [%8.8{category}] (%{context}): %{message}\n%{throwable}
           </format>
  -			</file>
  -		</targets>
  -		<categories>
  -			<category name="test" log-level="INFO">
  -				<log-target id-ref="root"/>
  -			</category>
  -			<category name="" log-level="INFO">
  -				<log-target id-ref="root"/>
  -			</category>
  -		</categories>
  -	</logkit>
  -	<roles>
  -		<role name="org.apache.excalibur.xml.dom.DOMHandlerFactory" shorthand="domhandler-factory" default-class="org.apache.excalibur.xml.dom.DefaultDOMHandlerFactory"/>
  -		<role name="org.apache.excalibur.xml.sax.SAXParser" shorthand="parser" default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
  -	</roles>
  -	<components>
  -		<parser logger="test">
  -			<parameter name="namespace-prefixes" value="false"/>
  -		</parser>
  -		<domhandler-factory logger="test"/>
  -	</components>
  +            </file>
  +        </targets>
  +        <categories>
  +            <category name="test" log-level="INFO">
  +                <log-target id-ref="root"/>
  +            </category>
  +            <category name="" log-level="INFO">
  +                <log-target id-ref="root"/>
  +            </category>
  +        </categories>
  +    </logkit>
  +    <roles>
  +        <role name="org.apache.excalibur.xml.dom.DOMHandlerFactory" shorthand="domhandler-factory" default-class="org.apache.excalibur.xml.dom.DefaultDOMHandlerFactory"/>
  +        <role name="org.apache.excalibur.xml.sax.SAXParser" shorthand="parser" default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
  +    </roles>
  +    <components>
  +        <parser logger="test">
  +            <parameter name="namespace-prefixes" value="false"/>
  +        </parser>
  +        <domhandler-factory logger="test"/>
  +    </components>
   </testcase>
  
  
  
  1.3       +2 -1      avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/JaxenTestCase.xtest
  
  Index: JaxenTestCase.xtest
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/JaxenTestCase.xtest,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JaxenTestCase.xtest	19 Feb 2004 08:28:32 -0000	1.2
  +++ JaxenTestCase.xtest	25 Feb 2004 23:12:54 -0000	1.3
  @@ -1,3 +1,4 @@
  +<?xml version="1.0"?>
   <!-- 
    Copyright 2002-2004 Apache Software Foundation
    Licensed  under the  Apache License,  Version 2.0  (the "License");
  @@ -14,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
    -->
  -<?xml version="1.0"?>
  +
   
   <testcase>
       <annotation>JaxenProcessor test case</annotation>
  
  
  
  1.3       +1 -1      avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/Saxon6ExtTestCase.xtest
  
  Index: Saxon6ExtTestCase.xtest
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/Saxon6ExtTestCase.xtest,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Saxon6ExtTestCase.xtest	19 Feb 2004 08:28:32 -0000	1.2
  +++ Saxon6ExtTestCase.xtest	25 Feb 2004 23:12:54 -0000	1.3
  @@ -1,3 +1,4 @@
  +<?xml version="1.0"?>
   <!-- 
    Copyright 2002-2004 Apache Software Foundation
    Licensed  under the  Apache License,  Version 2.0  (the "License");
  @@ -14,7 +15,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
    -->
  -<?xml version="1.0"?>
   
   <testcase>
       <annotation>Saxon6ExtProcessor test case</annotation>
  
  
  
  1.3       +1 -1      avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/Saxon6TestCase.xtest
  
  Index: Saxon6TestCase.xtest
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/Saxon6TestCase.xtest,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Saxon6TestCase.xtest	19 Feb 2004 08:28:32 -0000	1.2
  +++ Saxon6TestCase.xtest	25 Feb 2004 23:12:54 -0000	1.3
  @@ -1,3 +1,4 @@
  +<?xml version="1.0"?>
   <!-- 
    Copyright 2002-2004 Apache Software Foundation
    Licensed  under the  Apache License,  Version 2.0  (the "License");
  @@ -14,7 +15,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
    -->
  -<?xml version="1.0"?>
   
   <testcase>
       <annotation>Saxon6Processor test case</annotation>
  
  
  
  1.3       +1 -1      avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/Saxon7TestCase.xtest
  
  Index: Saxon7TestCase.xtest
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/Saxon7TestCase.xtest,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Saxon7TestCase.xtest	19 Feb 2004 08:28:32 -0000	1.2
  +++ Saxon7TestCase.xtest	25 Feb 2004 23:12:54 -0000	1.3
  @@ -1,3 +1,4 @@
  +<?xml version="1.0"?>
   <!-- 
    Copyright 2002-2004 Apache Software Foundation
    Licensed  under the  Apache License,  Version 2.0  (the "License");
  @@ -14,7 +15,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
    -->
  -<?xml version="1.0"?>
   
   <testcase>
       <annotation>Saxon7Processor test case</annotation>
  
  
  
  1.3       +1 -1      avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/XPathTestCase.xtest
  
  Index: XPathTestCase.xtest
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/src/test/org/apache/excalibur/xml/xpath/test/XPathTestCase.xtest,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XPathTestCase.xtest	19 Feb 2004 08:28:32 -0000	1.2
  +++ XPathTestCase.xtest	25 Feb 2004 23:12:54 -0000	1.3
  @@ -1,3 +1,4 @@
  +<?xml version="1.0"?>
   <!-- 
    Copyright 2002-2004 Apache Software Foundation
    Licensed  under the  Apache License,  Version 2.0  (the "License");
  @@ -14,7 +15,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
    -->
  -<?xml version="1.0"?>
   
   <testcase>
       <annotation>XPathProcessor test case</annotation>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org