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:52 UTC
[27/38] james-project git commit: JAMES-2114 Deprecate LogEnabled API
JAMES-2114 Deprecate LogEnabled API
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/16b36cbd
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/16b36cbd
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/16b36cbd
Branch: refs/heads/master
Commit: 16b36cbdd4379f1f3254ef8202632cc528535aa2
Parents: 4f14df4
Author: benwa <bt...@linagora.com>
Authored: Tue Aug 15 00:28:31 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Aug 24 10:34:43 2017 +0700
----------------------------------------------------------------------
.../modules/data/CassandraDomainListModule.java | 5 -
.../CassandraRecipientRewriteTableModule.java | 5 -
.../data/CassandraUsersRepositoryModule.java | 6 -
.../james/data/LdapUsersRepositoryModule.java | 5 -
.../modules/server/ActiveMQQueueModule.java | 6 -
.../james/modules/server/DNSServiceModule.java | 5 -
.../server/MailStoreRepositoryModule.java | 2 -
.../james/modules/server/JMXServerModule.java | 23 ----
.../james/modules/data/JPADomainListModule.java | 18 +--
.../data/JPARecipientRewriteTableModule.java | 22 ++--
.../modules/data/JPAUsersRepositoryModule.java | 23 ++--
.../server/CamelMailetContainerModule.java | 7 -
.../james/modules/data/MemoryDataModule.java | 6 -
.../modules/protocols/IMAPServerModule.java | 5 -
.../modules/protocols/LMTPServerModule.java | 5 -
.../protocols/ManageSieveServerModule.java | 5 -
.../modules/protocols/POP3ServerModule.java | 5 -
.../modules/protocols/SMTPServerModule.java | 5 -
.../apache/james/lifecycle/api/LogEnabled.java | 3 +
.../mailbox/MailboxManagerManagement.java | 26 ++--
.../adapter/mailbox/MailboxManagementTest.java | 5 +-
.../MailRepositoryStoreBeanFactory.java | 41 +++---
.../lifecycle/LogEnabledBeanPostProcessor.java | 3 +
.../lifecycle/LogProviderManagementMBean.java | 2 +
.../container/spring/tool/James23Importer.java | 14 +-
.../util/retry/naming/LoggingRetryHandler.java | 10 +-
.../util/retry/naming/RetryingContext.java | 121 ++++++++---------
.../naming/directory/RetryingDirContext.java | 66 ++++------
.../retry/naming/ldap/RetryingLdapContext.java | 19 ++-
.../cassandra/CassandraDomainListTest.java | 2 -
.../CassandraRecipientRewriteTableTest.java | 2 -
.../james/rrt/cassandra/CassandraStepdefs.java | 2 -
.../mailrepository/file/FileMailRepository.java | 19 +--
.../mailrepository/file/MBoxMailRepository.java | 131 +++++++++----------
.../james/user/file/UsersFileRepository.java | 17 +--
.../james/domainlist/xml/XMLDomainListTest.java | 9 --
.../mailrepository/FileMailRepositoryTest.java | 2 -
.../mailrepository/MBoxMailRepositoryTest.java | 8 +-
.../rrt/file/XMLRecipientRewriteTableTest.java | 5 +-
.../org/apache/james/rrt/file/XMLStepdefs.java | 5 +-
.../user/file/UsersFileRepositoryTest.java | 2 -
.../domainlist/hbase/HBaseDomainListTest.java | 2 -
.../hbase/HBaseRecipientRewriteTableTest.java | 2 -
.../apache/james/rrt/hbase/HBaseStepdefs.java | 2 -
.../user/hbase/HBaseUsersRepositoryTest.java | 2 -
.../james/user/jcr/JCRUsersRepository.java | 45 ++++---
.../james/user/jcr/JcrUserRepositoryTest.java | 2 -
.../mailrepository/jdbc/JDBCMailRepository.java | 76 +++++------
.../rrt/jdbc/JDBCRecipientRewriteTable.java | 35 ++---
.../user/jdbc/AbstractJdbcUsersRepository.java | 29 ++--
.../jdbc/JDBCMailRepositoryTest.java | 2 -
.../rrt/jdbc/JDBCRecipientRewriteTableTest.java | 2 -
.../org/apache/james/rrt/jdbc/JDBCStepdefs.java | 2 -
.../jdbc/DefaultUsersJdbcRepositoryTest.java | 2 -
.../user/jdbc/JamesUsersJdbcRepositoryTest.java | 2 -
.../james/domainlist/jpa/JPADomainList.java | 13 +-
.../james/rrt/jpa/JPARecipientRewriteTable.java | 15 ++-
.../james/user/jpa/JPAUsersRepository.java | 19 +--
.../james/domainlist/jpa/JPADomainListTest.java | 2 -
.../rrt/jpa/JPARecipientRewriteTableTest.java | 2 -
.../org/apache/james/rrt/jpa/JPAStepdefs.java | 2 -
.../james/user/jpa/JpaUsersRepositoryTest.java | 2 -
.../ldap/ReadOnlyUsersLDAPRepositoryTest.java | 1 -
.../user/ldap/ReadOnlyUsersLDAPRepository.java | 32 ++---
.../ldap/ReadOnlyUsersLDAPRepositoryTest.java | 8 --
.../domainlist/lib/AbstractDomainList.java | 24 +---
.../lib/AbstractMailRepository.java | 19 +--
.../repository/file/AbstractFileRepository.java | 29 ++--
.../file/FilePersistentObjectRepository.java | 9 +-
.../file/FilePersistentStreamRepository.java | 11 +-
.../rrt/lib/AbstractRecipientRewriteTable.java | 38 +++---
.../user/lib/AbstractJamesUsersRepository.java | 5 +-
.../james/user/lib/AbstractUsersRepository.java | 16 +--
.../AbstractDomainListPrivateMethodsTest.java | 8 --
.../domainlist/memory/MemoryDomainListTest.java | 2 -
.../InMemoryRecipientRewriteTableTest.java | 2 -
.../james/rrt/memory/InMemoryStepdefs.java | 2 -
.../dnsservice/dnsjava/DNSJavaService.java | 43 +++---
.../dnsservice/dnsjava/DNSJavaServiceTest.java | 1 -
.../library/MXHostAddressIterator.java | 12 +-
.../library/MXHostAddressIteratorTest.java | 18 +--
.../mailetcontainer/impl/JamesMailSpooler.java | 45 +++----
.../impl/JamesMailetContext.java | 48 +++----
.../impl/camel/CamelCompositeProcessor.java | 1 -
.../impl/camel/CamelMailetProcessor.java | 11 +-
.../impl/camel/CamelProcessor.java | 8 +-
.../lib/AbstractStateCompositeProcessor.java | 15 +--
.../lib/AbstractStateMailetProcessor.java | 46 +++----
.../impl/JamesMailetContextTest.java | 1 -
.../impl/camel/CamelCompositeProcessorTest.java | 2 -
.../impl/camel/CamelMailetProcessorTest.java | 7 -
.../AbstractStateCompositeProcessorTest.java | 6 -
.../james/transport/mailets/RemoteDelivery.java | 6 +-
...ddressesArrayToMailAddressListConverter.java | 10 +-
.../mailets/remoteDelivery/Bouncer.java | 16 +--
.../remoteDelivery/DeliveryRunnable.java | 22 ++--
.../mailets/remoteDelivery/DnsHelper.java | 9 +-
.../mailets/remoteDelivery/MailDelivrer.java | 46 +++----
.../remoteDelivery/MailDelivrerToHost.java | 14 +-
...ssesArrayToMailAddressListConverterTest.java | 11 +-
.../mailets/remoteDelivery/BouncerTest.java | 30 ++---
.../remoteDelivery/DeliveryRunnableTest.java | 2 +-
.../remoteDelivery/MailDelivrerTest.java | 5 +-
.../org/apache/james/fetchmail/FetchMail.java | 36 +++--
.../apache/james/fetchmail/FetchScheduler.java | 27 ++--
.../apache/james/fetchmail/FolderProcessor.java | 15 ++-
.../james/fetchmail/MessageProcessor.java | 36 ++---
.../james/fetchmail/ParsedConfiguration.java | 33 +----
.../james/fetchmail/ProcessorAbstract.java | 10 --
.../apache/james/fetchmail/StoreProcessor.java | 15 ++-
.../imapserver/netty/IMAPServerFactory.java | 5 +-
.../netty/AbstractConfigurableAsyncServer.java | 57 +++-----
.../lib/netty/AbstractServerFactory.java | 17 +--
.../james/lmtpserver/netty/LMTPServer.java | 7 +-
.../lmtpserver/netty/LMTPServerFactory.java | 4 +-
.../netty/ManageSieveServerFactory.java | 4 +-
.../pop3server/netty/POP3ServerFactory.java | 4 +-
.../apache/james/pop3server/POP3ServerTest.java | 7 -
.../james/smtpserver/ExtendedSMTPSession.java | 3 +-
.../fastfail/JDBCGreylistHandler.java | 24 +---
.../james/smtpserver/fastfail/ValidRcptMX.java | 24 +---
.../james/smtpserver/netty/SMTPServer.java | 15 ++-
.../smtpserver/netty/SMTPServerFactory.java | 4 +-
.../apache/james/smtpserver/SMTPServerTest.java | 5 -
.../james/webadmin/routes/DomainRoutesTest.java | 5 -
.../james/queue/activemq/ActiveMQMailQueue.java | 19 +--
.../activemq/ActiveMQMailQueueFactory.java | 4 +-
.../queue/activemq/ActiveMQMailQueueItem.java | 8 +-
.../queue/activemq/ActiveMQMailQueueTest.java | 2 +-
.../apache/james/queue/file/FileMailQueue.java | 13 +-
.../james/queue/file/FileMailQueueFactory.java | 12 +-
.../apache/james/queue/jms/JMSMailQueue.java | 20 ++-
.../james/queue/jms/JMSMailQueueFactory.java | 2 +-
.../queue/library/AbstractMailQueueFactory.java | 13 +-
.../queue/jms/AbstractJMSMailQueueTest.java | 2 +-
.../library/AbstractMailQueueFactoryTest.java | 16 +--
136 files changed, 791 insertions(+), 1250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java
index 6d5abcc..1b3c912 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java
@@ -27,8 +27,6 @@ import org.apache.james.domainlist.cassandra.CassandraDomainList;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -40,8 +38,6 @@ import com.google.inject.multibindings.Multibinder;
public class CassandraDomainListModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(DomainList.class);
-
@Override
public void configure() {
bind(CassandraDomainList.class).in(Scopes.SINGLETON);
@@ -65,7 +61,6 @@ public class CassandraDomainListModule extends AbstractModule {
@Override
public void initModule() {
try {
- cassandraDomainList.setLog(LOGGER);
cassandraDomainList.configure(configurationProvider.getConfiguration("domainlist"));
} catch (ConfigurationException e) {
Throwables.propagate(e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java
index 8ff4123..4efd0cb 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraRecipientRewriteTableModule.java
@@ -28,8 +28,6 @@ import org.apache.james.rrt.cassandra.CassandraRRTModule;
import org.apache.james.rrt.cassandra.CassandraRecipientRewriteTable;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -41,8 +39,6 @@ import com.google.inject.multibindings.Multibinder;
public class CassandraRecipientRewriteTableModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(RecipientRewriteTable.class);
-
@Override
public void configure() {
bind(CassandraRecipientRewriteTable.class).in(Scopes.SINGLETON);
@@ -67,7 +63,6 @@ public class CassandraRecipientRewriteTableModule extends AbstractModule {
@Override
public void initModule() {
try {
- recipientRewriteTable.setLog(LOGGER);
recipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable"));
} catch (ConfigurationException e) {
Throwables.propagate(e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java
index c61aa82..f5bb2b4 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraUsersRepositoryModule.java
@@ -27,8 +27,6 @@ import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.cassandra.CassandraUsersRepository;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -39,9 +37,6 @@ import com.google.inject.Singleton;
import com.google.inject.multibindings.Multibinder;
public class CassandraUsersRepositoryModule extends AbstractModule {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CassandraUsersRepositoryModule.class);
-
@Override
public void configure() {
bind(CassandraUsersRepository.class).in(Scopes.SINGLETON);
@@ -67,7 +62,6 @@ public class CassandraUsersRepositoryModule extends AbstractModule {
@Override
public void initModule() {
try {
- usersRepository.setLog(LOGGER);
usersRepository.configure(configurationProvider.getConfiguration("usersrepository"));
} catch (ConfigurationException e) {
Throwables.propagate(e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java
index 8ea2de3..adfa373 100644
--- a/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java
+++ b/server/container/guice/cassandra-ldap-guice/src/main/java/org/apache/james/data/LdapUsersRepositoryModule.java
@@ -25,8 +25,6 @@ import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -38,8 +36,6 @@ import com.google.inject.multibindings.Multibinder;
public class LdapUsersRepositoryModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(LdapUsersRepositoryModule.class);
-
@Override
public void configure() {
bind(ReadOnlyUsersLDAPRepository.class).in(Scopes.SINGLETON);
@@ -63,7 +59,6 @@ public class LdapUsersRepositoryModule extends AbstractModule {
@Override
public void initModule() {
try {
- usersRepository.setLog(LOGGER);
usersRepository.configure(configurationProvider.getConfiguration("usersrepository"));
usersRepository.init();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/ActiveMQQueueModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/ActiveMQQueueModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/ActiveMQQueueModule.java
index 1fe7018..577db16 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/ActiveMQQueueModule.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/ActiveMQQueueModule.java
@@ -26,8 +26,6 @@ import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.james.queue.activemq.ActiveMQMailQueueFactory;
import org.apache.james.queue.activemq.EmbeddedActiveMQ;
import org.apache.james.queue.api.MailQueueFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
@@ -35,9 +33,6 @@ import com.google.inject.Scopes;
import com.google.inject.Singleton;
public class ActiveMQQueueModule extends AbstractModule {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(ActiveMQQueueModule.class);
-
@Override
protected void configure() {
bind(PersistenceAdapter.class).to(KahaDBPersistenceAdapter.class);
@@ -55,7 +50,6 @@ public class ActiveMQQueueModule extends AbstractModule {
@Singleton
public MailQueueFactory createActiveMailQueueFactory(ActiveMQMailQueueFactory activeMQMailQueueFactory) {
activeMQMailQueueFactory.setUseJMX(true);
- activeMQMailQueueFactory.setLog(LOGGER);
activeMQMailQueueFactory.init();
return activeMQMailQueueFactory;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java
index 15501a9..449a10b 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/DNSServiceModule.java
@@ -25,8 +25,6 @@ import org.apache.james.dnsservice.dnsjava.DNSJavaService;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -38,8 +36,6 @@ import com.google.inject.multibindings.Multibinder;
public class DNSServiceModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(DNSServiceModule.class);
-
@Override
protected void configure() {
bind(DNSJavaService.class).in(Scopes.SINGLETON);
@@ -62,7 +58,6 @@ public class DNSServiceModule extends AbstractModule {
public void initModule() {
try {
- dnsService.setLog(LOGGER);
dnsService.configure(configurationProvider.getConfiguration("dnsservice"));
dnsService.init();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java
index b5d1b35..4ed9cd7 100644
--- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java
+++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/MailStoreRepositoryModule.java
@@ -30,7 +30,6 @@ import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
import org.apache.james.utils.InMemoryMailRepositoryStore;
import org.apache.james.utils.MailRepositoryProvider;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -71,7 +70,6 @@ public class MailStoreRepositoryModule extends AbstractModule {
public MailRepository get() {
FileMailRepository fileMailRepository = new FileMailRepository();
fileMailRepository.setFileSystem(fileSystem);
- fileMailRepository.setLog(LoggerFactory.getLogger(FileMailRepository.class));
return fileMailRepository;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java
index 626ef3a..b4ef788 100644
--- a/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java
+++ b/server/container/guice/jmx/src/main/java/org/apache/james/modules/server/JMXServerModule.java
@@ -47,7 +47,6 @@ import org.apache.james.user.api.UsersRepositoryManagementMBean;
import org.apache.james.user.lib.UsersRepositoryManagement;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.GuiceMailboxManagerResolver;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -94,7 +93,6 @@ public class JMXServerModule extends AbstractModule {
bind(SieveRepositoryManagementMBean.class).to(SieveRepositoryManagement.class);
Multibinder<ConfigurationPerformer> configurationMultibinder = Multibinder.newSetBinder(binder(), ConfigurationPerformer.class);
configurationMultibinder.addBinding().to(JMXModuleConfigurationPerformer.class);
- configurationMultibinder.addBinding().to(MailboxManagementLogSetter.class);
}
@Singleton
@@ -154,25 +152,4 @@ public class JMXServerModule extends AbstractModule {
}
}
- @Singleton
- public static class MailboxManagementLogSetter implements ConfigurationPerformer {
-
- private final MailboxManagerManagement mailboxManagerManagement;
-
- @Inject
- public MailboxManagementLogSetter(MailboxManagerManagement mailboxManagerManagement) {
- this.mailboxManagerManagement = mailboxManagerManagement;
- }
-
- @Override
- public void initModule() {
- mailboxManagerManagement.setLog(LoggerFactory.getLogger(MailboxManagerManagement.class));
- }
-
- @Override
- public List<Class<? extends Configurable>> forClasses() {
- return ImmutableList.of();
- }
- }
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
index 4bb0030..7f2be3d 100644
--- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
+++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPADomainListModule.java
@@ -18,13 +18,8 @@
****************************************************************/
package org.apache.james.modules.data;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
-import com.google.inject.Scopes;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
+import java.util.List;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.jpa.JPADomainList;
@@ -34,7 +29,13 @@ import org.apache.james.utils.ConfigurationProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.AbstractModule;
+import com.google.inject.Inject;
+import com.google.inject.Scopes;
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.Multibinder;
public class JPADomainListModule extends AbstractModule {
@@ -62,7 +63,6 @@ public class JPADomainListModule extends AbstractModule {
@Override
public void initModule() {
try {
- jpaDomainList.setLog(LOGGER);
jpaDomainList.configure(configurationProvider.getConfiguration("domainlist"));
} catch (ConfigurationException e) {
Throwables.propagate(e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java
index a1f55b3..3741b91 100644
--- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java
+++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPARecipientRewriteTableModule.java
@@ -18,28 +18,25 @@
****************************************************************/
package org.apache.james.modules.data;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
-import com.google.inject.Scopes;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
+import java.util.List;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.rrt.api.RecipientRewriteTable;
import org.apache.james.rrt.jpa.JPARecipientRewriteTable;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.util.List;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.AbstractModule;
+import com.google.inject.Inject;
+import com.google.inject.Scopes;
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.Multibinder;
public class JPARecipientRewriteTableModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(RecipientRewriteTable.class);
-
@Override
public void configure() {
bind(JPARecipientRewriteTable.class).in(Scopes.SINGLETON);
@@ -62,7 +59,6 @@ public class JPARecipientRewriteTableModule extends AbstractModule {
@Override
public void initModule() {
try {
- recipientRewriteTable.setLog(LOGGER);
recipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable"));
} catch (ConfigurationException e) {
Throwables.propagate(e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java
index ca26073..061acd3 100644
--- a/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java
+++ b/server/container/guice/jpa-common-guice/src/main/java/org/apache/james/modules/data/JPAUsersRepositoryModule.java
@@ -18,28 +18,24 @@
****************************************************************/
package org.apache.james.modules.data;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
-import com.google.inject.Scopes;
-import com.google.inject.Singleton;
-import com.google.inject.multibindings.Multibinder;
+import java.util.List;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.jpa.JPAUsersRepository;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.util.List;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.google.inject.AbstractModule;
+import com.google.inject.Inject;
+import com.google.inject.Scopes;
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.Multibinder;
public class JPAUsersRepositoryModule extends AbstractModule {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(JPAUsersRepositoryModule.class);
-
@Override
public void configure() {
bind(JPAUsersRepository.class).in(Scopes.SINGLETON);
@@ -63,7 +59,6 @@ public class JPAUsersRepositoryModule extends AbstractModule {
@Override
public void initModule() {
try {
- usersRepository.setLog(LOGGER);
usersRepository.configure(configurationProvider.getConfiguration("usersrepository"));
} catch (ConfigurationException e) {
Throwables.propagate(e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
index 58e57c3..576bef2 100644
--- a/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
+++ b/server/container/guice/mailet/src/main/java/org/apache/james/modules/server/CamelMailetContainerModule.java
@@ -63,9 +63,6 @@ import com.google.inject.multibindings.Multibinder;
public class CamelMailetContainerModule extends AbstractModule {
- private static final Logger CAMEL_LOGGER = LoggerFactory.getLogger(CamelCompositeProcessor.class);
- private static final Logger SPOOLER_LOGGER = LoggerFactory.getLogger(JamesMailSpooler.class);
- private static final Logger MAILET_LOGGER = LoggerFactory.getLogger(JamesMailetContext.class);
private static final Logger LOGGER = LoggerFactory.getLogger(CamelMailetContainerModule.class);
@Override
@@ -92,7 +89,6 @@ public class CamelMailetContainerModule extends AbstractModule {
UsersRepository localusers,
DomainList domains) {
JamesMailetContext jamesMailetContext = new JamesMailetContext();
- jamesMailetContext.setLog(MAILET_LOGGER);
jamesMailetContext.setDNSService(dns);
jamesMailetContext.retrieveRootMailQueue(mailQueueFactory);
jamesMailetContext.setUsersRepository(localusers);
@@ -145,7 +141,6 @@ public class CamelMailetContainerModule extends AbstractModule {
}
private void configureProcessors(DefaultCamelContext camelContext) throws Exception {
- camelCompositeProcessor.setLog(CAMEL_LOGGER);
camelCompositeProcessor.setCamelContext(camelContext);
camelCompositeProcessor.configure(getProcessorConfiguration());
camelCompositeProcessor.init();
@@ -163,7 +158,6 @@ public class CamelMailetContainerModule extends AbstractModule {
private void configureJamesSpooler() throws ConfigurationException {
jamesMailSpooler.setMailProcessor(camelCompositeProcessor);
- jamesMailSpooler.setLog(SPOOLER_LOGGER);
jamesMailSpooler.configure(getJamesSpoolerConfiguration());
jamesMailSpooler.init();
}
@@ -179,7 +173,6 @@ public class CamelMailetContainerModule extends AbstractModule {
}
private void configureMailetContext() throws ConfigurationException {
- mailetContext.setLog(MAILET_LOGGER);
mailetContext.configure(getMailetContextConfiguration());
mailetContext.retrieveRootMailQueue(mailQueueFactory);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
index e7799e5..7f6ad5c 100644
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
+++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/data/MemoryDataModule.java
@@ -31,8 +31,6 @@ import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -44,8 +42,6 @@ import com.google.inject.multibindings.Multibinder;
public class MemoryDataModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(MemoryDataModule.class);
-
@Override
protected void configure() {
install(new SieveFileRepositoryModule());
@@ -79,9 +75,7 @@ public class MemoryDataModule extends AbstractModule {
@Override
public void initModule() {
try {
- memoryDomainList.setLog(LOGGER);
memoryDomainList.configure(configurationProvider.getConfiguration("domainlist"));
- memoryRecipientRewriteTable.setLog(LOGGER);
memoryRecipientRewriteTable.configure(configurationProvider.getConfiguration("recipientrewritetable"));
} catch (ConfigurationException e) {
Throwables.propagate(e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java b/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java
index f2c4d8a..3273779 100644
--- a/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java
+++ b/server/container/guice/protocols/imap/src/main/java/org/apache/james/modules/protocols/IMAPServerModule.java
@@ -36,8 +36,6 @@ import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.modules.Names;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -50,8 +48,6 @@ import com.google.inject.name.Named;
public class IMAPServerModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(IMAPServerModule.class);
-
@Override
protected void configure() {
Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(IMAPModuleConfigurationPerformer.class);
@@ -100,7 +96,6 @@ public class IMAPServerModule extends AbstractModule {
@Override
public void initModule() {
try {
- imapServerFactory.setLog(LOGGER);
imapServerFactory.configure(configurationProvider.getConfiguration("imapserver"));
imapServerFactory.init();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java b/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java
index 22fbb65..c173643 100644
--- a/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java
+++ b/server/container/guice/protocols/lmtp/src/main/java/org/apache/james/modules/protocols/LMTPServerModule.java
@@ -25,8 +25,6 @@ import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lmtpserver.netty.LMTPServerFactory;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -37,8 +35,6 @@ import com.google.inject.multibindings.Multibinder;
public class LMTPServerModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(LMTPServerModule.class);
-
@Override
protected void configure() {
Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(LMTPModuleConfigurationPerformer.class);
@@ -59,7 +55,6 @@ public class LMTPServerModule extends AbstractModule {
@Override
public void initModule() {
try {
- lmtpServerFactory.setLog(LOGGER);
lmtpServerFactory.configure(configurationProvider.getConfiguration("lmtpserver"));
lmtpServerFactory.init();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java
index 45bffdf..789c404 100644
--- a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java
+++ b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/ManageSieveServerModule.java
@@ -27,8 +27,6 @@ import org.apache.james.managesieveserver.netty.ManageSieveServerFactory;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
import org.apache.james.utils.GuiceProbe;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -39,8 +37,6 @@ import com.google.inject.multibindings.Multibinder;
public class ManageSieveServerModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveServerModule.class);
-
@Override
protected void configure() {
bind(CoreCommands.class).to(CoreProcessor.class);
@@ -63,7 +59,6 @@ public class ManageSieveServerModule extends AbstractModule {
@Override
public void initModule() {
try {
- manageSieveServerFactory.setLog(LOGGER);
manageSieveServerFactory.configure(configurationProvider.getConfiguration("managesieveserver"));
manageSieveServerFactory.init();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java b/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java
index 4efd481..33afc9d 100644
--- a/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java
+++ b/server/container/guice/protocols/pop/src/main/java/org/apache/james/modules/protocols/POP3ServerModule.java
@@ -25,8 +25,6 @@ import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.pop3server.netty.POP3ServerFactory;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -37,8 +35,6 @@ import com.google.inject.multibindings.Multibinder;
public class POP3ServerModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(POP3ServerModule.class);
-
@Override
protected void configure() {
Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(POP3ModuleConfigurationPerformer.class);
@@ -59,7 +55,6 @@ public class POP3ServerModule extends AbstractModule {
@Override
public void initModule() {
try {
- pop3ServerFactory.setLog(LOGGER);
pop3ServerFactory.configure(configurationProvider.getConfiguration("pop3server"));
pop3ServerFactory.init();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java b/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java
index bb5f233..5ca76a3 100644
--- a/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java
+++ b/server/container/guice/protocols/smtp/src/main/java/org/apache/james/modules/protocols/SMTPServerModule.java
@@ -26,8 +26,6 @@ import org.apache.james.smtpserver.SendMailHandler;
import org.apache.james.smtpserver.netty.SMTPServerFactory;
import org.apache.james.utils.ConfigurationPerformer;
import org.apache.james.utils.ConfigurationProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
@@ -38,8 +36,6 @@ import com.google.inject.multibindings.Multibinder;
public class SMTPServerModule extends AbstractModule {
- private static final Logger LOGGER = LoggerFactory.getLogger(SMTPServerModule.class);
-
@Override
protected void configure() {
Multibinder.newSetBinder(binder(), ConfigurationPerformer.class).addBinding().to(SMTPModuleConfigurationPerformer.class);
@@ -64,7 +60,6 @@ public class SMTPServerModule extends AbstractModule {
@Override
public void initModule() {
try {
- smtpServerFactory.setLog(LOGGER);
smtpServerFactory.configure(configurationProvider.getConfiguration("smtpserver"));
smtpServerFactory.init();
sendMailHandler.init(null);
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/lifecycle-api/src/main/java/org/apache/james/lifecycle/api/LogEnabled.java
----------------------------------------------------------------------
diff --git a/server/container/lifecycle-api/src/main/java/org/apache/james/lifecycle/api/LogEnabled.java b/server/container/lifecycle-api/src/main/java/org/apache/james/lifecycle/api/LogEnabled.java
index b398b9d..d829441 100644
--- a/server/container/lifecycle-api/src/main/java/org/apache/james/lifecycle/api/LogEnabled.java
+++ b/server/container/lifecycle-api/src/main/java/org/apache/james/lifecycle/api/LogEnabled.java
@@ -25,7 +25,10 @@ import org.slf4j.Logger;
* Indicates that a services requires general logging. Note that this log should
* only be used for general service operations. A context sensitive log should
* be preferred where that is available within the context of a call.
+ *
+ * @deprecated Prefer using SLF4J LoggingFactory to get a Logger in each class
*/
+@Deprecated
public interface LogEnabled {
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
index 517326a..11caf4b 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
@@ -32,7 +32,6 @@ import javax.mail.Flags;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
@@ -43,6 +42,7 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MailboxQuery;
import org.apache.james.util.MDCBuilder;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.github.steveash.guavate.Guavate;
import com.google.common.base.Preconditions;
@@ -51,10 +51,10 @@ import com.google.common.base.Throwables;
/**
* JMX managmenent for Mailboxes
*/
-public class MailboxManagerManagement extends StandardMBean implements MailboxManagerManagementMBean, LogEnabled {
+public class MailboxManagerManagement extends StandardMBean implements MailboxManagerManagementMBean {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MailboxManagerManagement.class);
private MailboxManager mailboxManager;
- private Logger log;
private static final boolean RECENT = true;
@Inject
@@ -87,7 +87,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
}
return true;
} catch (MailboxException e) {
- log.error("Error while remove mailboxes for user " + username, e);
+ LOGGER.error("Error while remove mailboxes for user " + username, e);
} catch (IOException e) {
throw Throwables.propagate(e);
} finally {
@@ -97,14 +97,6 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
}
/**
- * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger)
- */
- @Override
- public void setLog(Logger log) {
- this.log = log;
- }
-
- /**
* @see
* org.apache.james.adapter.mailbox.MailboxManagerManagementMBean#listMailboxes
* (java.lang.String)
@@ -128,7 +120,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
.sorted()
.collect(Guavate.toImmutableList());
} catch (MailboxException e) {
- log.error("Error list mailboxes for user " + username, e);
+ LOGGER.error("Error list mailboxes for user " + username, e);
} catch (IOException e) {
throw Throwables.propagate(e);
} finally {
@@ -152,7 +144,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
mailboxManager.startProcessingRequest(session);
mailboxManager.createMailbox(mailboxPath, session);
} catch (Exception e) {
- log.error("Unable to create mailbox", e);
+ LOGGER.error("Unable to create mailbox", e);
} finally {
closeSession(session);
}
@@ -173,7 +165,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
mailboxManager.startProcessingRequest(session);
mailboxManager.deleteMailbox(mailboxPath, session);
} catch (Exception e) {
- log.error("Unable to create mailbox", e);
+ LOGGER.error("Unable to create mailbox", e);
} finally {
closeSession(session);
}
@@ -200,7 +192,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
messageManager.appendMessage(emlFileAsStream, new Date(),
session, RECENT, new Flags());
} catch (Exception e) {
- log.error("Unable to create mailbox", e);
+ LOGGER.error("Unable to create mailbox", e);
} finally {
closeSession(session);
}
@@ -212,7 +204,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
try {
mailboxManager.logout(session, true);
} catch (MailboxException e) {
- log.error("Can not log session out", e);
+ LOGGER.error("Can not log session out", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
index 30385cd..5a19e55 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java
@@ -33,9 +33,9 @@ import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MessageRange;
-import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.FakeAuthenticator;
import org.apache.james.mailbox.store.FakeAuthorizator;
+import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.model.DefaultMessageId;
@@ -76,8 +76,7 @@ public class MailboxManagementTest {
mailboxManager.init();
mailboxManagerManagement = new MailboxManagerManagement();
mailboxManagerManagement.setMailboxManager(mailboxManager);
- mailboxManagerManagement.setLog(LOGGER);
- session = mailboxManager.createSystemSession("TEST", LOGGER);
+ session = mailboxManager.createSystemSession("TEST");
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
index e809afe..4c93944 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
@@ -36,13 +36,15 @@ import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
/**
* Provides a registry of mail repositories. A mail repository is uniquely
* identified by its destinationURL, type and model.
*/
-public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implements MailRepositoryStore, LogEnabled, Configurable {
+public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implements MailRepositoryStore, Configurable {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MailRepositoryStoreBeanFactory.class);
/**
* Map of [destinationURL + type]->Repository
@@ -65,11 +67,6 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
private HierarchicalConfiguration configuration;
/**
- * The Logger
- */
- private Logger logger;
-
- /**
* @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
@@ -80,7 +77,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
@SuppressWarnings("unchecked")
public void init() throws Exception {
- getLogger().info("JamesMailStore init...");
+ LOGGER.info("JamesMailStore init...");
repositories = new ReferenceMap();
classes = new HashMap<>();
@@ -110,7 +107,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
String className = repConf.getString("[@class]");
- boolean infoEnabled = getLogger().isInfoEnabled();
+ boolean infoEnabled = LOGGER.isInfoEnabled();
for (String protocol : repConf.getStringArray("protocols.protocol")) {
HierarchicalConfiguration defConf = null;
@@ -122,7 +119,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
}
if (infoEnabled) {
- getLogger().info("Registering Repository instance of class {} to handle {} protocol requests", className, protocol);
+ LOGGER.info("Registering Repository instance of class {} to handle {} protocol requests", className, protocol);
}
if (classes.get(protocol) != null) {
@@ -166,16 +163,16 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
MailRepository reply = repositories.get(repID);
StringBuffer logBuffer;
if (reply != null) {
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
logBuffer = new StringBuffer(128).append("obtained repository: ").append(repID).append(",").append(reply.getClass());
- getLogger().debug(logBuffer.toString());
+ LOGGER.debug(logBuffer.toString());
}
return reply;
} else {
String repClass = classes.get(protocol);
- if (getLogger().isDebugEnabled()) {
+ if (LOGGER.isDebugEnabled()) {
logBuffer = new StringBuffer(128).append("obtained repository: ").append(repClass).append(" to handle: ").append(protocol).append(" with key ").append(protocol);
- getLogger().debug(logBuffer.toString());
+ LOGGER.debug(logBuffer.toString());
}
// If default values have been set, create a new repository
@@ -198,7 +195,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
reply = (MailRepository) getBeanFactory().autowire(clazz, ConfigurableListableBeanFactory.AUTOWIRE_AUTODETECT, false);
if (reply instanceof LogEnabled) {
- ((LogEnabled) reply).setLog(logger);
+ ((LogEnabled) reply).setLog(LOGGER);
}
if (reply instanceof Configurable) {
@@ -208,14 +205,14 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
reply = (MailRepository) getBeanFactory().initializeBean(reply, protocol);
repositories.put(repID, reply);
- if (getLogger().isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
logBuffer = new StringBuffer(128).append("added repository: ").append(repID).append("->").append(repClass);
- getLogger().info(logBuffer.toString());
+ LOGGER.info(logBuffer.toString());
}
return reply;
} catch (Exception e) {
- if (getLogger().isWarnEnabled()) {
- getLogger().warn("Exception while creating repository:" + e.getMessage(), e);
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Exception while creating repository:" + e.getMessage(), e);
}
throw new MailRepositoryStoreException("Cannot find or init repository", e);
}
@@ -230,12 +227,4 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
return new ArrayList<>(repositories.keySet());
}
- public void setLog(Logger logger) {
- this.logger = logger;
- }
-
- private Logger getLogger() {
- return logger;
- }
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
index 9b76bda..6402211 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
@@ -22,7 +22,10 @@ import org.apache.james.lifecycle.api.LogEnabled;
/**
* Inject Commons Log to beans which implement LogEnabled.
+ *
+ * @deprecated Prefer using SLF4J LoggingFactory to get a Logger in each class
*/
+@Deprecated
public class LogEnabledBeanPostProcessor extends AbstractLifecycleBeanPostProcessor<LogEnabled> {
private LogProvider provider;
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderManagementMBean.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderManagementMBean.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderManagementMBean.java
index a5b8d48..605396c 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderManagementMBean.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderManagementMBean.java
@@ -23,7 +23,9 @@ import java.util.Map;
/**
* Allow to change loglevel via JMX
+ * @deprecated static configuration via SLF4J implementation configuration file is advised
*/
+@Deprecated
public interface LogProviderManagementMBean {
List<String> getSupportedLogLevels();
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
index 4236b61..e9fb853 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
@@ -30,7 +30,6 @@ import javax.mail.MessagingException;
import org.apache.james.core.MimeMessageInputStream;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
@@ -44,13 +43,13 @@ import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.mailet.Mail;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tool to import James 2.3 users and mails into James 3.0.
*/
-public class James23Importer implements LogEnabled {
-
- private Logger log;
+public class James23Importer {
+ private static final Logger LOGGER = LoggerFactory.getLogger(James23Importer.class);
/**
* James 3.0 users repository.
@@ -114,7 +113,7 @@ public class James23Importer implements LogEnabled {
String userName23 = j23uIt.next();
String userName30 = convert23UserTo30(userName23);
james30UsersRepository.addUser(userName30, defaultPassword);
- log.info("New user is copied from 2.3 to 3.0 with username=" + userName30);
+ LOGGER.info("New user is copied from 2.3 to 3.0 with username=" + userName30);
}
}
@@ -171,11 +170,6 @@ public class James23Importer implements LogEnabled {
}
- @Override
- public void setLog(Logger log) {
- this.log = log;
- }
-
/**
* Utility method to convert a James 2.3 username to a James 3.0 username.
* To achieve this, we need to add the default James 3.0 domain because 2.3
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
index 3da943c..8baa744 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/LoggingRetryHandler.java
@@ -25,13 +25,13 @@ import javax.naming.NamingException;
import org.apache.james.util.retry.api.ExceptionRetryingProxy;
import org.apache.james.util.retry.api.RetrySchedule;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract class <code>LoggingRetryHandler</code> implements logging of failures
*/
abstract public class LoggingRetryHandler extends NamingExceptionRetryHandler {
-
- private Logger _logger = null;
+ private static final Logger LOGGER = LoggerFactory.getLogger(LoggingRetryHandler.class);
/**
* Creates a new instance of LoggingRetryHandler.
@@ -39,12 +39,10 @@ abstract public class LoggingRetryHandler extends NamingExceptionRetryHandler {
* @param exceptionClasses
* @param proxy
* @param maxRetries
- * @param logger
*/
public LoggingRetryHandler(Class<?>[] exceptionClasses, ExceptionRetryingProxy proxy,
- RetrySchedule schedule, int maxRetries, Logger logger) {
+ RetrySchedule schedule, int maxRetries) {
super(exceptionClasses, proxy, schedule, maxRetries);
- _logger = logger;
}
/**
@@ -52,7 +50,7 @@ abstract public class LoggingRetryHandler extends NamingExceptionRetryHandler {
@Override
public void postFailure(NamingException ex, int retryCount) {
super.postFailure(ex, retryCount);
- _logger.info(
+ LOGGER.info(
"Retry failure: " + ex.getLocalizedMessage() + "\n Retrying in " + getRetryInterval(retryCount) / 1000 + " seconds"
);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
index e67d366..18452a5 100644
--- a/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
+++ b/server/container/util/src/main/java/org/apache/james/util/retry/naming/RetryingContext.java
@@ -35,7 +35,6 @@ import javax.naming.ServiceUnavailableException;
import org.apache.james.util.retry.api.ExceptionRetryingProxy;
import org.apache.james.util.retry.api.RetrySchedule;
-import org.slf4j.Logger;
/**
* <code>RetryingContext</code> retries the methods defined by <code>javax.naming.Context</code>
@@ -55,7 +54,6 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
private Context _delegate = null;
private RetrySchedule _schedule = null;
private int _maxRetries = 0;
- private Logger _logger = null;
/**
* Creates a new instance of RetryingContext.
@@ -74,12 +72,11 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*
* @param schedule
* @param maxRetries
- * @param logger
* @throws NamingException
*/
- public RetryingContext(RetrySchedule schedule, int maxRetries, Logger logger)
+ public RetryingContext(RetrySchedule schedule, int maxRetries)
throws NamingException {
- this(DEFAULT_EXCEPTION_CLASSES, schedule, maxRetries, logger);
+ this(DEFAULT_EXCEPTION_CLASSES, schedule, maxRetries);
}
/**
@@ -88,17 +85,15 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
* @param exceptionClasses
* @param schedule
* @param maxRetries
- * @param logger
* @throws NamingException
*/
- public RetryingContext(Class<?>[] exceptionClasses, RetrySchedule schedule, int maxRetries, Logger logger)
+ public RetryingContext(Class<?>[] exceptionClasses, RetrySchedule schedule, int maxRetries)
throws NamingException {
this();
_schedule = schedule;
_maxRetries = maxRetries;
- _logger = logger;
_delegate = (Context) new LoggingRetryHandler(exceptionClasses, this,
- _schedule, _maxRetries, _logger) {
+ _schedule, _maxRetries) {
@Override
public Object operation() throws Exception {
@@ -114,8 +109,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
@Override
public Object addToEnvironment(final String propName, final Object propVal)
throws NamingException {
- return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -129,8 +124,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void bind(final Name name, final Object obj) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -145,8 +140,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void bind(final String name, final Object obj) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -161,8 +156,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void close() throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -178,8 +173,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public Name composeName(final Name name, final Name prefix) throws NamingException {
- return (Name) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return (Name) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -193,8 +188,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public String composeName(final String name, final String prefix) throws NamingException {
- return (String) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return (String) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -209,7 +204,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
@Override
public Context createSubcontext(final Name name) throws NamingException {
final Context context = getDelegate();
- return new RetryingContext(getSchedule(), getMaxRetries(), getLogger()) {
+ return new RetryingContext(getSchedule(), getMaxRetries()) {
@Override
public Context newDelegate() throws NamingException {
@@ -224,7 +219,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
@Override
public Context createSubcontext(final String name) throws NamingException {
final Context context = getDelegate();
- return new RetryingContext( getSchedule(), getMaxRetries(), getLogger()) {
+ return new RetryingContext( getSchedule(), getMaxRetries()) {
@Override
public Context newDelegate() throws NamingException {
@@ -239,8 +234,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void destroySubcontext(final Name name) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -255,8 +250,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void destroySubcontext(final String name) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -272,7 +267,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
@Override
public Hashtable<?, ?> getEnvironment() throws NamingException {
return (Hashtable<?, ?>) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this,
- _schedule, _maxRetries, _logger) {
+ _schedule, _maxRetries) {
@Override
public Object operation() throws NamingException {
@@ -286,8 +281,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public String getNameInNamespace() throws NamingException {
- return (String) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return (String) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -301,8 +296,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public NameParser getNameParser(final Name name) throws NamingException {
- return (NameParser) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return (NameParser) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -316,8 +311,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public NameParser getNameParser(final String name) throws NamingException {
- return (NameParser) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return (NameParser) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -333,7 +328,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
@Override
public NamingEnumeration<NameClassPair> list(final Name name) throws NamingException {
return (NamingEnumeration<NameClassPair>) new LoggingRetryHandler(
- DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries, _logger) {
+ DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries) {
@Override
public Object operation() throws NamingException {
@@ -349,7 +344,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
@Override
public NamingEnumeration<NameClassPair> list(final String name) throws NamingException {
return (NamingEnumeration<NameClassPair>) new LoggingRetryHandler(
- DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries, _logger) {
+ DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries) {
@Override
public Object operation() throws NamingException {
@@ -365,7 +360,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
@Override
public NamingEnumeration<Binding> listBindings(final Name name) throws NamingException {
return (NamingEnumeration<Binding>) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES,
- this, _schedule, _maxRetries, _logger) {
+ this, _schedule, _maxRetries) {
@Override
public Object operation() throws NamingException {
@@ -381,7 +376,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
@Override
public NamingEnumeration<Binding> listBindings(final String name) throws NamingException {
return (NamingEnumeration<Binding>) new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES,
- this, _schedule, _maxRetries, _logger) {
+ this, _schedule, _maxRetries) {
@Override
public Object operation() throws NamingException {
@@ -395,8 +390,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public Object lookup(final Name name) throws NamingException {
- return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -410,8 +405,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public Object lookup(final String name) throws NamingException {
- return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -425,8 +420,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public Object lookupLink(final Name name) throws NamingException {
- return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -440,8 +435,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public Object lookupLink(final String name) throws NamingException {
- return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -455,8 +450,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void rebind(final Name name, final Object obj) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -471,8 +466,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void rebind(final String name, final Object obj) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -487,8 +482,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public Object removeFromEnvironment(final String propName) throws NamingException {
- return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ return new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -502,8 +497,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void rename(final Name oldName, final Name newName) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -518,8 +513,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void rename(final String oldName, final String newName) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -534,8 +529,8 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void unbind(final Name name) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries
+ ) {
@Override
public Object operation() throws NamingException {
@@ -550,8 +545,7 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
*/
@Override
public void unbind(final String name) throws NamingException {
- new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries,
- _logger) {
+ new LoggingRetryHandler(DEFAULT_EXCEPTION_CLASSES, this, _schedule, _maxRetries) {
@Override
public Object operation() throws NamingException {
@@ -592,11 +586,4 @@ abstract public class RetryingContext implements Context, ExceptionRetryingProxy
return _maxRetries;
}
- /**
- * @return the logger
- */
- public Logger getLogger() {
- return _logger;
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org