Index: spring-deployment/src/main/config/james/james-config.xml
===================================================================
--- spring-deployment/src/main/config/james/james-config.xml	(revision 667185)
+++ spring-deployment/src/main/config/james/james-config.xml	(working copy)
@@ -128,6 +128,8 @@
       <!-- will use the specified value. -->
       <!-- Set the default helloName which is used in all services if not overridden in the specific service-->
       <helloName autodetect="true">myMailServer</helloName>
+       <!-- according to the James code the need for this might be a temporary hack -->
+       <configuration-directory>file://conf</configuration-directory>
    </James>
 
     <!--
@@ -140,6 +142,7 @@
         </namespaces>
         <factory
             class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
+                   <configFile>file://conf/mailboxManagerSqlResources.xml</configFile>
                    <torque-properties>
                        <property name="torque.database.default"
                            value="mailboxmanager"/>
@@ -909,6 +912,7 @@
    <!-- This is needed by the RemoteManager to enable the BayesianAnaylyzerManagement commands --> 
    <bayesiananalyzermanagement> 
       <repositoryPath> db://maildb </repositoryPath>
+      <sqlFile>file://conf/sqlResources.xml</sqlFile>
    </bayesiananalyzermanagement>  
     
 
Index: phoenix-deployment/src/test/org/apache/james/mailboxmanager/testdata/VirtualRepositoryMix.xml
===================================================================
--- phoenix-deployment/src/test/org/apache/james/mailboxmanager/testdata/VirtualRepositoryMix.xml	(revision 667185)
+++ phoenix-deployment/src/test/org/apache/james/mailboxmanager/testdata/VirtualRepositoryMix.xml	(working copy)
@@ -53,6 +53,7 @@
 					<point point="#mail"/>
 					<target
 						class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
+                                                <configFile name="file://conf/mailboxManagerSqlResources.xml"/>
 						<torque-properties>
 							<property name="torque.database.default"
 								value="mailboxmanager"/>
Index: phoenix-deployment/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java
===================================================================
--- phoenix-deployment/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java	(revision 667185)
+++ phoenix-deployment/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerFactory.java	(working copy)
@@ -60,6 +60,7 @@
     private boolean initialized;
 
     private FileSystem fileSystem;
+    private String configFile;
 
     private static final String[] tableNames = new String[] {
             MailboxRowPeer.TABLE_NAME, MessageRowPeer.TABLE_NAME,
@@ -80,7 +81,7 @@
                 conn = Transaction.begin(MailboxRowPeer.DATABASE_NAME);
                 SqlResources sqlResources = new SqlResources();
                 sqlResources.init(fileSystem
-                        .getResource("file://conf/mailboxManagerSqlResources.xml"),
+                        .getResource(configFile),
                         TorqueMailboxManagerFactory.class.getName(), conn,
                         new HashMap());
 
@@ -119,10 +120,11 @@
 
     public void configureDefaults()
             throws org.apache.commons.configuration.ConfigurationException {
-        File configFile = new File("torque.properties");
-        if (configFile.canRead()) {
+        configFile = "file://conf/mailboxManagerSqlResources.xml";
+        File torqueConfigFile = new File("torque.properties");
+        if (torqueConfigFile.canRead()) {
             getLog().info("reading torque.properties...");
-            torqueConf = new PropertiesConfiguration(configFile);
+            torqueConf = new PropertiesConfiguration(torqueConfigFile);
         } else {
             torqueConf = new BaseConfiguration();
             torqueConf.addProperty("torque.database.default", "mailboxmanager");
@@ -156,6 +158,7 @@
             torqueConf.addProperty(tps[i].getAttribute("name"), tps[i]
                     .getAttribute("value"));
         }
+        configFile = conf.getChild("configFile").getValue();
     }
 
     private boolean tableExists(DatabaseMetaData dbMetaData, String tableName)
Index: phoenix-deployment/src/conf/james-config.xml
===================================================================
--- phoenix-deployment/src/conf/james-config.xml	(revision 667185)
+++ phoenix-deployment/src/conf/james-config.xml	(working copy)
@@ -133,6 +133,8 @@
       <!-- will use the specified value. -->
       <!-- Set the default helloName which is used in all services if not overridden in the specific service-->
       <helloName autodetect="true">myMailServer</helloName>
+      <!-- according to the James code the need for this might be a temporary hack -->
+      <configuration-directory>file://conf</configuration-directory>
    </James>
 
     <!--
@@ -145,6 +147,7 @@
         </namespaces>
         <factory
             class="org.apache.james.mailboxmanager.torque.TorqueMailboxManagerFactory">
+                   <configFile>file://conf/mailboxManagerSqlResources.xml</configFile>
                    <torque-properties>
                        <property name="torque.database.default"
                            value="mailboxmanager"/>
@@ -944,7 +947,8 @@
    <!-- This is needed by the RemoteManager to enable the BayesianAnaylyzerManagement commands --> 
    <bayesiananalyzermanagement> 
       <repositoryPath> db://maildb </repositoryPath>
-   </bayesiananalyzermanagement>  
+      <sqlFile>file://conf/sqlResources.xml</sqlFile>
+   </bayesiananalyzermanagement>
     
 
    <!-- The RemoteManager server is enabled by default -->
Index: spoolmanager-function/src/main/java/org/apache/james/James.java
===================================================================
--- spoolmanager-function/src/main/java/org/apache/james/James.java	(revision 667185)
+++ spoolmanager-function/src/main/java/org/apache/james/James.java	(working copy)
@@ -301,7 +301,8 @@
         attributes.put(Constants.AVALON_COMPONENT_MANAGER, compMgr);
 
         //Temporary get out to allow complex mailet config files to stop blocking sergei sozonoff's work on bouce processing
-        java.io.File configDir = fileSystem.getFile("file://conf/");
+        String confDir = conf.getChild("configuration-directory").getValue();
+        java.io.File configDir = fileSystem.getFile(confDir);
         attributes.put("confDir", configDir.getCanonicalPath());
 
         try {
Index: core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java
===================================================================
--- core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java	(revision 667185)
+++ core-library/src/main/java/org/apache/james/management/BayesianAnalyzerManagement.java	(working copy)
@@ -63,7 +63,7 @@
     private DataSourceSelector selector;
     private DataSourceComponent component;
     private String repos;
-    private String sqlFileUrl = "file://conf/sqlResources.xml";
+    private String sqlFileUrl;
     private FileSystem fileSystem;
     
     /**
@@ -103,6 +103,7 @@
         if (reposPath != null) {
             setRepositoryPath(reposPath.getValue());
         }
+        sqlFileUrl = arg0.getChild("sqlFile").getValue();
     }
     
     /**