avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test ecm.roles ecm.xconf fortress.roles xfcTestCase.java
Date Wed, 22 Jan 2003 04:38:54 GMT
jefft       2003/01/21 20:38:54

  Modified:    fortress/src/java/org/apache/excalibur/fortress/role
                        ExcaliburRoleManager.java
               fortress/src/test/org/apache/excalibur/fortress/test
                        ContainerProfile.java ContainerProfile.roles
                        ContainerProfile.xconf
               fortress/src/test/org/apache/excalibur/fortress/util/test
                        ConfigurableRoleManagerTestCase.java
                        ExcaliburRoleManagerTestCase.java
               xfc/src/test/org/apache/excalibur/xfc/test ecm.roles
                        ecm.xconf fortress.roles xfcTestCase.java
  Log:
  Reflect two changes in xmlutil:
   - o.a.avalon.excalibur.xml  ->  o.a.excalibur.xml
   - Rename of o.a.e.xml.sax.Parser to o.a.e.xml.sax.SAXParser
  
  Revision  Changes    Path
  1.5       +9 -9      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/role/ExcaliburRoleManager.java
  
  Index: ExcaliburRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/role/ExcaliburRoleManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExcaliburRoleManager.java	9 Jan 2003 12:53:25 -0000	1.4
  +++ ExcaliburRoleManager.java	22 Jan 2003 04:38:53 -0000	1.5
  @@ -141,12 +141,12 @@
   
           /* Set up XPath relations */
           addRole( "xalan-xpath",
  -                 "org.apache.avalon.excalibur.xml.xpath.XPathProcessor",
  -                 "org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl",
  +                 "org.apache.excalibur.xml.xpath.XPathProcessor",
  +                 "org.apache.excalibur.xml.xpath.XPathProcessorImpl",
                    "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
           addRole( "jaxpath",
  -                 "org.apache.avalon.excalibur.xml.xpath.XPathProcessor",
  -                 "org.apache.avalon.excalibur.xml.xpath.JaxenProcessorImpl",
  +                 "org.apache.excalibur.xml.xpath.XPathProcessor",
  +                 "org.apache.excalibur.xml.xpath.JaxenProcessorImpl",
                    "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
   
           /* Set up SourceResolver relations */
  @@ -157,12 +157,12 @@
   
           /* Set up XML parser relations */
           addRole( "parser",
  -                 "org.apache.avalon.excalibur.xml.Parser",
  -                 "org.apache.avalon.excalibur.xml.JaxpParser",
  +                 "org.apache.excalibur.xml.dom.DOMParser",
  +                 "org.apache.excalibur.xml.impl.JaxpParser",
                    "org.apache.excalibur.fortress.handler.PerThreadComponentHandler" );
           addRole( "xerces-parser",
  -                 "org.apache.avalon.excalibur.xml.Parser",
  -                 "org.apache.avalon.excalibur.xml.XercesParser",
  +                 "org.apache.excalibur.xml.dom.DOMParser",
  +                 "org.apache.excalibur.xml.impl.XercesParser",
                    "org.apache.excalibur.fortress.handler.FactoryComponentHandler" );
       }
   }
  
  
  
  1.34      +5 -5      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java
  
  Index: ContainerProfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ContainerProfile.java	10 Nov 2002 16:18:23 -0000	1.33
  +++ ContainerProfile.java	22 Jan 2003 04:38:53 -0000	1.34
  @@ -57,7 +57,7 @@
   import org.apache.avalon.excalibur.monitor.Monitor;
   import org.apache.avalon.excalibur.testcase.CascadingAssertionFailedError;
   import org.apache.avalon.excalibur.testcase.LatchedThreadGroup;
  -import org.apache.avalon.excalibur.xml.Parser;
  +import org.apache.excalibur.xml.dom.DOMParser;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
   import org.apache.avalon.framework.container.ContainerUtil;
  @@ -367,11 +367,11 @@
               final int loops = ( TEST_SIZE / THREADS );
               for( int i = 0; i < loops; i++ )
               {
  -                Parser parser = null;
  +                DOMParser parser = null;
   
                   try
                   {
  -                    parser = (Parser)m_manager.lookup( Parser.ROLE );
  +                    parser = (DOMParser)m_manager.lookup( DOMParser.ROLE );
   
                       // Make the loops hold the components longer than they are released,
but only slightly.
                       Thread.yield();
  @@ -379,7 +379,7 @@
                   catch( Throwable t )
                   {
                       m_logger.error( "Unexpected error after " + m_getCount +
  -                                    " iterations retrieved for Parser", t );
  +                                    " iterations retrieved for DOMParser", t );
   
                       if( m_throwable == null )
                       {
  
  
  
  1.6       +2 -2      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.roles
  
  Index: ContainerProfile.roles
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.roles,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ContainerProfile.roles	19 Jul 2002 12:37:04 -0000	1.5
  +++ ContainerProfile.roles	22 Jan 2003 04:38:53 -0000	1.6
  @@ -9,9 +9,9 @@
                  class="org.apache.avalon.excalibur.monitor.ActiveMonitor"
                  handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
     </role>
  -  <role name="org.apache.avalon.excalibur.xml.Parser">
  +  <role name="org.apache.excalibur.xml.dom.DOMParser">
       <component shorthand="parser"
  -               class="org.apache.avalon.excalibur.xml.JaxpParser"
  +               class="org.apache.excalibur.xml.impl.JaxpParser"
                  handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"/>
     </role>
   </test>
  
  
  
  1.9       +1 -1      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.xconf
  
  Index: ContainerProfile.xconf
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.xconf,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ContainerProfile.xconf	11 Nov 2002 00:10:01 -0000	1.8
  +++ ContainerProfile.xconf	22 Jan 2003 04:38:53 -0000	1.9
  @@ -6,7 +6,7 @@
       <thread priority="10" frequency="1"/>
     </component>
     <component id="test3"
  -             class="org.apache.avalon.excalibur.xml.JaxpParser"
  +             class="org.apache.excalibur.xml.impl.JaxpParser"
   	         logger="test"
                activation="startup">
       <parameter name="validate" value="false"/>
  
  
  
  1.17      +3 -3      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java
  
  Index: ConfigurableRoleManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ConfigurableRoleManagerTestCase.java	10 Nov 2002 16:18:23 -0000	1.16
  +++ ConfigurableRoleManagerTestCase.java	22 Jan 2003 04:38:54 -0000	1.17
  @@ -91,8 +91,8 @@
                      "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
           checkRole( roles,
                      "parser",
  -                   "org.apache.avalon.excalibur.xml.Parser",
  -                   "org.apache.avalon.excalibur.xml.JaxpParser",
  +                   "org.apache.excalibur.xml.dom.DOMParser",
  +                   "org.apache.excalibur.xml.impl.JaxpParser",
                      "org.apache.excalibur.fortress.handler.PoolableComponentHandler" );
       }
   }
  
  
  
  1.20      +9 -9      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java
  
  Index: ExcaliburRoleManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ExcaliburRoleManagerTestCase.java	10 Nov 2002 16:18:23 -0000	1.19
  +++ ExcaliburRoleManagerTestCase.java	22 Jan 2003 04:38:54 -0000	1.20
  @@ -122,13 +122,13 @@
                      "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
           checkRole( roles,
                      "xalan-xpath",
  -                   "org.apache.avalon.excalibur.xml.xpath.XPathProcessor",
  -                   "org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl",
  +                   "org.apache.excalibur.xml.xpath.XPathProcessor",
  +                   "org.apache.excalibur.xml.xpath.XPathProcessorImpl",
                      "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
           checkRole( roles,
                      "jaxpath",
  -                   "org.apache.avalon.excalibur.xml.xpath.XPathProcessor",
  -                   "org.apache.avalon.excalibur.xml.xpath.JaxenProcessorImpl",
  +                   "org.apache.excalibur.xml.xpath.XPathProcessor",
  +                   "org.apache.excalibur.xml.xpath.JaxenProcessorImpl",
                      "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
           checkRole( roles,
                      "resolver",
  @@ -137,13 +137,13 @@
                      "org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
           checkRole( roles,
                      "parser",
  -                   "org.apache.avalon.excalibur.xml.Parser",
  -                   "org.apache.avalon.excalibur.xml.JaxpParser",
  +                   "org.apache.excalibur.xml.dom.DOMParser",
  +                   "org.apache.excalibur.xml.impl.JaxpParser",
                      "org.apache.excalibur.fortress.handler.PerThreadComponentHandler" );
           checkRole( roles,
                      "xerces-parser",
  -                   "org.apache.avalon.excalibur.xml.Parser",
  -                   "org.apache.avalon.excalibur.xml.XercesParser",
  +                   "org.apache.excalibur.xml.dom.DOMParser",
  +                   "org.apache.excalibur.xml.impl.XercesParser",
                      "org.apache.excalibur.fortress.handler.FactoryComponentHandler" );
       }
   
  
  
  
  1.3       +6 -6      jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test/ecm.roles
  
  Index: ecm.roles
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test/ecm.roles,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ecm.roles	8 Oct 2002 15:00:26 -0000	1.2
  +++ ecm.roles	22 Jan 2003 04:38:54 -0000	1.3
  @@ -16,17 +16,17 @@
   <role-list>
   
     <!-- single component definitions -->
  -  <role name="org.apache.avalon.excalibur.xml.Parser"
  +  <role name="org.apache.excalibur.xml.dom.DOMParser"
           shorthand="xml-parser"
  -        default-class="org.apache.avalon.excalibur.xml.JaxpParser"/>
  +        default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
   
  -  <role name="org.apache.avalon.excalibur.xml.xslt.XSLTProcessor"
  +  <role name="org.apache.excalibur.xml.xslt.XSLTProcessor"
           shorthand="xslt-processor"
  -        default-class="org.apache.avalon.excalibur.xml.xslt.XSLTProcessorImpl"/>
  +        default-class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"/>
   
  -  <role name="org.apache.avalon.excalibur.xml.xpath.XPathProcessor"
  +  <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
           shorthand="xpath-processor"
  -        default-class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"/>
  +        default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
   
     <!-- component selector definition -->
     <role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
  
  
  
  1.3       +2 -2      jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test/ecm.xconf
  
  Index: ecm.xconf
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test/ecm.xconf,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ecm.xconf	23 Oct 2002 11:33:38 -0000	1.2
  +++ ecm.xconf	22 Jan 2003 04:38:54 -0000	1.3
  @@ -3,7 +3,7 @@
   <ecm-xconf>
   
     <!-- XML Parser -->
  -  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser">
  +  <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
       <parameter name="validate" value="false"/>
       <parameter name="namespace-prefixes" value="false"/>
       <parameter name="stop-on-warning" value="true"/>
  @@ -18,7 +18,7 @@
     </xslt-processor>
   
     <!-- Xpath Processor -->
  -  <xpath-processor class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"/>
  +  <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
   
     <!-- Datasources -->
     <datasources>
  
  
  
  1.5       +6 -6      jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test/fortress.roles
  
  Index: fortress.roles
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test/fortress.roles,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- fortress.roles	8 Oct 2002 15:00:26 -0000	1.4
  +++ fortress.roles	22 Jan 2003 04:38:54 -0000	1.5
  @@ -14,21 +14,21 @@
   <role-list>
   
     <!-- single component definitions -->
  -  <role name="org.apache.avalon.excalibur.xml.Parser">
  +  <role name="org.apache.excalibur.xml.dom.DOMParser">
       <component shorthand="xml-parser"
  -               class="org.apache.avalon.excalibur.xml.JaxpParser"
  +               class="org.apache.excalibur.xml.impl.JaxpParser"
                  handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"/>
     </role>
   
  -  <role name="org.apache.avalon.excalibur.xml.xslt.XSLTProcessor">
  +  <role name="org.apache.excalibur.xml.xslt.XSLTProcessor">
       <component shorthand="xslt-processor"
  -               class="org.apache.avalon.excalibur.xml.xslt.XSLTProcessorImpl"
  +               class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"
                  handler="org.apache.excalibur.fortress.handler.FactoryComponentHandler"/>
     </role>
   
  -  <role name="org.apache.avalon.excalibur.xml.xpath.XPathProcessor">
  +  <role name="org.apache.excalibur.xml.xpath.XPathProcessor">
       <component shorthand="xpath-processor"
  -               class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl"
  +               class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"
                  handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
     </role>
   
  
  
  
  1.9       +4 -4      jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test/xfcTestCase.java
  
  Index: xfcTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xfc/src/test/org/apache/excalibur/xfc/test/xfcTestCase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- xfcTestCase.java	17 Oct 2002 14:38:18 -0000	1.8
  +++ xfcTestCase.java	22 Jan 2003 04:38:54 -0000	1.9
  @@ -360,9 +360,9 @@
           // input classes to analyse
           final String[] classes =
               {
  -                "org.apache.avalon.excalibur.xml.JaxpParser",
  -                "org.apache.avalon.excalibur.xml.xslt.XSLTProcessorImpl",
  -                "org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl",
  +                "org.apache.excalibur.xml.impl.JaxpParser",
  +                "org.apache.excalibur.xml.xslt.XSLTProcessorImpl",
  +                "org.apache.excalibur.xml.xpath.XPathProcessorImpl",
               };
   
           // actual handlers these classes should use
  
  
  

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


Mime
View raw message