You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/05/03 07:10:21 UTC

cvs commit: avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test fortress.roles ecm.roles

donaldp     2003/05/02 22:10:21

  Modified:    xfc/src/test/org/apache/excalibur/xfc/test fortress.roles
                        ecm.roles
  Log:
  Update roles to work with local data
  
  Revision  Changes    Path
  1.6       +15 -15    avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test/fortress.roles
  
  Index: fortress.roles
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test/fortress.roles,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- fortress.roles	22 Jan 2003 04:38:54 -0000	1.5
  +++ fortress.roles	3 May 2003 05:10:21 -0000	1.6
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
   <!DOCTYPE role-list [
  -<!ELEMENT role-list (role+)> 
  +<!ELEMENT role-list (role+)>
   <!ELEMENT role (component+)>
   <!ELEMENT component EMPTY>
   <!ATTLIST role name CDATA #REQUIRED>
  @@ -14,31 +14,31 @@
   <role-list>
   
     <!-- single component definitions -->
  -  <role name="org.apache.excalibur.xml.dom.DOMParser">
  -    <component shorthand="xml-parser"
  -               class="org.apache.excalibur.xml.impl.JaxpParser"
  +  <role name="org.apache.excalibur.xfc.data.Role1">
  +    <component shorthand="role1"
  +               class="org.apache.excalibur.xfc.data.Component1"
                  handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"/>
     </role>
   
  -  <role name="org.apache.excalibur.xml.xslt.XSLTProcessor">
  -    <component shorthand="xslt-processor"
  -               class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"
  +  <role name="org.apache.excalibur.xfc.data.Role2">
  +    <component shorthand="role2"
  +               class="org.apache.excalibur.xfc.data.Component2"
                  handler="org.apache.excalibur.fortress.handler.FactoryComponentHandler"/>
     </role>
   
  -  <role name="org.apache.excalibur.xml.xpath.XPathProcessor">
  -    <component shorthand="xpath-processor"
  -               class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"
  +  <role name="org.apache.excalibur.xfc.data.Role3">
  +    <component shorthand="role3"
  +               class="org.apache.excalibur.xfc.data.Component3"
                  handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
     </role>
   
     <!-- component selector definition -->
  -  <role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector">
  -	<component shorthand="jdbc"
  -               class="org.apache.avalon.excalibur.datasource.ResourceLimitingJdbcDataSource"
  +  <role name="org.apache.excalibur.xfc.data.Role4">
  +	<component shorthand="a"
  +               class="org.apache.excalibur.xfc.data.Component4a"
                  handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
  -    <component shorthand="j2ee"
  -               class="org.apache.avalon.excalibur.datasource.J2eeDataSource"
  +    <component shorthand="b"
  +               class="org.apache.excalibur.xfc.data.Component4b"
                  handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
     </role>
   
  
  
  
  1.4       +14 -14    avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test/ecm.roles
  
  Index: ecm.roles
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test/ecm.roles,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ecm.roles	22 Jan 2003 04:38:54 -0000	1.3
  +++ ecm.roles	3 May 2003 05:10:21 -0000	1.4
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
   <!DOCTYPE role-list [
  -<!ELEMENT role-list (role+)> 
  +<!ELEMENT role-list (role+)>
   <!ELEMENT role (hint*)>
   <!ELEMENT hint EMPTY>
   <!ATTLIST role name CDATA #REQUIRED
  @@ -16,24 +16,24 @@
   <role-list>
   
     <!-- single component definitions -->
  -  <role name="org.apache.excalibur.xml.dom.DOMParser"
  -        shorthand="xml-parser"
  -        default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
  +  <role name="org.apache.excalibur.xfc.data.Role1"
  +        shorthand="role1"
  +        default-class="org.apache.excalibur.xfc.data.Component1"/>
   
  -  <role name="org.apache.excalibur.xml.xslt.XSLTProcessor"
  -        shorthand="xslt-processor"
  -        default-class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"/>
  +  <role name="org.apache.excalibur.xfc.data.Role2"
  +        shorthand="role2"
  +        default-class="org.apache.excalibur.xfc.data.Component2"/>
   
  -  <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
  -        shorthand="xpath-processor"
  -        default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
  +  <role name="org.apache.excalibur.xfc.data.Role3"
  +        shorthand="role3"
  +        default-class="org.apache.excalibur.xfc.data.Component3"/>
   
     <!-- component selector definition -->
  -  <role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
  -        shorthand="datasources"
  +  <role name="org.apache.excalibur.xfc.data.Role4"
  +        shorthand="role4s"
           default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
  -    <hint shorthand="jdbc" class="org.apache.avalon.excalibur.datasource.ResourceLimitingJdbcDataSource"/>
  -    <hint shorthand="j2ee" class="org.apache.avalon.excalibur.datasource.J2eeDataSource"/>
  +    <hint shorthand="a" class="org.apache.excalibur.xfc.data.Component4a"/>
  +    <hint shorthand="b" class="org.apache.excalibur.xfc.data.Component4b"/>
     </role>
   
   </role-list>
  
  
  

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