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 bt...@apache.org on 2017/08/24 03:46:50 UTC
[25/38] james-project git commit: JAMES-2114 Deprecate LogEnabled API
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
index 7c29393..56effd9 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
@@ -42,6 +42,8 @@ import org.apache.james.rrt.lib.Mappings;
import org.apache.james.rrt.lib.MappingsImpl;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Class responsible to implement the Virtual User Table in database with JDBC
@@ -51,6 +53,7 @@ import org.apache.james.util.sql.SqlResources;
*/
@Deprecated
public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JDBCRecipientRewriteTable.class);
private DataSource dataSource = null;
@@ -74,7 +77,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
*/
private final JDBCUtil theJDBCUtil = new JDBCUtil() {
protected void delegatedLog(String logString) {
- getLogger().debug("JDBCRecipientRewriteTable: " + logString);
+ LOGGER.debug("JDBCRecipientRewriteTable: " + logString);
}
};
@@ -82,8 +85,8 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
public void init() throws Exception {
StringBuffer logBuffer;
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(this.getClass().getName() + ".initialize()");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(this.getClass().getName() + ".initialize()");
}
// Test the connection to the database, by getting the DatabaseMetaData.
@@ -98,13 +101,13 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
try {
sqlFile = fileSystem.getResource(sqlFileName);
} catch (Exception e) {
- getLogger().error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
throw e;
}
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
logBuffer = new StringBuffer(128).append("Reading SQL resources from file: ").append(sqlFileName).append(", section ").append(this.getClass().getName()).append(".");
- getLogger().debug(logBuffer.toString());
+ LOGGER.debug(logBuffer.toString());
}
// Build the statement parameters
@@ -128,9 +131,9 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
createStatement = conn.prepareStatement(sqlQueries.getSqlString("createTable", true));
createStatement.execute();
- if (getLogger().isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
logBuffer = new StringBuffer(64).append("JdbcVirtalUserTable: Created table '").append(tableName).append("'.");
- getLogger().info(logBuffer.toString());
+ LOGGER.info(logBuffer.toString());
}
}
@@ -185,9 +188,9 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
tableName = urlParams.get(1);
}
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
String logBuffer = "Parsed URL: table = '" + tableName + "'";
- getLogger().debug(logBuffer);
+ LOGGER.debug(logBuffer);
}
sqlFileName = conf.getString("sqlFile");
@@ -234,7 +237,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
}
} catch (SQLException sqle) {
- getLogger().error("Error accessing database", sqle);
+ LOGGER.error("Error accessing database", sqle);
throw new RecipientRewriteTableException("Error accessing database", sqle);
} finally {
theJDBCUtil.closeJDBCStatement(mappingStmt);
@@ -266,7 +269,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
theJDBCUtil.closeJDBCResultSet(mappingRS);
}
} catch (SQLException sqle) {
- getLogger().error("Error accessing database", sqle);
+ LOGGER.error("Error accessing database", sqle);
throw new RecipientRewriteTableException("Error accessing database", sqle);
} finally {
theJDBCUtil.closeJDBCStatement(mappingStmt);
@@ -302,7 +305,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
}
} catch (SQLException sqle) {
- getLogger().error("Error accessing database", sqle);
+ LOGGER.error("Error accessing database", sqle);
throw new RecipientRewriteTableException("Error accessing database", sqle);
} finally {
theJDBCUtil.closeJDBCStatement(mappingStmt);
@@ -362,7 +365,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
}
} catch (SQLException sqle) {
- getLogger().error("Error accessing database", sqle);
+ LOGGER.error("Error accessing database", sqle);
throw new RecipientRewriteTableException("Error accessing database", sqle);
} finally {
theJDBCUtil.closeJDBCStatement(mappingStmt);
@@ -403,7 +406,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
}
} catch (SQLException sqle) {
- getLogger().error("Error accessing database", sqle);
+ LOGGER.error("Error accessing database", sqle);
} finally {
theJDBCUtil.closeJDBCStatement(mappingStmt);
theJDBCUtil.closeJDBCConnection(conn);
@@ -444,7 +447,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
}
} catch (SQLException sqle) {
- getLogger().error("Error accessing database", sqle);
+ LOGGER.error("Error accessing database", sqle);
} finally {
theJDBCUtil.closeJDBCStatement(mappingStmt);
theJDBCUtil.closeJDBCConnection(conn);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
index d0dfc9d..88ede9e 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
@@ -45,6 +45,8 @@ import org.apache.james.user.api.model.User;
import org.apache.james.user.lib.AbstractJamesUsersRepository;
import org.apache.james.util.sql.JDBCUtil;
import org.apache.james.util.sql.SqlResources;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An abstract base class for creating UserRepository implementations which use
@@ -92,6 +94,7 @@ import org.apache.james.util.sql.SqlResources;
*/
@Deprecated
public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepository {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractJdbcUsersRepository.class);
protected Map<String, String> m_sqlParameters;
@@ -245,14 +248,14 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
@PostConstruct
public void init() throws Exception {
StringBuffer logBuffer;
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(".initialize()");
- getLogger().debug(logBuffer.toString());
+ LOGGER.debug(logBuffer.toString());
}
theJDBCUtil = new JDBCUtil() {
protected void delegatedLog(String logString) {
- AbstractJdbcUsersRepository.this.getLogger().warn("AbstractJdbcUsersRepository: " + logString);
+ AbstractJdbcUsersRepository.this.LOGGER.warn("AbstractJdbcUsersRepository: " + logString);
}
};
@@ -266,13 +269,13 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
try {
sqlFile = fileSystem.getResource(m_sqlFileName);
} catch (Exception e) {
- getLogger().error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
throw e;
}
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
logBuffer = new StringBuffer(256).append("Reading SQL resources from: ").append(m_sqlFileName).append(", section ").append(this.getClass().getName()).append(".");
- getLogger().debug(logBuffer.toString());
+ LOGGER.debug(logBuffer.toString());
}
SqlResources sqlStatements = new SqlResources();
@@ -324,10 +327,10 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
}
logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(": Created table \'").append(tableName).append("\'.");
- getLogger().info(logBuffer.toString());
+ LOGGER.info(logBuffer.toString());
} else {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("Using table: " + tableName);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Using table: " + tableName);
}
}
@@ -360,9 +363,9 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
*/
protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
StringBuffer logBuffer;
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
logBuffer = new StringBuffer(64).append(this.getClass().getName()).append(".configure()");
- getLogger().debug(logBuffer.toString());
+ LOGGER.debug(logBuffer.toString());
}
// Parse the DestinationURL for the name of the datasource,
@@ -400,9 +403,9 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
throw new ConfigurationException("Malformed destinationURL - " + "Must be of the format \"db://<data-source>[/<table>[/<key>]]\".");
}
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
logBuffer = new StringBuffer(128).append("Parsed URL: table = '").append(m_sqlParameters.get("table")).append("', key = '").append(m_sqlParameters.get("key")).append("'");
- getLogger().debug(logBuffer.toString());
+ LOGGER.debug(logBuffer.toString());
}
// Get the SQL file location
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
index 8a5ef6c..766df10 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java
@@ -27,7 +27,6 @@ import org.apache.derby.jdbc.EmbeddedDriver;
import org.apache.james.filesystem.api.mock.MockFileSystem;
import org.apache.james.mailrepository.AbstractMailRepositoryTest;
import org.apache.james.mailrepository.api.MailRepository;
-import org.slf4j.LoggerFactory;
public class JDBCMailRepositoryTest extends AbstractMailRepositoryTest {
@@ -49,7 +48,6 @@ public class JDBCMailRepositoryTest extends AbstractMailRepositoryTest {
defaultConfiguration.addProperty("[@type]", "MAIL");
mr.setFileSystem(fs);
mr.setDatasource(datasource);
- mr.setLog(LoggerFactory.getLogger("MockLog"));
mr.configure(defaultConfiguration);
mr.init();
return mr;
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
index 184c6a5..a2caeed 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
@@ -25,7 +25,6 @@ import org.apache.james.filesystem.api.mock.MockFileSystem;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest;
-import org.slf4j.LoggerFactory;
/**
* Test the JDBC Virtual User Table implementation.
@@ -39,7 +38,6 @@ public class JDBCRecipientRewriteTableTest extends AbstractRecipientRewriteTable
@Override
protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
JDBCRecipientRewriteTable localVirtualUserTable = new JDBCRecipientRewriteTable();
- localVirtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
localVirtualUserTable.setDataSource(getDataSource());
localVirtualUserTable.setFileSystem(new MockFileSystem());
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java
index c47a7a6..284b79d 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java
@@ -26,7 +26,6 @@ import org.apache.derby.jdbc.EmbeddedDriver;
import org.apache.james.filesystem.api.mock.MockFileSystem;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.RewriteTablesStepdefs;
-import org.slf4j.LoggerFactory;
import cucumber.api.java.Before;
@@ -46,7 +45,6 @@ public class JDBCStepdefs {
@SuppressWarnings("deprecation")
protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
JDBCRecipientRewriteTable localVirtualUserTable = new JDBCRecipientRewriteTable();
- localVirtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
localVirtualUserTable.setDataSource(getDataSource());
localVirtualUserTable.setFileSystem(new MockFileSystem());
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
index 0dd74a2..90935d5 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java
@@ -30,7 +30,6 @@ import org.apache.james.filesystem.api.mock.MockFileSystem;
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.AbstractUsersRepository;
-import org.slf4j.LoggerFactory;
/**
* Test basic behaviors of UsersFileRepository
@@ -62,7 +61,6 @@ public class DefaultUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryT
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/" + tableString);
configuration.addProperty("sqlFile", "file://conf/sqlResources.xml");
- res.setLog(LoggerFactory.getLogger("MockLog"));
res.configure(configuration);
res.init();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
index 0af1eac..1e69cb8 100644
--- a/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
+++ b/server/data/data-jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java
@@ -30,7 +30,6 @@ import org.apache.james.filesystem.api.mock.MockFileSystem;
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.AbstractUsersRepository;
-import org.slf4j.LoggerFactory;
/**
* Test basic behaviors of UsersFileRepository
@@ -60,7 +59,6 @@ public class JamesUsersJdbcRepositoryTest extends AbstractUsersJdbcRepositoryTes
DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder();
configuration.addProperty("[@destinationURL]", "db://maildb/" + tableString);
configuration.addProperty("sqlFile", "file://conf/sqlResources.xml");
- res.setLog(LoggerFactory.getLogger("MockLog"));
res.configure(configuration);
res.init();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
index 8d102eb..6188139 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
@@ -35,6 +35,8 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.domainlist.jpa.model.JPADomain;
import org.apache.james.domainlist.lib.AbstractDomainList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
@@ -44,6 +46,7 @@ import com.google.common.collect.ImmutableList;
* database schema can be reused.
*/
public class JPADomainList extends AbstractDomainList {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JPADomainList.class);
/**
* The entity manager to access the database.
@@ -83,7 +86,7 @@ public class JPADomainList extends AbstractDomainList {
domains = entityManager.createNamedQuery("listDomainNames").getResultList();
transaction.commit();
} catch (PersistenceException e) {
- getLogger().error("Failed to list domains", e);
+ LOGGER.error("Failed to list domains", e);
rollback(transaction);
throw new DomainListException("Unable to retrieve domains", e);
} finally {
@@ -103,7 +106,7 @@ public class JPADomainList extends AbstractDomainList {
transaction.commit();
return result;
} catch (PersistenceException e) {
- getLogger().error("Failed to find domain", e);
+ LOGGER.error("Failed to find domain", e);
rollback(transaction);
throw new DomainListException("Unable to retrieve domains", e);
} finally {
@@ -126,7 +129,7 @@ public class JPADomainList extends AbstractDomainList {
entityManager.persist(jpaDomain);
transaction.commit();
} catch (PersistenceException e) {
- getLogger().error("Failed to save domain", e);
+ LOGGER.error("Failed to save domain", e);
rollback(transaction);
throw new DomainListException("Unable to add domain " + domain, e);
} finally {
@@ -148,7 +151,7 @@ public class JPADomainList extends AbstractDomainList {
entityManager.createNamedQuery("deleteDomainByName").setParameter("name", lowerCasedDomain).executeUpdate();
transaction.commit();
} catch (PersistenceException e) {
- getLogger().error("Failed to remove domain", e);
+ LOGGER.error("Failed to remove domain", e);
rollback(transaction);
throw new DomainListException("Unable to remove domain " + domain, e);
} finally {
@@ -168,7 +171,7 @@ public class JPADomainList extends AbstractDomainList {
.setParameter("name", domain)
.getSingleResult() != null;
} catch (NoResultException e) {
- getLogger().debug("No domain found", e);
+ LOGGER.debug("No domain found", e);
return false;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
index 9ed56e0..b19760e 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
@@ -34,12 +34,15 @@ import org.apache.james.rrt.jpa.model.JPARecipientRewrite;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.Mappings;
import org.apache.james.rrt.lib.MappingsImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Class responsible to implement the Virtual User Table in database with JPA
* access.
*/
public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JPARecipientRewriteTable.class);
/**
* The entity manager to access the database.
@@ -98,7 +101,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
return virtualUsers.get(0).getTargetAddress();
}
} catch (PersistenceException e) {
- getLogger().debug("Failed to find mapping for user=" + user + " and domain=" + domain, e);
+ LOGGER.debug("Failed to find mapping for user=" + user + " and domain=" + domain, e);
if (transaction.isActive()) {
transaction.rollback();
}
@@ -125,7 +128,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
return MappingsImpl.fromRawString(virtualUsers.get(0).getTargetAddress());
}
} catch (PersistenceException e) {
- getLogger().debug("Failed to get user domain mappings", e);
+ LOGGER.debug("Failed to get user domain mappings", e);
if (transaction.isActive()) {
transaction.rollback();
}
@@ -156,7 +159,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
if (mapping.size() > 0)
return mapping;
} catch (PersistenceException e) {
- getLogger().debug("Failed to get all mappings", e);
+ LOGGER.debug("Failed to get all mappings", e);
if (transaction.isActive()) {
transaction.rollback();
}
@@ -204,7 +207,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
return true;
}
} catch (PersistenceException e) {
- getLogger().debug("Failed to update mapping", e);
+ LOGGER.debug("Failed to update mapping", e);
if (transaction.isActive()) {
transaction.rollback();
}
@@ -232,7 +235,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
transaction.commit();
} catch (PersistenceException e) {
- getLogger().debug("Failed to remove mapping", e);
+ LOGGER.debug("Failed to remove mapping", e);
if (transaction.isActive()) {
transaction.rollback();
}
@@ -260,7 +263,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
entityManager.persist(jpaRecipientRewrite);
transaction.commit();
} catch (PersistenceException e) {
- getLogger().debug("Failed to save virtual user", e);
+ LOGGER.debug("Failed to save virtual user", e);
if (transaction.isActive()) {
transaction.rollback();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
index 26f7c17..64d18c0 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
@@ -37,6 +37,8 @@ import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.api.model.User;
import org.apache.james.user.jpa.model.JPAUser;
import org.apache.james.user.lib.AbstractUsersRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
@@ -44,6 +46,7 @@ import com.google.common.collect.ImmutableList;
* JPA based UserRepository
*/
public class JPAUsersRepository extends AbstractUsersRepository {
+ private static final Logger LOGGER = LoggerFactory.getLogger(JPAUsersRepository.class);
private EntityManagerFactory entityManagerFactory;
@@ -84,7 +87,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
} catch (NoResultException e) {
return null;
} catch (PersistenceException e) {
- getLogger().debug("Failed to find user", e);
+ LOGGER.debug("Failed to find user", e);
throw new UsersRepositoryException("Unable to search user", e);
} finally {
entityManager.close();
@@ -124,11 +127,11 @@ public class JPAUsersRepository extends AbstractUsersRepository {
entityManager.merge(user);
transaction.commit();
} else {
- getLogger().debug("User not found");
+ LOGGER.debug("User not found");
throw new UsersRepositoryException("User " + user.getUserName() + " not found");
}
} catch (PersistenceException e) {
- getLogger().debug("Failed to update user", e);
+ LOGGER.debug("Failed to update user", e);
if (transaction.isActive()) {
transaction.rollback();
}
@@ -158,7 +161,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
transaction.commit();
}
} catch (PersistenceException e) {
- getLogger().debug("Failed to remove user", e);
+ LOGGER.debug("Failed to remove user", e);
if (transaction.isActive()) {
transaction.rollback();
}
@@ -184,7 +187,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
.setParameter("name", name.toLowerCase(Locale.US))
.getSingleResult() > 0;
} catch (PersistenceException e) {
- getLogger().debug("Failed to find user", e);
+ LOGGER.debug("Failed to find user", e);
throw new UsersRepositoryException("Failed to find user" + name, e);
} finally {
entityManager.close();
@@ -223,7 +226,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
try {
return ((Long) entityManager.createNamedQuery("countUsers").getSingleResult()).intValue();
} catch (PersistenceException e) {
- getLogger().debug("Failed to find user", e);
+ LOGGER.debug("Failed to find user", e);
throw new UsersRepositoryException("Failed to count users", e);
} finally {
entityManager.close();
@@ -245,7 +248,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
return ImmutableList.copyOf(entityManager.createNamedQuery("listUserNames").getResultList()).iterator();
} catch (PersistenceException e) {
- getLogger().debug("Failed to find user", e);
+ LOGGER.debug("Failed to find user", e);
throw new UsersRepositoryException("Failed to list users", e);
} finally {
entityManager.close();
@@ -287,7 +290,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
entityManager.persist(user);
transaction.commit();
} catch (PersistenceException e) {
- getLogger().debug("Failed to save user", e);
+ LOGGER.debug("Failed to save user", e);
if (transaction.isActive()) {
transaction.rollback();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java b/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
index 3fd7e3d..04e8c61 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
@@ -22,7 +22,6 @@ import org.apache.james.backends.jpa.JpaTestCluster;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.jpa.model.JPADomain;
import org.apache.james.domainlist.lib.AbstractDomainListTest;
-import org.slf4j.LoggerFactory;
/**
* Test the JPA implementation of the DomainList.
@@ -35,7 +34,6 @@ public class JPADomainListTest extends AbstractDomainListTest {
protected DomainList createDomainList() {
JPADomainList jpaDomainList = new JPADomainList(getDNSServer("localhost"),
JPA_TEST_CLUSTER.getEntityManagerFactory());
- jpaDomainList.setLog(LoggerFactory.getLogger("JPADomainListMockLog"));
jpaDomainList.setAutoDetect(false);
jpaDomainList.setAutoDetectIP(false);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java b/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
index 1a32d5f..e82f506 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPARecipientRewriteTableTest.java
@@ -24,7 +24,6 @@ import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.jpa.model.JPARecipientRewrite;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest;
-import org.slf4j.LoggerFactory;
/**
* Test the JPA Virtual User Table implementation.
@@ -36,7 +35,6 @@ public class JPARecipientRewriteTableTest extends AbstractRecipientRewriteTableT
@Override
protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
JPARecipientRewriteTable localVirtualUserTable = new JPARecipientRewriteTable();
- localVirtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
localVirtualUserTable.setEntityManagerFactory(JPA_TEST_CLUSTER.getEntityManagerFactory());
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
localVirtualUserTable.configure(defaultConfiguration);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPAStepdefs.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPAStepdefs.java b/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPAStepdefs.java
index 214c367..93a320c 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPAStepdefs.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/rrt/jpa/JPAStepdefs.java
@@ -23,7 +23,6 @@ import org.apache.james.backends.jpa.JpaTestCluster;
import org.apache.james.rrt.jpa.model.JPARecipientRewrite;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.RewriteTablesStepdefs;
-import org.slf4j.LoggerFactory;
import cucumber.api.java.After;
import cucumber.api.java.Before;
@@ -50,7 +49,6 @@ public class JPAStepdefs {
private AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
JPARecipientRewriteTable localVirtualUserTable = new JPARecipientRewriteTable();
- localVirtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
localVirtualUserTable.setEntityManagerFactory(JPA_TEST_CLUSTER.getEntityManagerFactory());
DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
localVirtualUserTable.configure(defaultConfiguration);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java b/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
index 0ba2aee..63012b3 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
@@ -24,7 +24,6 @@ import org.apache.james.user.jpa.model.JPAUser;
import org.apache.james.user.lib.AbstractUsersRepository;
import org.apache.james.user.lib.AbstractUsersRepositoryTest;
import org.junit.After;
-import org.slf4j.LoggerFactory;
public class JpaUsersRepositoryTest extends AbstractUsersRepositoryTest {
@@ -39,7 +38,6 @@ public class JpaUsersRepositoryTest extends AbstractUsersRepositoryTest {
@Override
protected AbstractUsersRepository getUsersRepository() throws Exception {
JPAUsersRepository repos = new JPAUsersRepository();
- repos.setLog(LoggerFactory.getLogger("JPA"));
repos.setEntityManagerFactory(JPA_TEST_CLUSTER.getEntityManagerFactory());
repos.configure(new DefaultConfigurationBuilder());
return repos;
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
index cfc810d..01e21d1 100644
--- a/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
+++ b/server/data/data-ldap-integration-testing/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
@@ -60,7 +60,6 @@ public class ReadOnlyUsersLDAPRepositoryTest {
private void startUsersRepository(HierarchicalConfiguration ldapRepositoryConfiguration) throws ConfigurationException, Exception {
ldapRepository = new ReadOnlyUsersLDAPRepository();
ldapRepository.configure(ldapRepositoryConfiguration);
- ldapRepository.setLog(LOGGER);
ldapRepository.init();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
index 8991c41..25ab0b5 100644
--- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
+++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
@@ -43,7 +43,6 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.lang.StringUtils;
import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.api.model.User;
@@ -53,6 +52,7 @@ import org.apache.james.util.retry.api.RetrySchedule;
import org.apache.james.util.retry.naming.ldap.RetryingLdapContext;
import org.apache.mailet.MailAddress;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.github.steveash.guavate.Guavate;
import com.google.common.base.Optional;
@@ -235,7 +235,8 @@ import com.google.common.base.Optional;
* @see ReadOnlyLDAPGroupRestriction
*
*/
-public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurable, LogEnabled {
+public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ReadOnlyUsersLDAPRepository.class);
// The name of the factory class which creates the initial context
// for the LDAP service provider
@@ -336,8 +337,6 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
// retries.
private int maxRetries = 0;
- private Logger log;
-
/**
* Creates a new instance of ReadOnlyUsersLDAPRepository.
*
@@ -415,8 +414,8 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
*/
@PostConstruct
public void init() throws Exception {
- if (log.isDebugEnabled()) {
- log.debug(this.getClass().getName() + ".init()" + '\n' + "LDAP host: " + ldapHost + '\n' + "User baseDN: " + userBase + '\n' + "userIdAttribute: " + userIdAttribute + '\n' + "Group restriction: " + restriction + '\n' + "UseConnectionPool: " + useConnectionPool + '\n' + "connectionTimeout: " + connectionTimeout + '\n' + "readTimeout: " + readTimeout + '\n' + "retrySchedule: " + schedule + '\n' + "maxRetries: " + maxRetries + '\n');
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(this.getClass().getName() + ".init()" + '\n' + "LDAP host: " + ldapHost + '\n' + "User baseDN: " + userBase + '\n' + "userIdAttribute: " + userIdAttribute + '\n' + "Group restriction: " + restriction + '\n' + "UseConnectionPool: " + useConnectionPool + '\n' + "connectionTimeout: " + connectionTimeout + '\n' + "readTimeout: " + readTimeout + '\n' + "retrySchedule: " + schedule + '\n' + "maxRetries: " + maxRetries + '\n');
}
// Setup the initial LDAP context
updateLdapContext();
@@ -447,7 +446,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
* Propagated from underlying LDAP communication API.
*/
protected LdapContext computeLdapContext() throws NamingException {
- return new RetryingLdapContext(schedule, maxRetries, log) {
+ return new RetryingLdapContext(schedule, maxRetries) {
@Override
public Context newDelegate() throws NamingException {
@@ -656,7 +655,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
try {
return getValidUsers().size();
} catch (NamingException e) {
- log.error("Unable to retrieve user count from ldap", e);
+ LOGGER.error("Unable to retrieve user count from ldap", e);
throw new UsersRepositoryException("Unable to retrieve user count from ldap", e);
}
@@ -684,7 +683,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
try {
return searchAndBuildUser(name);
} catch (NamingException e) {
- log.error("Unable to retrieve user from ldap", e);
+ LOGGER.error("Unable to retrieve user from ldap", e);
throw new UsersRepositoryException("Unable to retrieve user from ldap", e);
}
@@ -705,7 +704,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
}
} catch (NamingException e) {
- log.error("Unable to retrieve user from ldap", e);
+ LOGGER.error("Unable to retrieve user from ldap", e);
throw new UsersRepositoryException("Unable to retrieve user from ldap", e);
}
@@ -755,7 +754,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
* @see UsersRepository#removeUser(java.lang.String)
*/
public void removeUser(String name) throws UsersRepositoryException {
- log.warn("This user-repository is read-only. Modifications are not permitted.");
+ LOGGER.warn("This user-repository is read-only. Modifications are not permitted.");
throw new UsersRepositoryException(
"This user-repository is read-only. Modifications are not permitted.");
@@ -773,7 +772,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
* @see UsersRepository#addUser(java.lang.String, java.lang.String)
*/
public void addUser(String username, String password) throws UsersRepositoryException {
- log.error("This user-repository is read-only. Modifications are not permitted.");
+ LOGGER.error("This user-repository is read-only. Modifications are not permitted.");
throw new UsersRepositoryException(
"This user-repository is read-only. Modifications are not permitted.");
}
@@ -781,19 +780,12 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
/**
*/
public void updateUser(User user) throws UsersRepositoryException {
- log.error("This user-repository is read-only. Modifications are not permitted.");
+ LOGGER.error("This user-repository is read-only. Modifications are not permitted.");
throw new UsersRepositoryException(
"This user-repository is read-only. Modifications are not permitted.");
}
/**
- * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger)
- */
- public void setLog(Logger log) {
- this.log = log;
- }
-
- /**
* VirtualHosting not supported
*/
public boolean supportVirtualHosting() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
index 1457122..517b9b2 100644
--- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
+++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
@@ -28,20 +28,15 @@ import org.apache.commons.configuration.plist.PropertyListConfiguration;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ReadOnlyUsersLDAPRepositoryTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(ReadOnlyUsersLDAPRepositoryTest.class);
-
@Rule
public ExpectedException expectedException = ExpectedException.none();
@Test
public void supportVirtualHostingShouldReturnFalseByDefault() throws Exception {
ReadOnlyUsersLDAPRepository usersLDAPRepository = new ReadOnlyUsersLDAPRepository();
- usersLDAPRepository.setLog(LOGGER);
usersLDAPRepository.configure(ldapRepositoryConfiguration());
assertThat(usersLDAPRepository.supportVirtualHosting()).isFalse();
@@ -53,7 +48,6 @@ public class ReadOnlyUsersLDAPRepositoryTest {
configuration.addProperty(ReadOnlyUsersLDAPRepository.SUPPORTS_VIRTUAL_HOSTING, "true");
ReadOnlyUsersLDAPRepository usersLDAPRepository = new ReadOnlyUsersLDAPRepository();
- usersLDAPRepository.setLog(LOGGER);
usersLDAPRepository.configure(configuration);
assertThat(usersLDAPRepository.supportVirtualHosting()).isTrue();
@@ -65,7 +59,6 @@ public class ReadOnlyUsersLDAPRepositoryTest {
configuration.addProperty(ReadOnlyUsersLDAPRepository.SUPPORTS_VIRTUAL_HOSTING, "false");
ReadOnlyUsersLDAPRepository usersLDAPRepository = new ReadOnlyUsersLDAPRepository();
- usersLDAPRepository.setLog(LOGGER);
usersLDAPRepository.configure(configuration);
assertThat(usersLDAPRepository.supportVirtualHosting()).isFalse();
@@ -77,7 +70,6 @@ public class ReadOnlyUsersLDAPRepositoryTest {
configuration.addProperty(ReadOnlyUsersLDAPRepository.SUPPORTS_VIRTUAL_HOSTING, "bad");
ReadOnlyUsersLDAPRepository usersLDAPRepository = new ReadOnlyUsersLDAPRepository();
- usersLDAPRepository.setLog(LOGGER);
expectedException.expect(ConversionException.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
index 35fdfdb..4582006 100644
--- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
+++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
@@ -32,7 +32,6 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +45,7 @@ import com.google.common.collect.ImmutableList;
* All implementations of the DomainList interface should extends this abstract
* class
*/
-public abstract class AbstractDomainList implements DomainList, LogEnabled, Configurable {
+public abstract class AbstractDomainList implements DomainList, Configurable {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractDomainList.class);
@@ -61,7 +60,6 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf
private final EnvDetector envDetector;
private boolean autoDetect = true;
private boolean autoDetectIP = true;
- private Logger logger;
private String defaultDomain;
public AbstractDomainList(DNSService dns, EnvDetector envDetector) {
@@ -73,14 +71,6 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf
this(dns, new EnvDetector());
}
- public void setLog(Logger logger) {
- this.logger = logger;
- }
-
- protected Logger getLogger() {
- return logger;
- }
-
@Override
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
setAutoDetect(config.getBoolean(CONFIGURE_AUTODETECT, true));
@@ -170,9 +160,9 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf
mutableDomains.addAll(detectedDomains);
mutableDomains.addAll(detectIps(mutableDomains));
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
for (String domain : mutableDomains) {
- getLogger().debug("Handling mail for: " + domain);
+ LOGGER.debug("Handling mail for: " + domain);
}
}
@@ -181,7 +171,7 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf
private List<String> detectIps(ArrayList<String> mutableDomains) {
if (autoDetectIP) {
- return getDomainsIP(mutableDomains, dns, getLogger());
+ return getDomainsIP(mutableDomains, dns, LOGGER);
}
return ImmutableList.of();
}
@@ -195,7 +185,7 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf
hostName = "localhost";
}
- getLogger().info("Local host is: " + hostName);
+ LOGGER.info("Local host is: " + hostName);
if (hostName != null && !hostName.equals("localhost")) {
return ImmutableList.of(hostName.toLowerCase(Locale.US));
}
@@ -240,7 +230,7 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf
* set to <code>false</code> for disable
*/
public synchronized void setAutoDetect(boolean autoDetect) {
- getLogger().info("Set autodetect to: " + autoDetect);
+ LOGGER.info("Set autodetect to: " + autoDetect);
this.autoDetect = autoDetect;
}
@@ -252,7 +242,7 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf
* set to <code>false</code> for disable
*/
public synchronized void setAutoDetectIP(boolean autoDetectIP) {
- getLogger().info("Set autodetectIP to: " + autoDetectIP);
+ LOGGER.info("Set autodetectIP to: " + autoDetectIP);
this.autoDetectIP = autoDetectIP;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
index ac4a1ba..427979b 100644
--- a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
@@ -27,17 +27,18 @@ import javax.mail.MessagingException;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.repository.api.Initializable;
import org.apache.mailet.Mail;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class represent an AbstractMailRepository. All MailRepositories should
* extend this class.
*/
-public abstract class AbstractMailRepository implements MailRepository, LogEnabled, Configurable, Initializable {
+public abstract class AbstractMailRepository implements MailRepository, Configurable, Initializable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMailRepository.class);
/**
* Whether 'deep debugging' is turned on.
@@ -50,16 +51,6 @@ public abstract class AbstractMailRepository implements MailRepository, LogEnabl
*/
private final Lock lock = new Lock();
- private Logger logger;
-
- public void setLog(Logger logger) {
- this.logger = logger;
- }
-
- protected Logger getLogger() {
- return logger;
- }
-
public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
doConfigure(configuration);
}
@@ -98,10 +89,10 @@ public abstract class AbstractMailRepository implements MailRepository, LogEnabl
}
internalStore(mc);
} catch (MessagingException e) {
- getLogger().error("Exception caught while storing mail " + key, e);
+ LOGGER.error("Exception caught while storing mail " + key, e);
throw e;
} catch (Exception e) {
- getLogger().error("Exception caught while storing mail " + key, e);
+ LOGGER.error("Exception caught while storing mail " + key, e);
throw new MessagingException("Exception caught while storing mail " + key, e);
} finally {
if (!wasLocked) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
index 2472fed..038982f 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
@@ -38,14 +38,15 @@ import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.io.FileUtils;
import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.repository.api.Repository;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This an abstract class implementing functionality for creating a file-store.
*/
-public abstract class AbstractFileRepository implements Repository, Configurable, LogEnabled {
+public abstract class AbstractFileRepository implements Repository, Configurable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractFileRepository.class);
protected static final boolean DEBUG = false;
@@ -63,8 +64,6 @@ public abstract class AbstractFileRepository implements Repository, Configurable
private FileSystem fileSystem;
- private Logger logger;
-
private String destination;
public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
@@ -76,20 +75,11 @@ public abstract class AbstractFileRepository implements Repository, Configurable
this.fileSystem = fileSystem;
}
- public void setLog(Logger logger) {
- this.logger = logger;
- }
-
- protected Logger getLogger() {
- return logger;
- }
-
protected abstract String getExtensionDecorator();
@PostConstruct
public void init() throws Exception {
-
- getLogger().info("Init " + getClass().getName() + " Store");
+ LOGGER.info("Init " + getClass().getName() + " Store");
setDestination(destination);
File directory;
@@ -108,7 +98,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
FileUtils.forceMkdir(directory);
- getLogger().info(getClass().getName() + " opened in " + m_baseDirectory);
+ LOGGER.info(getClass().getName() + " opened in " + m_baseDirectory);
// We will look for all numbered repository files in this
// directory and rename them to non-numbered repositories,
@@ -131,9 +121,9 @@ public abstract class AbstractFileRepository implements Repository, Configurable
File newFile = new File(directory, newFilename);
if (origFile.renameTo(newFile)) {
- getLogger().info("Renamed {} to {}", origFile, newFile);
+ LOGGER.info("Renamed {} to {}", origFile, newFile);
} else {
- getLogger().info("Unable to rename {} to {}", origFile, newFile);
+ LOGGER.info("Unable to rename {} to {}", origFile, newFile);
}
}
@@ -185,7 +175,6 @@ public abstract class AbstractFileRepository implements Repository, Configurable
}
child.setFileSystem(fileSystem);
- child.setLog(logger);
try {
child.setDestination(m_baseDirectory.getAbsolutePath() + File.pathSeparatorChar + childName + File.pathSeparator);
@@ -200,7 +189,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
}
if (DEBUG) {
- getLogger().debug("Child repository of " + m_name + " created in " + m_baseDirectory + File.pathSeparatorChar + childName + File.pathSeparator);
+ LOGGER.debug("Child repository of " + m_name + " created in " + m_baseDirectory + File.pathSeparatorChar + childName + File.pathSeparator);
}
return child;
@@ -280,7 +269,7 @@ public abstract class AbstractFileRepository implements Repository, Configurable
try {
final File file = getFile(key);
if (DEBUG)
- getLogger().debug("checking key " + key);
+ LOGGER.debug("checking key " + key);
return file.exists();
} catch (Exception e) {
throw new RuntimeException("Exception caught while searching " + "an object: " + e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
index 8397ac6..00e692e 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java
@@ -25,12 +25,15 @@ import java.io.ObjectOutputStream;
import java.io.OutputStream;
import org.apache.james.repository.api.ObjectRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a simple implementation of persistent object store using object
* serialization on the file system.
*/
public class FilePersistentObjectRepository extends AbstractFileRepository implements ObjectRepository {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FilePersistentObjectRepository.class);
/**
* @see
@@ -55,7 +58,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
final Object object = stream.readObject();
if (DEBUG) {
- getLogger().debug("returning object " + object + " for key " + key);
+ LOGGER.debug("returning object " + object + " for key " + key);
}
return object;
} finally {
@@ -84,7 +87,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
final Object object = stream.readObject();
if (DEBUG) {
- getLogger().debug("returning object " + object + " for key " + key);
+ LOGGER.debug("returning object " + object + " for key " + key);
}
return object;
} finally {
@@ -107,7 +110,7 @@ public class FilePersistentObjectRepository extends AbstractFileRepository imple
final ObjectOutputStream stream = new ObjectOutputStream(outputStream);
stream.writeObject(value);
if (DEBUG)
- getLogger().debug("storing object " + value + " for key " + key);
+ LOGGER.debug("storing object " + value + " for key " + key);
} catch (Exception e) {
throw new RuntimeException("Exception caught while storing an object: " + e);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
index 5c5329d..5c304f5 100644
--- a/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
@@ -20,19 +20,22 @@
package org.apache.james.repository.file;
-import org.apache.james.repository.api.StreamRepository;
-
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.james.repository.api.StreamRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Implementation of a StreamRepository to a File.<br>
* TODO: -retieve(String key) should return a FilterInputStream to allow
* mark and reset methods. (working not like BufferedInputStream!!!)
*/
public class FilePersistentStreamRepository extends AbstractFileRepository implements StreamRepository {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FilePersistentStreamRepository.class);
@Override
protected String getExtensionDecorator() {
@@ -46,7 +49,7 @@ public class FilePersistentStreamRepository extends AbstractFileRepository imple
return getInputStream(key);
} catch (IOException ioe) {
final String message = "Exception caught while retrieving a stream ";
- getLogger().warn(message, ioe);
+ LOGGER.warn(message, ioe);
throw new RuntimeException(message + ": " + ioe);
}
}
@@ -59,7 +62,7 @@ public class FilePersistentStreamRepository extends AbstractFileRepository imple
return new BufferedOutputStream(outputStream);
} catch (IOException ioe) {
final String message = "Exception caught while storing a stream ";
- getLogger().warn(message, ioe);
+ LOGGER.warn(message, ioe);
throw new RuntimeException(message + ": " + ioe);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
index 2b8fafa..0680e6a 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
@@ -31,26 +31,26 @@ import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.rrt.api.RecipientRewriteTable;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.Mapping.Type;
import org.apache.mailet.MailAddress;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
/**
*
*/
-public abstract class AbstractRecipientRewriteTable implements RecipientRewriteTable, LogEnabled, Configurable {
+public abstract class AbstractRecipientRewriteTable implements RecipientRewriteTable, Configurable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractRecipientRewriteTable.class);
+
// The maximum mappings which will process before throwing exception
private int mappingLimit = 10;
private boolean recursive = true;
- private Logger logger;
-
private DomainList domainList;
@Inject
@@ -71,10 +71,6 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
doConfigure(config);
}
- public void setLog(Logger logger) {
- this.logger = logger;
- }
-
/**
* Override to handle config
*
@@ -132,7 +128,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
try {
target = RecipientRewriteTableUtil.regexMap(new MailAddress(user, domain), target);
} catch (PatternSyntaxException | ParseException e) {
- getLogger().error("Exception during regexMap processing: ", e);
+ LOGGER.error("Exception during regexMap processing: ", e);
}
} else if (target.startsWith(RecipientRewriteTable.ALIASDOMAIN_PREFIX)) {
target = user + "@" + target.substring(RecipientRewriteTable.ALIASDOMAIN_PREFIX.length());
@@ -142,7 +138,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
continue;
String buf = "Valid virtual user mapping " + user + "@" + domain + " to " + target;
- getLogger().debug(buf);
+ LOGGER.debug(buf);
if (recursive) {
@@ -198,7 +194,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
}
checkMapping(user, domain, regex);
- getLogger().info("Add regex mapping => " + regex + " for user: " + user + " domain: " + domain);
+ LOGGER.info("Add regex mapping => " + regex + " for user: " + user + " domain: " + domain);
addMappingInternal(user, domain, RecipientRewriteTable.REGEX_PREFIX + regex);
}
@@ -208,7 +204,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
* java.lang.String, java.lang.String)
*/
public void removeRegexMapping(String user, String domain, String regex) throws RecipientRewriteTableException {
- getLogger().info("Remove regex mapping => " + regex + " for user: " + user + " domain: " + domain);
+ LOGGER.info("Remove regex mapping => " + regex + " for user: " + user + " domain: " + domain);
removeMappingInternal(user, domain, RecipientRewriteTable.REGEX_PREFIX + regex);
}
@@ -230,7 +226,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
throw new RecipientRewriteTableException("Invalid emailAddress: " + address, e);
}
checkMapping(user, domain, address);
- getLogger().info("Add address mapping => " + address + " for user: " + user + " domain: " + domain);
+ LOGGER.info("Add address mapping => " + address + " for user: " + user + " domain: " + domain);
addMappingInternal(user, domain, address);
}
@@ -247,7 +243,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
throw new RecipientRewriteTableException("Unable to retrieve default domain", e);
}
}
- getLogger().info("Remove address mapping => " + address + " for user: " + user + " domain: " + domain);
+ LOGGER.info("Remove address mapping => " + address + " for user: " + user + " domain: " + domain);
removeMappingInternal(user, domain, address);
}
@@ -257,7 +253,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
*/
public void addErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
checkMapping(user, domain, error);
- getLogger().info("Add error mapping => " + error + " for user: " + user + " domain: " + domain);
+ LOGGER.info("Add error mapping => " + error + " for user: " + user + " domain: " + domain);
addMappingInternal(user, domain, RecipientRewriteTable.ERROR_PREFIX + error);
}
@@ -267,7 +263,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
* java.lang.String, java.lang.String)
*/
public void removeErrorMapping(String user, String domain, String error) throws RecipientRewriteTableException {
- getLogger().info("Remove error mapping => " + error + " for user: " + user + " domain: " + domain);
+ LOGGER.info("Remove error mapping => " + error + " for user: " + user + " domain: " + domain);
removeMappingInternal(user, domain, RecipientRewriteTable.ERROR_PREFIX + error);
}
@@ -325,7 +321,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
if (mappings != null) {
count = mappings.size();
}
- getLogger().debug("Retrieve all mappings. Mapping count: " + count);
+ LOGGER.debug("Retrieve all mappings. Mapping count: " + count);
return mappings;
}
@@ -342,7 +338,7 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
* java.lang.String)
*/
public void addAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
- getLogger().info("Add domain mapping: " + aliasDomain + " => " + realDomain);
+ LOGGER.info("Add domain mapping: " + aliasDomain + " => " + realDomain);
addMappingInternal(null, aliasDomain, RecipientRewriteTable.ALIASDOMAIN_PREFIX + realDomain);
}
@@ -351,14 +347,10 @@ public abstract class AbstractRecipientRewriteTable implements RecipientRewriteT
* java.lang.String)
*/
public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws RecipientRewriteTableException {
- getLogger().info("Remove domain mapping: " + aliasDomain + " => " + realDomain);
+ LOGGER.info("Remove domain mapping: " + aliasDomain + " => " + realDomain);
removeMappingInternal(null, aliasDomain, RecipientRewriteTable.ALIASDOMAIN_PREFIX + realDomain);
}
- protected Logger getLogger() {
- return logger;
- }
-
/**
* Add new mapping
*
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
index 697bdc7..89ca24c 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
@@ -36,6 +36,8 @@ import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.api.model.JamesUser;
import org.apache.james.user.api.model.User;
import org.apache.james.user.lib.model.DefaultJamesUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A partial implementation of a Repository to store users.
@@ -48,6 +50,7 @@ import org.apache.james.user.lib.model.DefaultJamesUser;
*/
@Deprecated
public abstract class AbstractJamesUsersRepository extends AbstractUsersRepository implements JamesUsersRepository, RecipientRewriteTable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractJamesUsersRepository.class);
/**
* Ignore case in usernames
@@ -142,7 +145,7 @@ public abstract class AbstractJamesUsersRepository extends AbstractUsersReposito
mappingsBuilder.add(forward);
} else {
String errorBuffer = "Forwarding was enabled for " + username + " but no forwarding address was set for this account.";
- getLogger().error(errorBuffer);
+ LOGGER.error(errorBuffer);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
index bd9a9d2..edd2585 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
@@ -26,34 +26,20 @@ import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.user.api.AlreadyExistInUsersRepositoryException;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.mailet.MailAddress;
-import org.slf4j.Logger;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
-public abstract class AbstractUsersRepository implements UsersRepository, LogEnabled, Configurable {
+public abstract class AbstractUsersRepository implements UsersRepository, Configurable {
private DomainList domainList;
private boolean virtualHosting;
- private Logger logger;
private Optional<String> administratorId;
- protected Logger getLogger() {
- return logger;
- }
-
- /**
- * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger)
- */
- public void setLog(Logger logger) {
- this.logger = logger;
- }
-
/**
* @see
* org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java
index 555d75b..bdeaef9 100644
--- a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java
@@ -34,15 +34,11 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.api.DomainListException;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
public class AbstractDomainListPrivateMethodsTest {
-
- public static final Logger LOGGER = LoggerFactory.getLogger(AbstractDomainListPrivateMethodsTest.class);
private MyDomainList domainList;
private DNSService dnsService;
private EnvDetector envDetector;
@@ -52,7 +48,6 @@ public class AbstractDomainListPrivateMethodsTest {
dnsService = mock(DNSService.class);
envDetector = mock(EnvDetector.class);
domainList = new MyDomainList(dnsService, envDetector);
- domainList.setLog(LOGGER);
}
private static class MyDomainList extends AbstractDomainList {
@@ -188,7 +183,6 @@ public class AbstractDomainListPrivateMethodsTest {
when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(true);
when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(false);
- domainList.setLog(LOGGER);
domainList.configure(configuration);
String detected = "detected.tld";
@@ -203,7 +197,6 @@ public class AbstractDomainListPrivateMethodsTest {
when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(true);
when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(true);
- domainList.setLog(LOGGER);
domainList.configure(configuration);
String detected = "detected.tld";
@@ -222,7 +215,6 @@ public class AbstractDomainListPrivateMethodsTest {
when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(true);
when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(true);
- domainList.setLog(LOGGER);
domainList.configure(configuration);
String added = "added.tld";
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java b/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
index 6b0e056..f6f06f9 100644
--- a/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
+++ b/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
@@ -21,14 +21,12 @@ package org.apache.james.domainlist.memory;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.lib.AbstractDomainListTest;
-import org.slf4j.LoggerFactory;
public class MemoryDomainListTest extends AbstractDomainListTest {
@Override
protected DomainList createDomainList() {
MemoryDomainList testee = new MemoryDomainList(getDNSServer("localhost"));
- testee.setLog(LoggerFactory.getLogger(getClass()));
testee.setAutoDetect(false);
testee.setAutoDetectIP(false);
return testee;
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryRecipientRewriteTableTest.java b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryRecipientRewriteTableTest.java
index 80032d9..210e56f 100644
--- a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryRecipientRewriteTableTest.java
+++ b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryRecipientRewriteTableTest.java
@@ -23,14 +23,12 @@ import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest;
-import org.slf4j.LoggerFactory;
public class InMemoryRecipientRewriteTableTest extends AbstractRecipientRewriteTableTest {
@Override
protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
AbstractRecipientRewriteTable rrt = new MemoryRecipientRewriteTable();
- rrt.setLog(LoggerFactory.getLogger("MockLog"));
rrt.configure(new DefaultConfigurationBuilder());
return rrt;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java
index 118d3fd..03be5ba 100644
--- a/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java
+++ b/server/data/data-memory/src/test/java/org/apache/james/rrt/memory/InMemoryStepdefs.java
@@ -22,7 +22,6 @@ package org.apache.james.rrt.memory;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.RewriteTablesStepdefs;
-import org.slf4j.LoggerFactory;
import cucumber.api.java.Before;
@@ -41,7 +40,6 @@ public class InMemoryStepdefs {
private AbstractRecipientRewriteTable getRecipientRewriteTable() throws Exception {
MemoryRecipientRewriteTable rrt = new MemoryRecipientRewriteTable();
- rrt.setLog(LoggerFactory.getLogger("MockLog"));
rrt.configure(new DefaultConfigurationBuilder());
return rrt;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org