mcconnell 2003/01/19 10:56:10
Modified: merlin blocks.xml kernel.xml
merlin/src/test/config james.xml
Log:
Minor updates to config and demos so we don't cause problems.
Revision Changes Path
1.10 +11 -3 avalon-sandbox/merlin/blocks.xml
Index: blocks.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/blocks.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- blocks.xml 19 Jan 2003 18:18:50 -0000 1.9
+++ blocks.xml 19 Jan 2003 18:56:10 -0000 1.10
@@ -8,7 +8,7 @@
<blocks>
- <block name="james" src="src/test/config/james.xml" enabled="true" >
+ <block name="james" src="src/test/config/james.xml" enabled="false" >
<configuration target="dns">
<servers>
<server>192.112.36.4</server>
@@ -17,9 +17,18 @@
</servers>
<authoritative>false</authoritative>
</configuration>
+ <configuration target="remote">
+ <port>4555</port>
+ <handler>
+ <helloName autodetect="TRUE">myMailServer</helloName>
+ <administrator_accounts>
+ <account login="root" password="root"/>
+ </administrator_accounts>
+ <connectiontimeout> 60000 </connectiontimeout>
+ </handler>
+ </configuration>
</block>
-<!--
<block name="playground"
path="../assembly/build/lib/avalon-assembly-demo-1.0.jar" enabled="true" />
<block name="demo" src="src/test/config/demo.xml" enabled="true">
@@ -27,6 +36,5 @@
<message>Configuration from target in blocks.xml.</message>
</configuration>
</block>
--->
</blocks>
1.16 +1 -1 avalon-sandbox/merlin/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kernel.xml 19 Jan 2003 18:18:50 -0000 1.15
+++ kernel.xml 19 Jan 2003 18:56:10 -0000 1.16
@@ -20,7 +20,7 @@
</logging>
<categories>
- <category name="/sys" priority="DEBUG"/>
+ <category name="/sys" priority="INFO"/>
</categories>
<engine/>
1.5 +57 -73 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- james.xml 19 Jan 2003 15:49:04 -0000 1.4
+++ james.xml 19 Jan 2003 18:56:10 -0000 1.5
@@ -48,6 +48,59 @@
</classpath>
</engine>
+ <appliance name="james"
+ class="org.apache.james.James"
+ activation="true">
+ <configuration>
+ <postmaster> postmaster@localhost </postmaster>
+ <servernames autodetect="true" autodetectIP="true">
+ <servername>localhost</servername>
+ <servername>home.osm.net</servername>
+ </servernames>
+ <usernames ignoreCase="true" enableAliases="true"
enableForwarding="true"/>
+ <inboxRepository>
+ <repository destinationURL="file://var/mail/inboxes/" type="MAIL"/>
+ </inboxRepository>
+ </configuration>
+ </appliance>
+ <appliance name="dns" class="org.apache.james.dnsserver.DNSServer"
+ activation="true">
+ <!-- see blocks.xml for configuration -->
+ </appliance>
+
+ <appliance name="remote"
+ class="org.apache.james.remotemanager.RemoteManager"
+ activation="true">
+ <configuration>
+ <!-- see blocks.xml for port and handler configuration -->
+ </configuration>
+ </appliance>
+
+ <appliance name="pop3"
+ class="org.apache.james.pop3server.POP3Server"
+ activation="true">
+ <configuration enabled="true">
+ <port>110</port>
+ <handler>
+ <helloName autodetect="true">myMailServer</helloName>
+ <connectiontimeout>120000</connectiontimeout>
+ </handler>
+ </configuration>
+ </appliance>
+
+ <appliance name="smtp"
+ class="org.apache.james.smtpserver.SMTPServer"
+ activation="true">
+ <configuration enabled="true">
+ <port>25</port>
+ <handler>
+ <helloName autodetect="true">myMailServer</helloName>
+ <connectiontimeout>360000</connectiontimeout>
+ <maxmessagesize>0</maxmessagesize>
+ </handler>
+ </configuration>
+ </appliance>
+
<appliance name="threads"
class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
activation="true">
@@ -288,79 +341,11 @@
</configuration>
</appliance>
- <appliance name="james"
- class="org.apache.james.James"
- activation="true">
- <configuration>
- <postmaster> postmaster@localhost </postmaster>
- <servernames autodetect="true" autodetectIP="true">
- <servername>localhost</servername>
- <servername>home.osm.net</servername>
- </servernames>
- <usernames ignoreCase="true" enableAliases="true"
enableForwarding="true"/>
- <inboxRepository>
- <repository destinationURL="file://var/mail/inboxes/" type="MAIL"/>
- </inboxRepository>
- </configuration>
- </appliance>
-
- <appliance name="dns" class="org.apache.james.dnsserver.DNSServer"
- activation="true">
- <!-- see blocks.xml for configuration -->
- <configuration target="dns">
- <servers>
- <server>192.112.36.4</server>
- <server>212.198.0.66</server>
- <server>212.198.0.67</server>
- </servers>
- <authoritative>false</authoritative>
- </configuration>
- </appliance>
-
- <appliance name="remote"
- class="org.apache.james.remotemanager.RemoteManager"
- activation="true">
- <configuration>
- <port>4555</port>
- <handler>
- <helloName autodetect="TRUE">myMailServer</helloName>
- <administrator_accounts>
- <account login="root" password="root"/>
- </administrator_accounts>
- <connectiontimeout> 60000 </connectiontimeout>
- </handler>
- </configuration>
- </appliance>
-
- <appliance name="pop3"
- class="org.apache.james.pop3server.POP3Server"
- activation="true">
- <configuration enabled="true">
- <port>110</port>
- <handler>
- <helloName autodetect="true">myMailServer</helloName>
- <connectiontimeout>120000</connectiontimeout>
- </handler>
- </configuration>
- </appliance>
-
- <appliance name="smtp"
- class="org.apache.james.smtpserver.SMTPServer"
- activation="true">
- <configuration enabled="true">
- <port>25</port>
- <handler>
- <helloName autodetect="true">myMailServer</helloName>
- <connectiontimeout>360000</connectiontimeout>
- <maxmessagesize>0</maxmessagesize>
- </handler>
- </configuration>
- </appliance>
<!-- NNTP Repository -->
<appliance name="nntp-repository"
class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl"
- activation="true">
+ activation="false">
<configuration>
<readOnly>false</readOnly>
<rootPath>file://var/nntp/groups</rootPath>
@@ -387,7 +372,7 @@
</appliance>
<appliance name="nntp" class="org.apache.james.nntpserver.NNTPServer"
- activation="true">
+ activation="false">
<configuration enabled="false">
<port>119</port>
<handler>
@@ -398,9 +383,8 @@
</configuration>
</appliance>
- <appliance name="fetchpop"
- class="org.apache.james.fetchpop.FetchScheduler"
- activation="true">
+ <appliance name="fetchpop" class="org.apache.james.fetchpop.FetchScheduler"
+ activation="false">
<configuration enabled="false">
<fetch name="mydomain.com">
<host>mail.mydomain.com</host>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
