Author: berndf
Date: Tue Jan 22 02:42:22 2008
New Revision: 614166
URL: http://svn.apache.org/viewvc?rev=614166&view=rev
Log:
adopt latest configs from phoenix-deployment/src/conf/
Modified:
james/server/trunk/spring-deployment/src/main/config/james-assembly.xml
james/server/trunk/spring-deployment/src/main/config/james-config.xml
Modified:
james/server/trunk/spring-deployment/src/main/config/james-assembly.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james-assembly.xml?rev=614166&r1=614165&r2=614166&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james-assembly.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james-assembly.xml Tue
Jan 22 02:42:22 2008
@@ -60,16 +60,8 @@
<block name="mailboxmanager"
class="org.apache.james.mailboxmanager.impl.DefaultMailboxManagerProvider">
- <provide name="filesystem" role="org.apache.james.services.FileSystem" />
- <provide name="mailboxmanager-mailstore"
role="org.apache.avalon.cornerstone.services.store.Store" />
+ <provide name="filesystem" role="org.apache.james.services.FileSystem"
/>
</block>
-
- <block name="mailboxmanager-mailstore"
class="org.apache.james.mailboxmanager.mailstore.MyAvalonMailStore" >
- <provide name="database-connections"
-
role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />
- <provide name="filesystem" role="org.apache.james.services.FileSystem" />
- </block>
-
<!-- The James Spool Manager block -->
<block name="spoolmanager"
class="org.apache.james.transport.JamesSpoolManager" >
@@ -213,14 +205,19 @@
<provide name="localusersrepository"
role="org.apache.james.services.UsersRepository"/>
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
</block>
+
+ <!-- JMS Service
+ EXPERIMENTAL JMS Service: uncomment before use
+ <block name="jms" class="org.apache.james.phoenix.jms.activemq.JMSService" >
+ <provide name="James" role="org.apache.james.services.MailServer"/>
+ </block>
+ -->
<!-- The High Level Storage block -->
<block name="mailstore" class="org.apache.james.core.AvalonMailStore" >
<provide name="database-connections"
role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />
- <provide name="mailboxmanager"
-
role="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" />
<provide name="filesystem" role="org.apache.james.services.FileSystem" />
</block>
Modified: james/server/trunk/spring-deployment/src/main/config/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james-config.xml?rev=614166&r1=614165&r2=614166&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james-config.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james-config.xml Tue
Jan 22 02:42:22 2008
@@ -21,6 +21,7 @@
<!ENTITY listserverConfig SYSTEM "../conf/james-listmanager.xml">
<!ENTITY listserverStores SYSTEM "../conf/james-liststores.xml">
<!ENTITY fetchmailConfig SYSTEM "../conf/james-fetchmail.xml">
+<!ENTITY jmsConfig SYSTEM "../conf/james-jms.xml">
<!ENTITY smtphandlerchainConfig SYSTEM "../conf/james-smtphandlerchain.xml">
]>
@@ -40,7 +41,7 @@
<!-- For production use you will probably need to make more extensive changes,
see -->
<!-- http://james.apache.org/server/2.3.0/ -->
-<!-- $Revision: 559572 $ Committed on $Date: 2007-07-25 21:40:47 +0200 (Wed,
25 Jul 2007) $ by: $Author: rdonkin $ -->
+<!-- $Revision: 602733 $ Committed on $Date: 2007-12-09 22:37:20 +0100 (Sun,
09 Dec 2007) $ by: $Author: rdonkin $ -->
<config>
<James>
@@ -138,60 +139,32 @@
<usernamespace name="#mail" delimiter="."/>
</namespaces>
<factory
-
class="org.apache.james.mailboxmanager.impl.VirtualMailboxManagerFactory">
- <mounts>
- <mount>
- <point point="#mail"/>
- <target
class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
- <torque-properties>
- <property name="torque.database.default"
- value="mailboxmanager"/>
- <property
- name="torque.database.mailboxmanager.adapter"
- value="derby"/>
- <property
- name="torque.dsfactory.mailboxmanager.factory"
-
value="org.apache.torque.dsfactory.SharedPoolDataSourceFactory"/>
- <property
-
name="torque.dsfactory.mailboxmanager.connection.driver"
- value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property
-
name="torque.dsfactory.mailboxmanager.connection.url"
-
value="jdbc:derby:../apps/james/var/mailboxmanager-derbydb;create=true"/>
- <property
-
name="torque.dsfactory.mailboxmanager.connection.user"
- value="app"/>
- <property
-
name="torque.dsfactory.mailboxmanager.connection.password"
- value="app"/>
- <property
-
name="torque.dsfactory.mailboxmanager.pool.maxActive"
- value="100"/>
- </torque-properties>
- </target>
- </mount>
- <!-- You could configure your local-address-error processor
with
- the repositoryPath
mailboxmanager://#system.address-error/
- -->
- <mount>
- <point point="#system"/>
- <target
-
class="org.apache.james.mailboxmanager.mailstore.MailStoreMailboxManagerFactory">
- <repository destinationURL="file://var/mail/system/"
- type="MAIL"/>
- </target>
- </mount>
- <!-- Mail to user1 goes to a file repository
- <mount>
- <point point="#mail.user1"/>
- <target
-
class="org.apache.james.mailboxmanager.mailstore.MailStoreMailboxManagerFactory">
- <repository
destinationURL="file://var/mail/inboxes/user1"
- type="MAIL"/>
- </target>
- </mount>
- -->
- </mounts>
+
class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
+ <torque-properties>
+ <property name="torque.database.default"
+ value="mailboxmanager"/>
+ <property
+ name="torque.database.mailboxmanager.adapter"
+ value="derby"/>
+ <property
+ name="torque.dsfactory.mailboxmanager.factory"
+
value="org.apache.torque.dsfactory.SharedPoolDataSourceFactory"/>
+ <property
+
name="torque.dsfactory.mailboxmanager.connection.driver"
+ value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property
+
name="torque.dsfactory.mailboxmanager.connection.url"
+
value="jdbc:derby:../apps/james/var/mailboxmanager-derbydb;create=true"/>
+ <property
+
name="torque.dsfactory.mailboxmanager.connection.user"
+ value="app"/>
+ <property
+
name="torque.dsfactory.mailboxmanager.connection.password"
+ value="app"/>
+ <property
+
name="torque.dsfactory.mailboxmanager.pool.maxActive"
+ value="100"/>
+ </torque-properties>
</factory>
</mailboxmanager>
@@ -229,6 +202,9 @@
<!-- CHECKME: FetchMail is disabled by default, and must be configured to
use. -->
<!-- Edit the file referred to by fetchmailConfig to enable and configure.
-->
&fetchmailConfig;
+
+ <!-- Example configuration for JMS interoperation -->
+ &jmsConfig;
<!-- Set the Java packages from which to load mailets and matchers -->
<mailetpackages>
@@ -1323,149 +1299,6 @@
</repositories>
</mailstore>
-
-
- <!-- The Mailstore block used by mailboxmanager -->
-
- <mailboxmanager-mailstore>
- <repositories>
- <repository
class="org.apache.james.mailboxmanager.repository.MailboxManagerMailRepository">
- <protocols>
- <protocol>mailboxmanager</protocol>
- </protocols>
- <types>
- <type>MAIL</type>
- </types>
- <config>
- <sqlFile>file://conf/mailboxManagerSqlResources.xml</sqlFile>
- </config>
- </repository>
- <!-- File based repositories. These repositories store all message
data -->
- <!-- in the file system. -->
- <repository
class="org.apache.james.mailrepository.AvalonMailRepository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <types>
- <type>MAIL</type>
- </types>
- <!-- Set if the messages should be listed sorted. False by default
-->
- <config FIFO="false"/>
- </repository>
- <repository
class="org.apache.james.mailrepository.AvalonSpoolRepository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <types>
- <type>SPOOL</type>
- </types>
- </repository>
-
- <!-- JDBC based repositories. These repositories store all message
data -->
- <!-- in the database. -->
- <repository
class="org.apache.james.mailrepository.JDBCMailRepository">
- <protocols>
- <protocol>db</protocol>
- </protocols>
- <types>
- <type>MAIL</type>
- </types>
- <config>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <!-- Set the size threshold for in memory handling of storing
operations -->
- <!-- Default is currently 409600000 due to a bug with mysql and
binary stream -->
- <!-- currently under investigation. Please change this only if
you know what -->
- <!-- you do. -->
- <!--
- <inMemorySizeLimit>4096</inMemorySizeLimit>
- -->
- </config>
- </repository>
-
- <repository
class="org.apache.james.mailrepository.JDBCSpoolRepository">
- <protocols>
- <protocol>db</protocol>
- </protocols>
- <types>
- <type>SPOOL</type>
- </types>
- <config>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <maxcache>1000</maxcache>
- </config>
- </repository>
-
- <!-- These repositories store message delivery and headers in the DB,
and the body to the filesystem -->
- <repository
class="org.apache.james.mailrepository.JDBCMailRepository">
- <protocols>
- <protocol>dbfile</protocol>
- </protocols>
- <types>
- <type>MAIL</type>
- </types>
- <config>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <filestore>file://var/dbmail</filestore>
- </config>
- </repository>
-
- <repository
class="org.apache.james.mailrepository.JDBCSpoolRepository">
- <protocols>
- <protocol>dbfile</protocol>
- </protocols>
- <types>
- <type>SPOOL</type>
- </types>
- <config>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <filestore>file://var/dbmail</filestore>
- <maxcache>1000</maxcache>
- </config>
- </repository>
-
- <!-- The mbox repository is designed for MAIL only; SPOOL performance
would be less than ideal-->
- <repository
class="org.apache.james.mailrepository.MBoxMailRepository">
- <protocols>
- <protocol>mbox</protocol>
- </protocols>
- <types>
- <type>MAIL</type>
- </types>
- <!-- Set if the messages should be listed sorted. False by default
-->
- <config FIFO="false"/>
- </repository>
-
- <repository
class="org.apache.james.mailrepository.filepair.File_Persistent_Object_Repository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <types>
- <type>OBJECT</type>
- </types>
- <models>
- <model>SYNCHRONOUS</model>
- <model>ASYNCHRONOUS</model>
- <model>CACHE</model>
- </models>
- </repository>
-
- <repository
class="org.apache.james.mailrepository.filepair.File_Persistent_Stream_Repository">
- <protocols>
- <protocol>file</protocol>
- </protocols>
- <types>
- <type>STREAM</type>
- </types>
- <models>
- <model>SYNCHRONOUS</model>
- <model>ASYNCHRONOUS</model>
- <model>CACHE</model>
- </models>
- </repository>
- </repositories>
-
- </mailboxmanager-mailstore>
-
<!-- The User Storage block -->
<users-store>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
