mcconnell 2003/01/16 22:27:40
Modified: merlin blocks.xml
merlin/src/test/config james.xml
Log:
Updates to sync. James test with cornestone package changes.
Revision Changes Path
1.4 +3 -1 avalon-sandbox/merlin/blocks.xml
Index: blocks.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/blocks.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blocks.xml 15 Jan 2003 09:14:50 -0000 1.3
+++ blocks.xml 17 Jan 2003 06:27:40 -0000 1.4
@@ -9,7 +9,7 @@
<blocks>
- <block name="james" src="src/test/config/james.xml" enabled="false" >
+ <block name="james" src="src/test/config/james.xml" enabled="true" >
<configuration target="dns">
<servers>
<server>212.198.0.66</server>
@@ -20,6 +20,7 @@
</configuration>
</block>
+<!--
<block name="playground"
path="../assembly/build/lib/avalon-assembly-demo-1.0.jar" enabled="true"/>
<block name="demo" path="../merlin/build/lib/avalon-merlin-demo-1.0.jar"
enabled="true">
@@ -29,5 +30,6 @@
</configuration>
</configuration>
</block>
+-->
</blocks>
1.3 +3 -5 avalon-sandbox/merlin/src/test/config/james.xml
Index: james.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/test/config/james.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- james.xml 15 Jan 2003 12:32:31 -0000 1.2
+++ james.xml 17 Jan 2003 06:27:40 -0000 1.3
@@ -25,14 +25,12 @@
<engine>
<classpath>
<fileset dir="../../jakarta-avalon-excalibur">
- <!--<include
name="collections/build/lib/excalibur-collections-1.0.jar"/>-->
- <!--<include name="collections/lib/commons-collections-2.0.jar"/>-->
<include name="io/build/lib/excalibur-io-1.1.jar"/>
</fileset>
<fileset dir="../../jakarta-avalon-cornerstone/build/lib">
<include name="cornerstone-threads-1.0.jar"/>
<include name="cornerstone-connection-1.0.jar"/>
- <include name="cornerstone-source-1.0.jar"/>
+ <include name="cornerstone-datasources-1.0.jar"/>
<include name="cornerstone-scheduler-1.0.jar"/>
<include name="cornerstone-sockets-1.0.jar"/>
<include name="cornerstone-store-1.0.jar"/>
@@ -219,8 +217,8 @@
class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler"
activation="true"/>
- <appliance name="source"
-
class="org.apache.avalon.cornerstone.blocks.source.DefaultDataSourceSelector"
+ <appliance name="datasources"
+
class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector"
activation="true"/>
<appliance name="spool"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
