Author: joachim
Date: Mon Oct 9 12:30:06 2006
New Revision: 454468
URL: http://svn.apache.org/viewvc?view=rev&rev=454468
Log:
Integration done. But I didn't have much time to test
Added:
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/repository/MyAvalonMailStore.xinfo
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.xinfo
Modified:
james/server/sandbox/imap-integration/ (props changed)
james/server/sandbox/imap-integration/build.xml
james/server/sandbox/imap-integration/include.properties
james/server/sandbox/imap-integration/src/conf/james-assembly.xml
james/server/sandbox/imap-integration/src/conf/james-config.xml
james/server/sandbox/imap-integration/src/conf/james-server.xml
james/server/sandbox/imap-integration/src/java/org/apache/james/imapserver/ImapServer.xinfo
Propchange: james/server/sandbox/imap-integration/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Oct 9 12:30:06 2006
@@ -4,3 +4,4 @@
bin
dist
.settings
+build
Modified: james/server/sandbox/imap-integration/build.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/build.xml?view=diff&rev=454468&r1=454467&r2=454468
==============================================================================
--- james/server/sandbox/imap-integration/build.xml (original)
+++ james/server/sandbox/imap-integration/build.xml Mon Oct 9 12:30:06 2006
@@ -89,6 +89,11 @@
<include name="${commons-logging.jar}"/>
<include name="${jdom.jar}"/>
<include name="${xstream.jar}"/>
+
+ <include name="${torque.jar}"/>
+ <include name="${village.jar}"/>
+ <include name="${commons-lang.jar}"/>
+ <include name="${commons-configuration.jar}"/>
</fileset>
<pathelement path="${java.class.path}" />
<pathelement path="${build.classes}" />
@@ -284,6 +289,7 @@
<fileset dir="${java.dir}">
<include name="**/*.properties"/>
<include name="**/*.xinfo"/>
+ <include name="**/*.xml"/>
<include name="**/*.mxinfo"/>
</fileset>
</copy>
@@ -463,6 +469,7 @@
<echo message="Making James Jar (james-${version}.jar)"/>
<jar jarfile="${build.lib}/${name}-${version}.jar"
basedir="${build.classes}" manifest="${src.dir}/Manifest.mf">
<include name="org/apache/james/**"/>
+ <include name="*.xml"/>
<metainf dir="${build.metainf}"/>
</jar>
@@ -519,6 +526,12 @@
<include name="${commons-logging.jar}"/>
<include name="${jdom.jar}"/>
<include name="${xstream.jar}"/>
+
+ <include name="${torque.jar}"/>
+ <include name="${village.jar}"/>
+ <include name="${commons-lang.jar}"/>
+ <include name="${commons-configuration.jar}"/>
+ <include name="${commons-beanutils.jar}"/>
</lib>
<zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
<include name="sqlResources.xml"/>
Modified: james/server/sandbox/imap-integration/include.properties
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/include.properties?view=diff&rev=454468&r1=454467&r2=454468
==============================================================================
--- james/server/sandbox/imap-integration/include.properties (original)
+++ james/server/sandbox/imap-integration/include.properties Mon Oct 9
12:30:06 2006
@@ -44,7 +44,7 @@
# ----- Commons -----
commons-dbcp.jar=commons-dbcp-1.2.1.jar
commons-pool.jar=commons-pool-1.2.jar
-commons-collections.jar=commons-collections-2.1.1.jar
+commons-collections.jar=commons-collections-3.1.jar
# ----- Jakarta ORO -----
jakarta-oro.jar=jakarta-oro-2.0.8.jar
@@ -95,5 +95,13 @@
commons-logging.jar=commons-logging.jar
jdom.jar=jdom.jar
xstream.jar=xstream.jar
+
+# ----- torque -----
+
+torque.jar=torque-3.2.jar
+village.jar=village-2.0.jar
+commons-lang.jar=commons-lang-2.1.jar
+commons-configuration.jar=commons-configuration-1.1.jar
+commons-beanutils.jar=commons-beanutils-1.7.0.jar
Modified: james/server/sandbox/imap-integration/src/conf/james-assembly.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/conf/james-assembly.xml?view=diff&rev=454468&r1=454467&r2=454468
==============================================================================
--- james/server/sandbox/imap-integration/src/conf/james-assembly.xml (original)
+++ james/server/sandbox/imap-integration/src/conf/james-assembly.xml Mon Oct
9 12:30:06 2006
@@ -38,6 +38,10 @@
role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />
</block>
+ <block name="mailboxmanager"
class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerProvider">
+
+ </block>
+
<!-- The James Spool Manager block -->
<block name="spoolmanager"
class="org.apache.james.transport.JamesSpoolManager" >
<provide name="spoolrepository"
role="org.apache.james.services.SpoolRepository"/>
@@ -92,6 +96,21 @@
<provide name="users-store" role="org.apache.james.services.UsersStore"/>
</block>
+ <!-- IMAP Server -->
+ <block name="imapserver" class="org.apache.james.imapserver.ImapServer" >
+ <provide name="localusersrepository"
role="org.apache.james.services.UsersRepository"/>
+ <provide name="sockets"
+
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
+ <provide name="connections"
+ role="org.apache.james.services.JamesConnectionManager"/>
+ <provide name="James" role="org.apache.james.services.MailServer"/>
+ <provide name="thread-manager"
+
role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
+ <provide name="mailboxmanager"
+
role="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" />
+ <provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
+ </block>
+
<!-- POP3 Server -->
<block name="pop3server" class="org.apache.james.pop3server.POP3Server" >
<provide name="localusersrepository"
role="org.apache.james.services.UsersRepository"/>
@@ -150,13 +169,22 @@
<provide name="dnsserver" role="org.apache.james.services.DNSServer"/>
</block>
- <!-- The High Level Storage 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="filesystem" role="org.apache.james.services.FileSystem" />
</block>
-
+ -->
+
+ <block name="mailstore"
class="org.apache.james.mailboxmanager.repository.MyAvalonMailStore" >
+ <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>
+
<!-- The main SpoolRepository -->
<block name="spoolrepository"
class="org.apache.james.mailrepository.MailStoreSpoolRepository" >
<provide name="mailstore"
Modified: james/server/sandbox/imap-integration/src/conf/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/conf/james-config.xml?view=diff&rev=454468&r1=454467&r2=454468
==============================================================================
--- james/server/sandbox/imap-integration/src/conf/james-config.xml (original)
+++ james/server/sandbox/imap-integration/src/conf/james-config.xml Mon Oct 9
12:30:06 2006
@@ -82,10 +82,10 @@
<!-- Alternative inbox repository definition for DB use. -->
<!-- Stores message body in file system, rest in database -->
- <!-- TEMPORARY DEFAULT: dbfile using Derby -->
+ <!-- TEMPORARY DEFAULT: dbfile using Derby
<inboxRepository>
<repository destinationURL="dbfile://maildb/inbox/" type="MAIL"/>
- </inboxRepository>
+ </inboxRepository> -->
<!-- TEMPORARY DEFAULT: dbfile using Derby -->
<!-- Alternative inbox repository definition for mbox use. -->
@@ -99,8 +99,32 @@
<repository destinationURL="mbox:///var/mail/" type="MAIL"/>
</inboxRepository>
-->
+
+ <inboxRepository>
+ <repository destinationURL="mailboxmanager://users/" type="MAIL">
+ <mailboxmanager
class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerProvider" />
+ </repository>
+ </inboxRepository>
</James>
-
+ <mailboxmanager>
+ <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>
+ </mailboxmanager>
+ <imapserver enabled="true">
+ <port>10143</port>
+ <handler>
+ <streamdump enabled="true" directory="../apps/james/streamdump" />
+ </handler>
+ </imapserver>
+
<!-- This is an example configuration for FetchMail, a JavaMail based
gateway -->
<!-- service that pulls messages from other sources, and inserts them into
the -->
<!-- spool. They are then processed normally, although FetchMail generally
-->
@@ -819,7 +843,7 @@
<pop3server enabled="true">
<!-- port 995 is the well-known/IANA registered port for POP3S ie over
SSL/TLS -->
<!-- port 110 is the well-known/IANA registered port for Standard POP3
-->
- <port>110</port>
+ <port>10110</port>
<!-- Uncomment this if you want to bind to a specific inetaddress -->
<!--
@@ -846,7 +870,7 @@
<!-- but does not free as many resources as removing them would -->
<smtpserver enabled="true">
<!-- port 25 is the well-known/IANA registered port for SMTP -->
- <port>25</port>
+ <port>10025</port>
<!-- Uncomment this if you want to bind to a specific inetaddress -->
<!-- Please NOTE: you should add this IP also to your
RemoteAddrNotInNetwork -->
@@ -941,7 +965,7 @@
service. -->
<!-- port 563 is the well-known/IANA registered port for NNTP over
SSL/TLS -->
<!-- port 119 is the well-known/IANA registered port for Standard NNTP
-->
- <port>119</port>
+ <port>10119</port>
<!-- Uncomment this if you want to bind to a specific inetaddress -->
<!--
@@ -1018,7 +1042,14 @@
<!-- The Mailstore block -->
<mailstore>
<repositories>
-
+ <repository
class="org.apache.james.mailboxmanager.repository.MailboxManagerMailRepository">
+ <protocols>
+ <protocol>mailboxmanager</protocol>
+ </protocols>
+ <types>
+ <type>MAIL</type>
+ </types>
+ </repository>
<!-- File based repositories. These repositories store all message
data -->
<!-- in the file system. -->
<repository
class="org.apache.james.mailrepository.AvalonMailRepository">
Modified: james/server/sandbox/imap-integration/src/conf/james-server.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/conf/james-server.xml?view=diff&rev=454468&r1=454467&r2=454468
==============================================================================
--- james/server/sandbox/imap-integration/src/conf/james-server.xml (original)
+++ james/server/sandbox/imap-integration/src/conf/james-server.xml Mon Oct 9
12:30:06 2006
@@ -29,6 +29,12 @@
<category name="" log-level="INFO">
<log-target id-ref="default"/>
</category>
+ <category name="mailboxmanager" log-level="DEBUG">
+ <log-target id-ref="mailboxmanager-target"/>
+ </category>
+ <category name="imapserver" log-level="DEBUG">
+ <log-target id-ref="imapserver-target"/>
+ </category>
<category name="mailetpackages" log-level="INFO">
<log-target id-ref="James-Mailet-target"/>
</category>
@@ -110,6 +116,28 @@
</or>
</rotation>
</file>
+ <file id="mailboxmanager-target">
+ <filename>${app.home}/logs/mailboxmanager</filename>
+ <format>%{time:dd/MM/yy HH:mm:ss} %5.5{priority} %{category}:
%{message}\n%{throwable}</format>
+ <append>true</append>
+ <rotation type="unique" pattern="-yyyy-MM-dd-HH-mm" suffix=".log">
+ <or>
+ <date>dd</date>
+ <size>10485760</size>
+ </or>
+ </rotation>
+ </file>
+ <file id="imapserver-target">
+ <filename>${app.home}/logs/imapserver</filename>
+ <format>%{time:dd/MM/yy HH:mm:ss} %5.5{priority} %{category}:
%{message}\n%{throwable}</format>
+ <append>true</append>
+ <rotation type="unique" pattern="-yyyy-MM-dd-HH-mm" suffix=".log">
+ <or>
+ <date>dd</date>
+ <size>10485760</size>
+ </or>
+ </rotation>
+ </file>
<file id="James-Mailet-target">
<filename>${app.home}/logs/mailet</filename>
<format>%{time:dd/MM/yy HH:mm:ss} %5.5{priority} %{category}:
%{message}\n%{throwable}</format>
Modified:
james/server/sandbox/imap-integration/src/java/org/apache/james/imapserver/ImapServer.xinfo
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/java/org/apache/james/imapserver/ImapServer.xinfo?view=diff&rev=454468&r1=454467&r2=454468
==============================================================================
---
james/server/sandbox/imap-integration/src/java/org/apache/james/imapserver/ImapServer.xinfo
(original)
+++
james/server/sandbox/imap-integration/src/java/org/apache/james/imapserver/ImapServer.xinfo
Mon Oct 9 12:30:06 2006
@@ -1,35 +1,38 @@
-<?xml version="1.0"?>
-
-<blockinfo>
-
- <!-- section to describe block -->
- <block>
- <version>1.0</version>
- </block>
-
- <dependencies>
- <dependency>
- <service
name="org.apache.james.mailboxmanager.manager.MailboxManagerProvider"
version="1.0"/>
- </dependency>
- <dependency>
- <service name="org.apache.james.services.UsersRepository" version="1.0"/>
- </dependency>
- <dependency>
- <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
- </dependency>
- <dependency>
- <service
name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
version="1.0"/>
- </dependency>
- <dependency>
- <service name="org.apache.james.services.MailServer" version="1.0"/>
- </dependency>
- <dependency>
- <service
name="org.apache.avalon.cornerstone.services.threads.ThreadManager"
version="1.0"/>
- </dependency>
- <!--
- <dependency>
- <service name="org.apache.james.imapserver.ImapHost" version="1.0"/>
- </dependency>
- -->
- </dependencies>
-</blockinfo>
+<?xml version="1.0"?>
+
+<blockinfo>
+
+ <!-- section to describe block -->
+ <block>
+ <version>1.0</version>
+ </block>
+
+ <dependencies>
+ <dependency>
+ <service
name="org.apache.james.mailboxmanager.manager.MailboxManagerProvider"
version="1.0"/>
+ </dependency>
+ <dependency>
+ <service name="org.apache.james.services.UsersRepository" version="1.0"/>
+ </dependency>
+ <dependency>
+ <service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
+ </dependency>
+ <dependency>
+ <service
name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
version="1.0"/>
+ </dependency>
+ <dependency>
+ <service name="org.apache.james.services.MailServer" version="1.0"/>
+ </dependency>
+ <dependency>
+ <service
name="org.apache.avalon.cornerstone.services.threads.ThreadManager"
version="1.0"/>
+ </dependency>
+ <dependency>
+ <service name="org.apache.james.services.DNSServer" version="1.0"/>
+ </dependency>
+ <!--
+ <dependency>
+ <service name="org.apache.james.imapserver.ImapHost" version="1.0"/>
+ </dependency>
+ -->
+ </dependencies>
+</blockinfo>
Added:
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/repository/MyAvalonMailStore.xinfo
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/repository/MyAvalonMailStore.xinfo?view=auto&rev=454468
==============================================================================
---
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/repository/MyAvalonMailStore.xinfo
(added)
+++
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/repository/MyAvalonMailStore.xinfo
Mon Oct 9 12:30:06 2006
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<blockinfo>
+
+ <!-- section to describe block -->
+ <block>
+ <version>1.0</version>
+ </block>
+
+ <!-- services that are offered by this block -->
+ <services>
+ <service name="org.apache.avalon.cornerstone.services.store.Store"
version="1.0" />
+ </services>
+
+ <dependencies>
+ <dependency>
+ <service
name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"
version="1.0"/>
+ </dependency>
+ <dependency>
+ <service
name="org.apache.james.mailboxmanager.manager.MailboxManagerProvider"
version="1.0"/>
+ </dependency>
+ <dependency>
+ <service name="org.apache.james.services.FileSystem" version="1.0"/>
+ </dependency>
+ </dependencies>
+</blockinfo>
+
+
Added:
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.xinfo
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.xinfo?view=auto&rev=454468
==============================================================================
---
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.xinfo
(added)
+++
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.xinfo
Mon Oct 9 12:30:06 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<blockinfo>
+
+ <!-- section to describe block -->
+ <block>
+ <version>1.0</version>
+ </block>
+
+ <!-- services that are offered by this block -->
+ <services>
+ <service
name="org.apache.james.mailboxmanager.manager.MailboxManagerProvider"
version="1.0" />
+ </services>
+
+ <dependencies>
+ </dependencies>
+
+</blockinfo>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
