Author: bago
Date: Wed Oct 11 04:19:07 2006
New Revision: 462771
URL: http://svn.apache.org/viewvc?view=rev&rev=462771
Log:
Removed custom SqlResources.java to use the shared one.
Added the dependency to FileSystem so the sql file is searched in the right
path.
Moved the mailboxManagerSql from the root package to the src/conf folder.
Updated build.xml to copy the file in the right folder of the generated sar.
Updated pom.xml to be able to build/clover this.
Overall coverage is 33.3% ...
Added:
james/server/sandbox/imap-integration/src/conf/mailboxManagerSqlResources.xml
- copied, changed from r462748,
james/server/sandbox/imap-integration/src/java/mailboxManagerSql.xml
Removed:
james/server/sandbox/imap-integration/src/java/mailboxManagerSql.xml
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/util/SqlResources.java
Modified:
james/server/sandbox/imap-integration/build.xml
james/server/sandbox/imap-integration/pom.xml
james/server/sandbox/imap-integration/src/conf/james-assembly.xml
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.xinfo
james/server/sandbox/imap-integration/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
james/server/sandbox/imap-integration/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
Modified: james/server/sandbox/imap-integration/build.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/build.xml?view=diff&rev=462771&r1=462770&r2=462771
==============================================================================
--- james/server/sandbox/imap-integration/build.xml (original)
+++ james/server/sandbox/imap-integration/build.xml Wed Oct 11 04:19:07 2006
@@ -536,6 +536,9 @@
<zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
<include name="sqlResources.xml"/>
</zipfileset>
+ <zipfileset dir="${conf.dir}"
fullpath="conf/mailboxManagerSqlResources.xml">
+ <include name="mailboxManagerSqlResources.xml"/>
+ </zipfileset>
<zipfileset dir="${conf.dir}" fullpath="conf/james-fetchmail.xml">
<include name="james-fetchmail.xml"/>
</zipfileset>
Modified: james/server/sandbox/imap-integration/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/pom.xml?view=diff&rev=462771&r1=462770&r2=462771
==============================================================================
--- james/server/sandbox/imap-integration/pom.xml (original)
+++ james/server/sandbox/imap-integration/pom.xml Wed Oct 11 04:19:07 2006
@@ -411,6 +411,11 @@
<groupId>jndi</groupId>
<artifactId>jndi</artifactId>
</exclusion>
+ <!-- this would require an older version of avalon and james would not
build -->
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
<exclusion>
<groupId>javax.sql</groupId>
<artifactId>jdbc-stdext</artifactId>
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=462771&r1=462770&r2=462771
==============================================================================
--- james/server/sandbox/imap-integration/src/conf/james-assembly.xml (original)
+++ james/server/sandbox/imap-integration/src/conf/james-assembly.xml Wed Oct
11 04:19:07 2006
@@ -39,7 +39,7 @@
</block>
<block name="mailboxmanager"
class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerProvider">
-
+ <provide name="filesystem" role="org.apache.james.services.FileSystem" />
</block>
<!-- The James Spool Manager block -->
Copied:
james/server/sandbox/imap-integration/src/conf/mailboxManagerSqlResources.xml
(from r462748,
james/server/sandbox/imap-integration/src/java/mailboxManagerSql.xml)
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/conf/mailboxManagerSqlResources.xml?view=diff&rev=462771&p1=james/server/sandbox/imap-integration/src/java/mailboxManagerSql.xml&r1=462748&p2=james/server/sandbox/imap-integration/src/conf/mailboxManagerSqlResources.xml&r2=462771
==============================================================================
(empty)
Modified:
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java?view=diff&rev=462771&r1=462770&r2=462771
==============================================================================
---
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java
(original)
+++
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java
Wed Oct 11 04:19:07 2006
@@ -13,6 +13,9 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.logging.Log;
@@ -28,14 +31,15 @@
import org.apache.james.mailboxmanager.torque.om.MessageHeaderPeer;
import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
import org.apache.james.mailboxmanager.tracking.MailboxCache;
-import org.apache.james.mailboxmanager.util.SqlResources;
+import org.apache.james.services.FileSystem;
import org.apache.james.services.User;
+import org.apache.james.util.SqlResources;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Transaction;
-public class TorqueMailboxManagerProvider implements MailboxManagerProvider,
Initializable, Configurable, LogEnabled {
+public class TorqueMailboxManagerProvider implements MailboxManagerProvider,
Initializable, Configurable, LogEnabled, Serviceable {
private MailboxCache mailboxCache;
@@ -45,6 +49,8 @@
private Log log;
+ private FileSystem fileSystem;
+
private static final String[] tableNames= new String[]
{MailboxRowPeer.TABLE_NAME,MessageRowPeer.TABLE_NAME,MessageHeaderPeer.TABLE_NAME,MessageBodyPeer.TABLE_NAME,MessageFlagsPeer.TABLE_NAME};
public MailboxManager getMailboxManagerInstance(User user,Class
neededClass)
@@ -70,7 +76,7 @@
Torque.init(torqueConf);
conn=Transaction.begin(MailboxRowPeer.DATABASE_NAME);
SqlResources sqlResources=new SqlResources();
-
sqlResources.init(getClass().getResource("/mailboxManagerSql.xml"),
getClass().getName(), conn, new HashMap());
+
sqlResources.init(fileSystem.getFile("file://conf/mailboxManagerSqlResources.xml"),
TorqueMailboxManagerProvider.class.getName(), conn, new HashMap());
DatabaseMetaData dbMetaData=conn.getMetaData();
@@ -187,9 +193,18 @@
}
return log;
}
+
public void enableLogging(Logger logger) {
log=new AvalonLogger(logger);
+ }
+
+ public void service(ServiceManager arg0) throws ServiceException {
+ setFileSystem((FileSystem) arg0.lookup(FileSystem.ROLE));
+ }
+
+ protected void setFileSystem(FileSystem system) {
+ this.fileSystem = system;
}
Modified:
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=diff&rev=462771&r1=462770&r2=462771
==============================================================================
---
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.xinfo
(original)
+++
james/server/sandbox/imap-integration/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.xinfo
Wed Oct 11 04:19:07 2006
@@ -13,6 +13,9 @@
</services>
<dependencies>
+ <dependency>
+ <service name="org.apache.james.services.FileSystem" version="1.0"/>
+ </dependency>
</dependencies>
</blockinfo>
Modified:
james/server/sandbox/imap-integration/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java?view=diff&rev=462771&r1=462770&r2=462771
==============================================================================
---
james/server/sandbox/imap-integration/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
(original)
+++
james/server/sandbox/imap-integration/src/test/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
Wed Oct 11 04:19:07 2006
@@ -6,7 +6,7 @@
public class MailboxManagerProviderSingleton {
public synchronized static MailboxManagerProvider
getMailboxManagerProviderInstance() throws Exception {
- return
TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
+ return
TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
}
}
Modified:
james/server/sandbox/imap-integration/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/imap-integration/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java?view=diff&rev=462771&r1=462770&r2=462771
==============================================================================
---
james/server/sandbox/imap-integration/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
(original)
+++
james/server/sandbox/imap-integration/src/test/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
Wed Oct 11 04:19:07 2006
@@ -1,6 +1,7 @@
package org.apache.james.mailboxmanager.mock;
import org.apache.james.mailboxmanager.torque.TorqueMailboxManagerProvider;
+import org.apache.james.test.mock.james.MockFileSystem;
public class TorqueMailboxManagerProviderSingleton {
@@ -9,7 +10,9 @@
public synchronized static TorqueMailboxManagerProvider
getTorqueMailboxManagerProviderInstance() throws Exception {
if (torqueMailboxManagerProvider==null) {
- torqueMailboxManagerProvider=new TorqueMailboxManagerProvider();
+ torqueMailboxManagerProvider=new TorqueMailboxManagerProvider() {{
+ setFileSystem(new MockFileSystem());
+ }};
torqueMailboxManagerProvider.configureDefaults();
torqueMailboxManagerProvider.initialize();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
