Author: norman
Date: Sat Jan 9 22:14:00 2010
New Revision: 897562
URL: http://svn.apache.org/viewvc?rev=897562&view=rev
Log:
No need to config torque.properties location from 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=897562&r1=897561&r2=897562&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
Sat Jan 9 22:14:00 2010
@@ -72,6 +72,10 @@
this.fileSystem = fileSystem;
}
+ public void setTorqueConfig(String torqueFile) {
+ this.torqueFile = torqueFile;
+ }
+
@PostConstruct
public void init() throws Exception {
if (Torque.isInit()) {
@@ -121,8 +125,6 @@
throws ConfigurationException {
configFile = conf.getString("configFile",null);
if (configFile == null) configFile =
"file://conf/mailboxManagerSqlResources.xml";
- torqueFile = conf.getString("torqueConfigFile",null);
- if (torqueFile == null) torqueFile = "file://conf/torque.properties";
}
private boolean tableExists(DatabaseMetaData dbMetaData, String 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=897562&r1=897561&r2=897562&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
Sat Jan 9 22:14:00 2010
@@ -1125,9 +1125,7 @@
</handler>
<configFile>file://conf/mailboxManagerSqlResources.xml</configFile>
-
- <!-- File which holds the torque configuration -->
- <torqueConfigFile>file://conf/torque.properties</torqueConfigFile>
+
</imapserver>
<!-- The NNTP server is enabled by default -->
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=897562&r1=897561&r2=897562&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
Sat Jan 9 22:14:00 2010
@@ -340,8 +340,9 @@
</bean>
<bean id="mailboxmanager"
class="org.apache.james.mailboxmanager.torque.DefaultMailboxManager">
- <constructor-arg index="0" ref="authenticator"/>
- <constructor-arg index="1" ref="subscriper"/>
+ <constructor-arg index="0" ref="authenticator"/>
+ <constructor-arg index="1" ref="subscriper"/>
+ <property name="torqueConfig" value="file://conf/torque.properties" />
</bean>
<!-- Enable this for JPA implementation -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
