You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/10/21 08:49:14 UTC
svn commit: r1025851 - in /james/server/trunk:
core-api/src/main/java/org/apache/james/services/
core-library/src/test/java/org/apache/james/util/
domain-jdbc/src/main/java/org/apache/james/domain/
domain-jdbc/src/test/java/org/apache/james/domain/ mai...
Author: norman
Date: Thu Oct 21 06:49:13 2010
New Revision: 1025851
URL: http://svn.apache.org/viewvc?rev=1025851&view=rev
Log:
Remove DataSourceSelector interfface and implementation (JAMES-1073)
Removed:
james/server/trunk/core-api/src/main/java/org/apache/james/services/DataSourceSelector.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringDataSourceSelector.java
Modified:
james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java
james/server/trunk/domain-jdbc/src/main/java/org/apache/james/domain/JDBCDomainList.java
james/server/trunk/domain-jdbc/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java Thu Oct 21 06:49:13 2010
@@ -21,7 +21,6 @@ package org.apache.james.util;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.derby.jdbc.EmbeddedDriver;
-import org.apache.james.services.DataSourceSelector;
import java.io.IOException;
@@ -87,24 +86,13 @@ public class TestUtil {
* @return
* @throws Exception
*/
- public static DataSourceSelector getDataSourceSelector() throws Exception {
- DataSourceSelector dataSourceSelector = new DataSourceSelector() {
-
- public DataSource getDataSource(String name) {
- if (name.equals("maildb")) {
- BasicDataSource ds = new BasicDataSource();
- ds.setDriverClassName(EmbeddedDriver.class.getName());
- ds.setUrl("jdbc:derby:target/testdb;create=true");
- ds.setUsername("james");
- ds.setPassword("james");
- return ds;
- }
- return null;
- }
-
- };
-
- return dataSourceSelector;
+ public static DataSource getDataSource() throws Exception {
+ BasicDataSource ds = new BasicDataSource();
+ ds.setDriverClassName(EmbeddedDriver.class.getName());
+ ds.setUrl("jdbc:derby:target/testdb;create=true");
+ ds.setUsername("james");
+ ds.setPassword("james");
+ return ds;
}
Modified: james/server/trunk/domain-jdbc/src/main/java/org/apache/james/domain/JDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-jdbc/src/main/java/org/apache/james/domain/JDBCDomainList.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/domain-jdbc/src/main/java/org/apache/james/domain/JDBCDomainList.java (original)
+++ james/server/trunk/domain-jdbc/src/main/java/org/apache/james/domain/JDBCDomainList.java Thu Oct 21 06:49:13 2010
@@ -39,7 +39,6 @@ import javax.sql.DataSource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.lifecycle.Configurable;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
@@ -51,12 +50,10 @@ import org.apache.james.util.sql.SqlReso
*/
public class JDBCDomainList extends AbstractDomainList implements Configurable{
- private DataSourceSelector datasources;
- private DataSource dataSourceComponent;
+ private DataSource dataSource;
private FileSystem fileSystem;
private String tableName = null;
- private String dataSourceName = null;
/**
* Contains all of the sql strings for this component.
@@ -79,17 +76,12 @@ public class JDBCDomainList extends Abst
public void configure(HierarchicalConfiguration configuration) throws ConfigurationException{
this.configuration = configuration;
}
-
- public void setDataSource(DataSource dataSourceComponent) {
- this.dataSourceComponent = dataSourceComponent;
- }
-
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector datasources) {
- this.datasources = datasources;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource dataSource) {
+ this.dataSource = dataSource;
}
-
+
@Resource(name="filesystem")
public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
@@ -129,7 +121,6 @@ public class JDBCDomainList extends Abst
.append(configuration.getString("repositoryPath"));
throw new ConfigurationException(exceptionBuffer.toString());
}
- dataSourceName = (String)urlParams.get(0);
tableName = (String)urlParams.get(1);
@@ -152,16 +143,14 @@ public class JDBCDomainList extends Abst
@PostConstruct
public void init() throws Exception {
configure();
-
- setDataSource(datasources.getDataSource(dataSourceName));
-
+
StringBuffer logBuffer = null;
if (getLogger().isDebugEnabled()) {
getLogger().debug(this.getClass().getName() + ".initialize()");
}
// Test the connection to the database, by getting the DatabaseMetaData.
- Connection conn = dataSourceComponent.getConnection();
+ Connection conn = dataSource.getConnection();
PreparedStatement createStatement = null;
try {
@@ -244,7 +233,7 @@ public class JDBCDomainList extends Abst
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString("selectDomains", true));
ResultSet mappingRS = null;
@@ -281,7 +270,7 @@ public class JDBCDomainList extends Abst
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString("selectDomain", true));
ResultSet mappingRS = null;
@@ -312,7 +301,7 @@ public class JDBCDomainList extends Abst
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString("addDomain", true));
ResultSet mappingRS = null;
@@ -341,7 +330,7 @@ public class JDBCDomainList extends Abst
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString("removeDomain", true));
ResultSet mappingRS = null;
Modified: james/server/trunk/domain-jdbc/src/test/java/org/apache/james/domain/JDBCDomainListTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-jdbc/src/test/java/org/apache/james/domain/JDBCDomainListTest.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/domain-jdbc/src/test/java/org/apache/james/domain/JDBCDomainListTest.java (original)
+++ james/server/trunk/domain-jdbc/src/test/java/org/apache/james/domain/JDBCDomainListTest.java Thu Oct 21 06:49:13 2010
@@ -38,7 +38,6 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.MockDNSService;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.MockFileSystem;
import org.apache.james.util.TestUtil;
import org.apache.james.util.sql.JDBCUtil;
@@ -46,12 +45,10 @@ import org.apache.james.util.sql.JDBCUti
public class JDBCDomainListTest extends TestCase {
private String repos = "db://maildb/";
private String table = "costumTable";
- private DataSourceSelector dataSource;
private DataSource data;
public void setUp() throws Exception {
- dataSource = TestUtil.getDataSourceSelector();
- data = dataSource.getDataSource("maildb");
+ data = TestUtil.getDataSource();
sqlQuery("create table " + table + " (domain VARCHAR (255))");
}
@@ -124,7 +121,7 @@ public class JDBCDomainListTest extends
JDBCDomainList dom = new JDBCDomainList();
dom.setDNSService(setUpDNSServer("localhost"));
dom.setFileSystem(new MockFileSystem());
- dom.setDataSourceSelector(dataSource);
+ dom.setDataSource(data);
dom.setLog(new SimpleLog("MockLog"));
dom.configure(setUpConfiguration(repos + table));
dom.init();
@@ -143,7 +140,7 @@ public class JDBCDomainListTest extends
JDBCDomainList dom = new JDBCDomainList();
dom.setDNSService(setUpDNSServer("localhost"));
dom.setFileSystem(new MockFileSystem());
- dom.setDataSourceSelector(dataSource);
+ dom.setDataSource(data);
dom.setLog(new SimpleLog("MockLog"));
dom.configure(new DefaultConfigurationBuilder());
try {
Modified: james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java (original)
+++ james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java Thu Oct 21 06:49:13 2010
@@ -28,7 +28,6 @@ import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageWrapper;
import org.apache.james.repository.StreamRepository;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
@@ -102,10 +101,6 @@ public class JDBCMailRepository
*/
private StreamRepository sr = null;
- /**
- * The selector used to obtain the JDBC datasource
- */
- protected DataSourceSelector datasources;
/**
* The JDBC datasource that provides the JDBC connection
@@ -143,9 +138,9 @@ public class JDBCMailRepository
private String destination;
- @Resource(name="database-connections")
- public void setDatasources(DataSourceSelector datasources) {
- this.datasources = datasources;
+ @Resource(name="datasource")
+ public void setDatasource(DataSource datasource) {
+ this.datasource = datasource;
}
@@ -281,8 +276,7 @@ public class JDBCMailRepository
JDBCMailRepository.this.getLogger().warn("JDBCMailRepository: " + logString);
}
};
- // Get the data-source required.
- datasource = datasources.getDataSource(datasourceName);
+
// Test the connection to the database, by getting the DatabaseMetaData.
Connection conn = datasource.getConnection();
Modified: james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java (original)
+++ james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/JDBCMailRepositoryTest.java Thu Oct 21 06:49:13 2010
@@ -20,11 +20,12 @@
package org.apache.james.mailrepository;
+import javax.sql.DataSource;
+
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.filepair.FilePersistentStreamRepository;
import org.apache.james.mailstore.MockMailStore;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.MockFileSystem;
import org.apache.james.util.TestUtil;
@@ -38,7 +39,7 @@ public class JDBCMailRepositoryTest exte
*/
protected MailRepository getMailRepository() throws Exception {
MockFileSystem fs = new MockFileSystem();
- DataSourceSelector selector = TestUtil.getDataSourceSelector();
+ DataSource datasource = TestUtil.getDataSource();
JDBCMailRepository mr = new JDBCMailRepository();
// only used for dbfile
@@ -58,7 +59,7 @@ public class JDBCMailRepositoryTest exte
defaultConfiguration.addProperty("[@type]","MAIL");
mr.setFileSystem(fs);
mr.setStore(mockStore);
- mr.setDatasources(selector);
+ mr.setDatasource(datasource);
mr.setLog(new SimpleLog("MockLog"));
mr.configure(defaultConfiguration);
mr.init();
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java Thu Oct 21 06:49:13 2010
@@ -34,7 +34,6 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.sql.DataSource;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
import org.apache.james.util.sql.JDBCUtil;
@@ -156,8 +155,6 @@ extends GenericMailet {
*/
private long lastCorpusLoadTime;
- private DataSourceSelector selector;
-
private FileSystem fs;
/**
@@ -187,9 +184,9 @@ extends GenericMailet {
return this.lastCorpusLoadTime;
}
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector selector) {
- this.selector = selector;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource datasource) {
+ this.datasource = datasource;
}
@Resource(name="filesystem")
@@ -246,17 +243,7 @@ extends GenericMailet {
}
private void initDb() throws MessagingException {
-
- try {
- // Get the data-source required.
- int stindex = repositoryPath.indexOf("://") + 3;
-
- String datasourceName = repositoryPath.substring(stindex);
-
- datasource = selector.getDataSource(datasourceName);
- } catch (Exception e) {
- throw new MessagingException("Can't get datasource", e);
- }
+
try {
analyzer.initSqlQueries(datasource.getConnection(), fs.getFile("file://conf/sqlResources.xml"));
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java Thu Oct 21 06:49:13 2010
@@ -33,7 +33,6 @@ import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.sql.DataSource;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
import org.apache.james.util.bayesian.JDBCBayesianAnalyzer;
import org.apache.james.util.sql.JDBCUtil;
@@ -144,8 +143,6 @@ extends GenericMailet {
*/
private int maxSize = 100000;
- private DataSourceSelector selector;
-
private FileSystem fs;
/**
@@ -158,9 +155,9 @@ extends GenericMailet {
}
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector selector) {
- this.selector = selector;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource datasource) {
+ this.datasource = datasource;
}
/**
@@ -204,17 +201,7 @@ extends GenericMailet {
}
private void initDb() throws MessagingException {
-
- try {
- // Get the data-source required.
- int stindex = repositoryPath.indexOf("://") + 3;
-
- String datasourceName = repositoryPath.substring(stindex);
-
- datasource = selector.getDataSource(datasourceName);
- } catch (Exception e) {
- throw new MessagingException("Can't get datasource", e);
- }
+
try {
analyzer.initSqlQueries(datasource.getConnection(), fs.getFile("file://conf/sqlResources.xml"));
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java Thu Oct 21 06:49:13 2010
@@ -21,7 +21,6 @@
package org.apache.james.transport.mailets;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
@@ -58,12 +57,11 @@ public class JDBCAlias extends GenericMa
protected DataSource datasource;
protected String query = null;
- private DataSourceSelector selector;
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector selector) {
- this.selector = selector;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource datasource) {
+ this.datasource = datasource;
}
// The JDBCUtil helper class
@@ -93,10 +91,7 @@ public class JDBCAlias extends GenericMa
throw new MailetException("target_column not specified for JDBCAlias");
}
try {
-
- // Get the data-source required.
- datasource = selector.getDataSource(datasourceName);
-
+
conn = datasource.getConnection();
// Check if the required table exists. If not, complain.
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java Thu Oct 21 06:49:13 2010
@@ -21,7 +21,6 @@
package org.apache.james.transport.mailets;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
@@ -46,7 +45,6 @@ import java.util.Vector;
* the table name to check (or view) along with the source and target columns
* to use. For example,
* <mailet match="All" class="JDBCListserv">
- * <data_source>maildb</datasource>
* <listserv_id>mylistserv</listserv_id>
* <listserv_table>source_email_address</listserv_table>
* <members_table>target_email_address</members_table>
@@ -76,12 +74,11 @@ public class JDBCListserv extends Generi
//Queries to DB
protected String listservQuery = null;
protected String membersQuery = null;
- private DataSourceSelector selector;
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector selector) {
- this.selector = selector;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource datasource) {
+ this.datasource = datasource;
}
/**
@@ -111,7 +108,6 @@ public class JDBCListserv extends Generi
throw new MailetException("members_table not specified for JDBCListserv");
}
- String datasourceName = getInitParameter("data_source");
listservID = getInitParameter("listserv_id");
listservTable = getInitParameter("listserv_table");
membersTable = getInitParameter("members_table");
@@ -127,8 +123,7 @@ public class JDBCListserv extends Generi
Connection conn = null;
try {
- // Get the data-source required.
- datasource = selector.getDataSource(datasourceName);
+
conn = datasource.getConnection();
@@ -141,9 +136,7 @@ public class JDBCListserv extends Generi
new StringBuffer(128)
.append("Could not find table '")
.append(listservTable)
- .append("' in datasource '")
- .append(datasourceName)
- .append("'");
+ .append("' in datasource");
throw new MailetException(exceptionBuffer.toString());
}
@@ -155,9 +148,7 @@ public class JDBCListserv extends Generi
new StringBuffer(128)
.append("Could not find table '")
.append(membersTable)
- .append("' in datasource '")
- .append(datasourceName)
- .append("'");
+ .append("' in datasource");
throw new MailetException(exceptionBuffer.toString());
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java Thu Oct 21 06:49:13 2010
@@ -22,7 +22,6 @@
package org.apache.james.transport.mailets;
import org.apache.james.impl.vut.VirtualUserTableUtil;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
@@ -111,11 +110,10 @@ public class JDBCVirtualUserTable extend
}
};
- private DataSourceSelector selector;
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector selector) {
- this.selector = selector;
+ @Resource(name="datasource")
+ public void setDataSourceSelector(DataSource datasource) {
+ this.datasource = datasource;
}
@@ -136,9 +134,6 @@ public class JDBCVirtualUserTable extend
Connection conn = null;
try {
- // Get the data-source required.
- datasource = selector.getDataSource(datasourceName);
-
conn = datasource.getConnection();
// Check if the required table exists. If not, complain.
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java Thu Oct 21 06:49:13 2010
@@ -23,7 +23,6 @@ package org.apache.james.transport.maile
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.UsersRepository;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
import org.apache.mailet.base.GenericMailet;
@@ -158,11 +157,10 @@ public class WhiteListManager extends Ge
private Map<String,String> sqlParameters = new HashMap<String,String>();
- private DataSourceSelector selector;
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector selector) {
- this.selector = selector;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource datasource) {
+ this.datasource = datasource;
}
@Resource(name="localusersrepository")
@@ -236,15 +234,6 @@ public class WhiteListManager extends Ge
}
try {
- // Get the data-source required.
- int stindex = repositoryPath.indexOf("://") + 3;
- String datasourceName = repositoryPath.substring(stindex);
- datasource = selector.getDataSource(datasourceName);
- } catch (Exception e) {
- throw new MessagingException("Can't get datasource", e);
- }
-
- try {
initSqlQueries(datasource.getConnection(), getMailetContext());
} catch (Exception e) {
throw new MessagingException("Exception initializing queries", e);
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java Thu Oct 21 06:49:13 2010
@@ -37,7 +37,6 @@ import javax.sql.DataSource;
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.UsersRepository;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
import org.apache.james.transport.mailets.WhiteListManager;
import org.apache.james.util.sql.JDBCUtil;
@@ -54,8 +53,6 @@ public abstract class AbstractSQLWhiteli
*/
private UsersRepository localusers;
- protected DataSourceSelector selector;
-
protected DataSource datasource;
@@ -71,9 +68,9 @@ public abstract class AbstractSQLWhiteli
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector selector) {
- this.selector = selector;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource datasource) {
+ this.datasource = datasource;
}
@Resource(name="localusersrepository")
@@ -125,14 +122,6 @@ public abstract class AbstractSQLWhiteli
}
- try {
- // Get the data-source required.
- int stindex = repositoryPath.indexOf("://") + 3;
- String datasourceName = repositoryPath.substring(stindex);
- datasource = selector.getDataSource(datasourceName);
- } catch (Exception e) {
- throw new MessagingException("Can't get datasource", e);
- }
try {
initSqlQueries(datasource.getConnection(), getMailetContext());
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Thu Oct 21 06:49:13 2010
@@ -48,7 +48,6 @@ import org.apache.james.protocols.smtp.S
import org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler;
import org.apache.james.protocols.smtp.hook.HookResult;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
import org.apache.james.util.TimeConverter;
import org.apache.james.util.netmatcher.NetMatcher;
@@ -68,8 +67,6 @@ public class JDBCGreylistHandler extends
/** Non context specific log should only be used when no context specific log is available */
private Log serviceLog = FALLBACK_LOG;
- private DataSourceSelector datasources = null;
-
private DataSource datasource = null;
private FileSystem fileSystem = null;
@@ -99,11 +96,6 @@ public class JDBCGreylistHandler extends
*/
private Map<String, String> sqlParameters = new HashMap<String, String>();
- /**
- * The repositoryPath
- */
- private String repositoryPath;
-
private DNSService dnsService;
@@ -129,12 +121,6 @@ public class JDBCGreylistHandler extends
this.fileSystem = system;
}
- /**
- * @return the datasources
- */
- public final DataSourceSelector getDatasources() {
- return datasources;
- }
/**
* Set the datasources.
@@ -142,9 +128,9 @@ public class JDBCGreylistHandler extends
* @param datasources
* The datasources
*/
- @Resource(name="database-connections")
- public void setDataSources(DataSourceSelector datasources) {
- this.datasources = datasources;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource datasource) {
+ this.datasource = datasource;
}
@@ -239,13 +225,7 @@ public class JDBCGreylistHandler extends
setWhiteListedNetworks( new NetMatcher(wList ,dnsService));
serviceLog.info("Whitelisted addresses: " + getWhiteListedNetworks().toString());
- }
- String configRepositoryPath = handlerConfiguration.getString("repositoryPath", null);
- if (configRepositoryPath != null) {
- setRepositoryPath(configRepositoryPath);
- } else {
- throw new ConfigurationException("repositoryPath is not configured");
- }
+ }
// Get the SQL file location
String sFile = handlerConfiguration.getString("sqlFile",null);
@@ -264,35 +244,14 @@ public class JDBCGreylistHandler extends
@PostConstruct
public void init() throws Exception {
- try {
- setDataSource(initDataSource(repositoryPath));
- initSqlQueries(datasource.getConnection(), sqlFileUrl);
-
- // create table if not exist
- createTable("greyListTableName", "createGreyListTable");
- } catch (Exception e) {
- throw new RuntimeException("Unable to init datasource",e);
- }
- }
-
- /**
- * Set the repositoryPath to use
- *
- * @param repositoryPath
- * The repositoryPath
- */
- public void setRepositoryPath(String repositoryPath) {
- this.repositoryPath = repositoryPath;
- }
+ try {
+ initSqlQueries(datasource.getConnection(), sqlFileUrl);
- /**
- * Set the datasource
- *
- * @param datasource
- * the datasource
- */
- public void setDataSource(DataSource datasource) {
- this.datasource = datasource;
+ // create table if not exist
+ createTable("greyListTableName", "createGreyListTable");
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to init datasource", e);
+ }
}
/**
@@ -377,24 +336,6 @@ public class JDBCGreylistHandler extends
}
/**
- * Init the dataSource
- *
- * @param repositoryPath
- * The repositoryPath
- * @return dataSource The DataSourceComponent
- * @throws ServiceException
- * @throws SQLException
- */
- private DataSource initDataSource(String repositoryPath)
- throws SQLException {
-
- int stindex = repositoryPath.indexOf("://") + 3;
- String datasourceName = repositoryPath.substring(stindex);
-
- return datasources.getDataSource(datasourceName);
- }
-
- /**
* @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#cleanupAutoWhiteListGreyList(long)
*/
protected void cleanupAutoWhiteListGreyList(long time)
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=1025851&r1=1025850&r2=1025851&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 Thu Oct 21 06:49:13 2010
@@ -380,14 +380,9 @@
<bean id="scheduler" class="java.util.concurrent.Executors" factory-method="newScheduledThreadPool">
<constructor-arg value="20"/>
</bean>
-
- <!-- The DataSourceSelector block -->
- <bean id="database-connections" class="org.apache.james.container.spring.SpringDataSourceSelector"/>
-
-
-
+
<!-- Database related beans -->
- <bean id="maildb" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <bean id="datasource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="${database.driverClassName}" />
<property name="url" value="${database.url}" />
<property name="username" value="${database.username}" />
@@ -395,7 +390,7 @@
</bean>
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
- <property name="dataSource" ref="maildb"/>
+ <property name="dataSource" ref="datasource"/>
<property name="jpaVendorAdapter" ref="vendorAdapter"/>
</bean>
Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Thu Oct 21 06:49:13 2010
@@ -23,7 +23,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.api.user.User;
import org.apache.james.impl.jamesuser.AbstractUsersRepository;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
@@ -78,8 +77,6 @@ public abstract class AbstractJdbcUsersR
private String m_datasourceName;
- private DataSourceSelector m_datasources;
-
private DataSource m_datasource;
// Fetches all Users from the db.
@@ -231,9 +228,9 @@ public abstract class AbstractJdbcUsersR
* @param datasources
* the DataSourceSelector
*/
- @Resource(name="database-connections")
- public void setDatasources(DataSourceSelector datasources) {
- m_datasources = datasources;
+ @Resource(name="datasource")
+ public void setDatasource(DataSource m_datasource) {
+ this.m_datasource = m_datasource;
}
/**
* Sets the filesystem service
@@ -275,8 +272,6 @@ public abstract class AbstractJdbcUsersR
}
};
- // Get the data-source required.
- m_datasource = m_datasources.getDataSource(m_datasourceName);
// Test the connection to the database, by getting the DatabaseMetaData.
Connection conn = openConnection();
Modified: james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/user-jdbc/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Thu Oct 21 06:49:13 2010
@@ -39,7 +39,6 @@ import org.apache.commons.configuration.
import org.apache.james.api.vut.ManageableVirtualUserTableException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
import org.apache.james.impl.vut.VirtualUserTableUtil;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.FileSystem;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
@@ -52,8 +51,7 @@ import org.apache.james.util.sql.SqlReso
@Deprecated
public class JDBCVirtualUserTable extends AbstractVirtualUserTable {
- private DataSourceSelector datasources = null;
- private DataSource dataSourceComponent = null;
+ private DataSource dataSource = null;
private String dataSourceName = null;
private String tableName = "VirtualUserTable";
@@ -81,16 +79,14 @@ public class JDBCVirtualUserTable extend
@PostConstruct
public void init() throws Exception {
-
- setDataSource(datasources.getDataSource(dataSourceName));
-
+
StringBuffer logBuffer = null;
if (getLogger().isDebugEnabled()) {
getLogger().debug(this.getClass().getName() + ".initialize()");
}
// Test the connection to the database, by getting the DatabaseMetaData.
- Connection conn = dataSourceComponent.getConnection();
+ Connection conn = dataSource.getConnection();
PreparedStatement createStatement = null;
try {
@@ -160,15 +156,12 @@ public class JDBCVirtualUserTable extend
this.fileSystem = fileSystem;
}
- public void setDataSource(DataSource dataSourceComponent) {
- this.dataSourceComponent = dataSourceComponent;
- }
-
- @Resource(name="database-connections")
- public void setDataSourceSelector(DataSourceSelector datasources) {
- this.datasources = datasources;
+ @Resource(name="datasource")
+ public void setDataSource(DataSource dataSource) {
+ this.dataSource = dataSource;
}
+
protected void doConfigure(HierarchicalConfiguration conf) throws ConfigurationException {
String destination = conf.getString("[@destinationURL]",null);
@@ -250,7 +243,7 @@ public class JDBCVirtualUserTable extend
Connection conn = null;
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString("selectMappings", true));
ResultSet mappingRS = null;
@@ -281,7 +274,7 @@ public class JDBCVirtualUserTable extend
Connection conn = null;
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString("selectUserDomainMapping", true));
ResultSet mappingRS = null;
try {
@@ -311,7 +304,7 @@ public class JDBCVirtualUserTable extend
PreparedStatement mappingStmt = null;
Map<String,Collection<String>> mapping = new HashMap<String,Collection<String>>();
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString("selectAllMappings", true));
ResultSet mappingRS = null;
try {
@@ -364,7 +357,7 @@ public class JDBCVirtualUserTable extend
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString(
"updateMapping", true));
@@ -404,7 +397,7 @@ public class JDBCVirtualUserTable extend
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString(
"deleteMapping", true));
@@ -442,7 +435,7 @@ public class JDBCVirtualUserTable extend
PreparedStatement mappingStmt = null;
try {
- conn = dataSourceComponent.getConnection();
+ conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString(
"addMapping", true));
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java Thu Oct 21 06:49:13 2010
@@ -24,12 +24,13 @@ import org.apache.commons.configuration.
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.lifecycle.LifecycleUtil;
-import org.apache.james.services.DataSourceSelector;
import org.apache.james.services.MockFileSystem;
import org.apache.james.util.TestUtil;
import java.util.Iterator;
+import javax.sql.DataSource;
+
/**
* Test basic behaviours of UsersFileRepository
*/
@@ -56,9 +57,9 @@ public class DefaultUsersJdbcRepositoryT
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- DataSourceSelector dataSourceSelector = TestUtil.getDataSourceSelector();
+ DataSource dataSource = TestUtil.getDataSource();
- res.setDatasources(dataSourceSelector );
+ res.setDatasource(dataSource );
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString);
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java Thu Oct 21 06:49:13 2010
@@ -34,6 +34,8 @@ import org.apache.mailet.MailAddress;
import java.util.Collection;
import java.util.Iterator;
+import javax.sql.DataSource;
+
/**
* Test basic behaviours of UsersFileRepository
*/
@@ -60,8 +62,8 @@ public class JamesUsersJdbcRepositoryTes
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- res.setDatasources(TestUtil.getDataSourceSelector());
-
+ DataSource dataSource = TestUtil.getDataSource();
+ res.setDatasource(dataSource );
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString);
configuration.addProperty("sqlFile","file://conf/sqlResources.xml");
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java Thu Oct 21 06:49:13 2010
@@ -29,6 +29,8 @@ import org.apache.james.util.TestUtil;
import java.util.Iterator;
+import javax.sql.DataSource;
+
/**
* Test basic behaviours of UsersFileRepository
*/
@@ -64,8 +66,8 @@ public class ListUsersJdbcRepositoryTest
*/
protected void configureAbstractJdbcUsersRepository(AbstractJdbcUsersRepository res, String tableString) throws Exception, ConfigurationException {
res.setFileSystem(new MockFileSystem());
- res.setDatasources(TestUtil.getDataSourceSelector());
-
+ DataSource dataSource = TestUtil.getDataSource();
+ res.setDatasource(dataSource );
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString);
configuration.addProperty("sqlFile","file://conf/sqlResources.xml");
Modified: james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?rev=1025851&r1=1025850&r2=1025851&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java (original)
+++ james/server/trunk/user-jdbc/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java Thu Oct 21 06:49:13 2010
@@ -36,7 +36,7 @@ public class JDBCVirtualUserTableTest ex
protected AbstractVirtualUserTable getVirtualUserTable() throws Exception {
JDBCVirtualUserTable virtualUserTable = new JDBCVirtualUserTable();
virtualUserTable.setLog(new SimpleLog("MockLog"));
- virtualUserTable.setDataSourceSelector(TestUtil.getDataSourceSelector());
+ virtualUserTable.setDataSource(TestUtil.getDataSource());
virtualUserTable.setFileSystem(new MockFileSystem());
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
defaultConfiguration.addProperty("[@destinationURL]","db://maildb/VirtualUserTable");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org