Author: norman
Date: Sun Jan 24 15:23:48 2010
New Revision: 902583
URL: http://svn.apache.org/viewvc?rev=902583&view=rev
Log:
move torque specific config out of james-config.xml
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManager.java
james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManager.java?rev=902583&r1=902582&r2=902583&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManager.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/mailboxmanager/torque/DefaultMailboxManager.java
Sun Jan 24 15:23:48 2010
@@ -29,15 +29,12 @@
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.logging.Log;
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.Authenticator;
import org.apache.james.imap.store.Subscriber;
-import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.james.mailboxmanager.torque.om.MessageBodyPeer;
@@ -51,7 +48,7 @@
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Transaction;
-public class DefaultMailboxManager extends TorqueMailboxManager implements
Configurable, LogEnabled{
+public class DefaultMailboxManager extends TorqueMailboxManager implements
LogEnabled{
private static final String[] tableNames = new String[] {
MailboxRowPeer.TABLE_NAME, MessageRowPeer.TABLE_NAME,
@@ -76,6 +73,10 @@
this.torqueFile = torqueFile;
}
+ public void setSqlFile(String configFile) {
+ this.configFile = configFile;
+ }
+
@PostConstruct
public void init() throws Exception {
if (Torque.isInit()) {
@@ -116,17 +117,6 @@
}
}
-
- /*
- * (non-Javadoc)
- * @see
org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
- */
- public void configure(HierarchicalConfiguration conf)
- throws ConfigurationException {
- configFile = conf.getString("configFile",null);
- if (configFile == null) configFile =
"file://conf/mailboxManagerSqlResources.xml";
- }
-
private boolean tableExists(DatabaseMetaData dbMetaData, String tableName)
throws SQLException {
return (tableExistsCaseSensitive(dbMetaData, tableName)
Modified:
james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-config.xml?rev=902583&r1=902582&r2=902583&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
Sun Jan 24 15:23:48 2010
@@ -1117,8 +1117,6 @@
<connectiontimeout>360000</connectiontimeout>
</handler>
- <configFile>file://conf/mailboxManagerSqlResources.xml</configFile>
-
</imapserver>
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=902583&r1=902582&r2=902583&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Sun Jan 24 15:23:48 2010
@@ -255,6 +255,7 @@
<constructor-arg index="0" ref="authenticator"/>
<constructor-arg index="1" ref="subscriper"/>
<property name="torqueConfig" value="file://conf/torque.properties" />
+ <property name="sqlFile"
value="file://conf/mailboxManagerSqlResources.xml"/>
</bean>
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
