crafterm    2002/07/19 05:37:04

  Modified:    fortress/src/test/org/apache/excalibur/fortress/test
                        ContainerProfile.roles ContainerProfile.xconf
                        ContainerProfile.xlog
  Log:
  Removed ^M's
  
  Revision  Changes    Path
  1.5       +18 -18    
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContainerProfile.roles    4 Apr 2002 16:04:28 -0000       1.4
  +++ ContainerProfile.roles    19 Jul 2002 12:37:04 -0000      1.5
  @@ -1,18 +1,18 @@
  -<test>
  -  <role name="org.apache.avalon.excalibur.datasource.DataSourceComponent">
  -    <component shorthand="datasource"
  -               class="org.apache.avalon.excalibur.datasource.JdbcDataSource"
  -               
handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
  -  </role>
  -  <role name="org.apache.avalon.excalibur.monitor.Monitor">
  -    <component shorthand="monitor"
  -               class="org.apache.avalon.excalibur.monitor.ActiveMonitor"
  -               
handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
  -  </role>
  -  <role name="org.apache.avalon.excalibur.xml.Parser">
  -    <component shorthand="parser"
  -               class="org.apache.avalon.excalibur.xml.JaxpParser"
  -               
handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"/>
  -  </role>
  -</test>
  -
  +<test>
  +  <role name="org.apache.avalon.excalibur.datasource.DataSourceComponent">
  +    <component shorthand="datasource"
  +               class="org.apache.avalon.excalibur.datasource.JdbcDataSource"
  +               
handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
  +  </role>
  +  <role name="org.apache.avalon.excalibur.monitor.Monitor">
  +    <component shorthand="monitor"
  +               class="org.apache.avalon.excalibur.monitor.ActiveMonitor"
  +               
handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
  +  </role>
  +  <role name="org.apache.avalon.excalibur.xml.Parser">
  +    <component shorthand="parser"
  +               class="org.apache.avalon.excalibur.xml.JaxpParser"
  +               
handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"/>
  +  </role>
  +</test>
  +
  
  
  
  1.6       +36 -36    
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ContainerProfile.xconf    4 Apr 2002 16:04:28 -0000       1.5
  +++ ContainerProfile.xconf    19 Jul 2002 12:37:04 -0000      1.6
  @@ -1,36 +1,36 @@
  -<test>
  -<!--
  -  <component id="test1"
  -        class="org.apache.avalon.excalibur.datasource.JdbcDataSource"
  -     role="org.apache.avalon.excalibur.datasource.DataSourceComponent"
  -     handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
  -        logger="test">
  -    <pool-controller min="5" max="10">
  -      <keep-alive>SELECT 1 FROM groups</keep-alive>
  -    </pool-controller>
  -    <driver>@test.jdbc.driver@</driver>
  -    <dburl>@test.jdbc.url@</dburl>
  -    <user>@test.jdbc.user@</user>
  -    <password>@test.jdbc.password@</password>
  -  </component>
  --->
  -  <component id="test2"
  -        class="org.apache.avalon.excalibur.monitor.ActiveMonitor"
  -     role="org.apache.avalon.excalibur.monitor.Monitor"
  -     handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
  -     logger="test">
  -    <thread priority="10" frequency="1"/>
  -  </component>
  -  <component id="test3"
  -        class="org.apache.avalon.excalibur.xml.JaxpParser"
  -     role="org.apache.avalon.excalibur.xml.Parser"
  -     handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"
  -     logger="test">
  -    <parameter name="validate" value="false"/>
  -    <parameter name="namespace-prefixes" value="false"/>
  -    <parameter name="reuse-parsers" value="true"/>
  -    <parameter name="stop-on-warning" value="false"/>
  -    <parameter name="stop-on-recoverable-error" value="true"/>
  -  </component>
  -</test>
  -
  +<test>
  +<!--
  +  <component id="test1"
  +        class="org.apache.avalon.excalibur.datasource.JdbcDataSource"
  +     role="org.apache.avalon.excalibur.datasource.DataSourceComponent"
  +     handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
  +        logger="test">
  +    <pool-controller min="5" max="10">
  +      <keep-alive>SELECT 1 FROM groups</keep-alive>
  +    </pool-controller>
  +    <driver>@test.jdbc.driver@</driver>
  +    <dburl>@test.jdbc.url@</dburl>
  +    <user>@test.jdbc.user@</user>
  +    <password>@test.jdbc.password@</password>
  +  </component>
  +-->
  +  <component id="test2"
  +        class="org.apache.avalon.excalibur.monitor.ActiveMonitor"
  +     role="org.apache.avalon.excalibur.monitor.Monitor"
  +     handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
  +     logger="test">
  +    <thread priority="10" frequency="1"/>
  +  </component>
  +  <component id="test3"
  +        class="org.apache.avalon.excalibur.xml.JaxpParser"
  +     role="org.apache.avalon.excalibur.xml.Parser"
  +     handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"
  +     logger="test">
  +    <parameter name="validate" value="false"/>
  +    <parameter name="namespace-prefixes" value="false"/>
  +    <parameter name="reuse-parsers" value="true"/>
  +    <parameter name="stop-on-warning" value="false"/>
  +    <parameter name="stop-on-recoverable-error" value="true"/>
  +  </component>
  +</test>
  +
  
  
  
  1.2       +23 -23    
jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.xlog
  
  Index: ContainerProfile.xlog
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.xlog,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerProfile.xlog     19 Feb 2002 13:47:29 -0000      1.1
  +++ ContainerProfile.xlog     19 Jul 2002 12:37:04 -0000      1.2
  @@ -1,23 +1,23 @@
  -<logkit>
  -    <factories>
  -      <factory type="file" 
class="org.apache.avalon.excalibur.logger.factory.FileTargetFactory"/>
  -    </factories>
  -
  -    <targets>
  -       <file id="root">
  -        <filename>container-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>
  +<logkit>
  +    <factories>
  +      <factory type="file" 
class="org.apache.avalon.excalibur.logger.factory.FileTargetFactory"/>
  +    </factories>
  +
  +    <targets>
  +       <file id="root">
  +        <filename>container-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>
  
  
  

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

Reply via email to