mcconnell 2003/01/22 06:19:27
Modified: merlin blocks.xml default.properties
merlin/src/test/config james.xml
Log:
Sync with recent excalibur changes.
Revision Changes Path
1.11 +3 -3 avalon-sandbox/merlin/blocks.xml
Index: blocks.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/blocks.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- blocks.xml 19 Jan 2003 18:56:10 -0000 1.10
+++ blocks.xml 22 Jan 2003 14:19:27 -0000 1.11
@@ -8,7 +8,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>192.112.36.4</server>
@@ -29,9 +29,9 @@
</configuration>
</block>
- <block name="playground"
path="../assembly/build/lib/avalon-assembly-demo-1.0.jar" enabled="true" />
+ <block name="playground"
path="../assembly/build/lib/avalon-assembly-demo-1.0.jar" enabled="false" />
- <block name="demo" src="src/test/config/demo.xml" enabled="true">
+ <block name="demo" src="src/test/config/demo.xml" enabled="false">
<configuration target="standard">
<message>Configuration from target in blocks.xml.</message>
</configuration>
1.9 +1 -1 avalon-sandbox/merlin/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.properties 19 Jan 2003 15:26:43 -0000 1.8
+++ default.properties 22 Jan 2003 14:19:27 -0000 1.9
@@ -69,7 +69,7 @@
excalibur-event.lib=${excalibur-event.home}/build/lib
excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.1.jar
util.concurrent.jar=${excalibur-event.home}/lib/util.concurrent-1.3.1.jar
-commons-collections.jar=${excalibur-event.home}/lib/commons-collections-20021002.jar
+commons-collections.jar=${excalibur-event.home}/lib/commons-collections-2.1.jar
# ----- Excalibur collections, version 1.0 or later -----
excalibur-collections.home=${excalibur.home}/collections
1.6 +2 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- james.xml 19 Jan 2003 18:56:10 -0000 1.5
+++ james.xml 22 Jan 2003 14:19:27 -0000 1.6
@@ -20,7 +20,7 @@
-->
<implementation>
- <categories priority="INFO"/>
+ <categories priority="DEBUG"/>
<engine>
<classpath>
@@ -48,8 +48,7 @@
</classpath>
</engine>
- <appliance name="james"
- class="org.apache.james.James"
+ <appliance name="james" class="org.apache.james.James"
activation="true">
<configuration>
<postmaster> postmaster@localhost </postmaster>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
