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:13:23 UTC
cvs commit: avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test ecm.xconf fortress.xconf
donaldp 2003/05/02 22:13:23
Modified: xfc/src/test/org/apache/excalibur/xfc/test ecm.xconf
fortress.xconf
Log:
cleaned conf files
Revision Changes Path
1.4 +12 -37 avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test/ecm.xconf
Index: ecm.xconf
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test/ecm.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecm.xconf 22 Jan 2003 04:38:54 -0000 1.3
+++ ecm.xconf 3 May 2003 05:13:22 -0000 1.4
@@ -3,51 +3,26 @@
<ecm-xconf>
<!-- XML Parser -->
- <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
+ <role1 class="org.apache.excalibur.xfc.data.Component1">
<parameter name="validate" value="false"/>
- <parameter name="namespace-prefixes" value="false"/>
- <parameter name="stop-on-warning" value="true"/>
- <parameter name="stop-on-recoverable-error" value="true"/>
- <parameter name="reuse-parsers" value="false"/>
- </xml-parser>
+ </role1>
<!-- XSLT Processor -->
- <xslt-processor>
- <parameter name="use-store" value="false"/>
- <parameter name="incremental-processing" value="true"/>
- </xslt-processor>
+ <role2>
+ <parameter name="use-store" value="false"/>
+ </role2>
<!-- Xpath Processor -->
- <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
+ <role3 class="org.apache.excalibur.xfc.data.Component3"/>
<!-- Datasources -->
- <datasources>
- <jdbc name="default">
+ <role4s>
+ <a name="default">
<dburl>jdbc:hsqldb:hsql://localhost:9002</dburl>
- <user>sa</user>
- <password/>
- </jdbc>
- <jdbc name="backup">
+ </a>
+ <a name="backup">
<dburl>jdbc:hsqldb:hsql://localhost:9003</dburl>
- <user>sa</user>
- <password/>
- </jdbc>
- </datasources>
-
- <!-- component selector, non roles -->
- <component role="my.cs.role"
- class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector" >
- <component-instance name="one" class="my.first.impl">
- <config><values/></config>
- </component-instance>
- <component-instance name="two" class="my.second.impl">
- <config><values/></config>
- </component-instance>
- </component>
-
- <!-- component, non role -->
- <component role="my.role" class="my.class">
- <config><values/></config>
- </component>
+ </a>
+ </role4s>
</ecm-xconf>
1.4 +10 -26 avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test/fortress.xconf
Index: fortress.xconf
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/test/org/apache/excalibur/xfc/test/fortress.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fortress.xconf 23 Oct 2002 11:33:38 -0000 1.3
+++ fortress.xconf 3 May 2003 05:13:22 -0000 1.4
@@ -4,39 +4,23 @@
<fortress-xconf>
- <xml-parser id="xml-parser">
+ <role1 id="xml-parser">
<parameter name="validate" value="false"/>
- <parameter name="namespace-prefixes" value="false"/>
- <parameter name="stop-on-warning" value="true"/>
- <parameter name="stop-on-recoverable-error" value="true"/>
- <parameter name="reuse-parsers" value="false"/>
- </xml-parser>
+ </role1>
- <xslt-processor id="xslt-processor">
- <parameter name="use-store" value="false"/>
- <parameter name="incremental-processing" value="true"/>
- </xslt-processor>
+ <role2 id="xslt-processor">
+ <parameter name="use-store" value="false"/>
+ </role2>
- <xpath-processor id="xpath-processor"/>
+ <role3 id="xpath-processor"/>
- <jdbc id="default">
+ <a id="default">
<dburl>jdbc:hsqldb:hsql://localhost:9002</dburl>
- <user>sa</user>
- <password/>
- </jdbc>
+ </a>
- <jdbc id="backup">
+ <a id="backup">
<dburl>jdbc:hsqldb:hsql://localhost:9003</dburl>
- <user>sa</user>
- <password/>
- </jdbc>
-
- <component role="org.apache.avalon.excalibur.datasource.DataSourceComponent"
- id="default-connection"
- class="org.apache.avalon.excalibur.datasource.JdbcDataSourceComponent"
- handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler">
- <component-specific-configuration/>
- </component>
+ </a>
</fortress-xconf>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org