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 er...@apache.org on 2013/02/15 15:36:22 UTC
svn commit: r1446602 - in /james/server/trunk:
data/data-file/src/main/java/org/apache/james/mailrepository/file/
data/data-file/src/main/java/org/apache/james/user/file/
data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/
data/data-libr...
Author: eric
Date: Fri Feb 15 14:36:21 2013
New Revision: 1446602
URL: http://svn.apache.org/r1446602
Log:
Move back the @Named annotations on the parameters (JAMES-1477)
Modified:
james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java
james/server/trunk/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
Modified: james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java (original)
+++ james/server/trunk/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java Fri Feb 15 14:36:21 2013
@@ -72,8 +72,7 @@ public class FileMailRepository extends
private FileSystem fileSystem;
@Inject
- @Named("filesystem")
- public void setFileSystem(FileSystem fileSystem) {
+ public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java (original)
+++ james/server/trunk/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java Fri Feb 15 14:36:21 2013
@@ -70,8 +70,7 @@ public class UsersFileRepository extends
private FileSystem fileSystem;
@Inject
- @Named("filesystem")
- public void setFileSystem(FileSystem fileSystem) {
+ public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java (original)
+++ james/server/trunk/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java Fri Feb 15 14:36:21 2013
@@ -154,8 +154,7 @@ public class JDBCMailRepository extends
}
@Inject
- @Named("filesystem")
- public void setFileSystem(FileSystem fileSystem) {
+ public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java (original)
+++ james/server/trunk/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java Fri Feb 15 14:36:21 2013
@@ -37,8 +37,7 @@ public class DomainListManagement extend
}
@Inject
- @Named("domainlist")
- @Resource(name = "domainlist")
+ @Resource(@Named("domainlist") name = "domainlist")
public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java (original)
+++ james/server/trunk/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java Fri Feb 15 14:36:21 2013
@@ -73,8 +73,7 @@ public abstract class AbstractFileReposi
}
@Inject
- @Named("filesystem")
- public void setFileSystem(FileSystem fileSystem) {
+ public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java (original)
+++ james/server/trunk/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java Fri Feb 15 14:36:21 2013
@@ -43,9 +43,8 @@ public class RecipientRewriteTableManage
}
@Inject
- @Named("recipientrewritetable")
@Resource(name = "recipientrewritetable")
- public void setManageableRecipientRewriteTable(RecipientRewriteTable rrt) {
+ public void setManageableRecipientRewriteTable(@Named("recipientrewritetable") RecipientRewriteTable rrt) {
this.rrt = rrt;
}
Modified: james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java (original)
+++ james/server/trunk/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java Fri Feb 15 14:36:21 2013
@@ -42,9 +42,8 @@ public class UsersRepositoryManagement e
private UsersRepository usersRepository;
@Inject
- @Named("usersrepository")
@Resource(name = "usersrepository")
- public void setUsersRepository(UsersRepository usersRepository) {
+ public void setUsersRepository(@Named("usersrepository") UsersRepository usersRepository) {
this.usersRepository = usersRepository;
}
Modified: james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java (original)
+++ james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java Fri Feb 15 14:36:21 2013
@@ -39,9 +39,8 @@ public class UserRepositoryAuthenticator
private Logger log;
@Inject
- @Named("usersrepository")
@Resource(name = "usersrepository")
- public void setUsersRepository(UsersRepository repos) {
+ public void setUsersRepository(@Named("usersrepository") UsersRepository repos) {
this.repos = repos;
}
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java Fri Feb 15 14:36:21 2013
@@ -48,14 +48,12 @@ public class CamelCompositeProcessor ext
private MailetLoader mailetLoader;
@Inject
- @Named("matcherloader")
- public void setMatcherLoader(MatcherLoader matcherLoader) {
+ public void setMatcherLoader(@Named("matcherloader") MatcherLoader matcherLoader) {
this.matcherLoader = matcherLoader;
}
@Inject
- @Named("mailetloader")
- public void setMailetLoader(MailetLoader mailetLoader) {
+ public void setMailetLoader(@Named("mailetloader") MailetLoader mailetLoader) {
this.mailetLoader = mailetLoader;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java Fri Feb 15 14:36:21 2013
@@ -54,32 +54,27 @@ public class LocalDelivery extends Gener
private FileSystem fileSystem;
@Inject
- @Named("recipientrewritetable")
- public void setRrt(org.apache.james.rrt.api.RecipientRewriteTable rrt) {
+ public void setRrt(@Named("recipientrewritetable") org.apache.james.rrt.api.RecipientRewriteTable rrt) {
this.rrt = rrt;
}
@Inject
- @Named("usersrepository")
- public void setUsersRepository(UsersRepository usersRepository) {
+ public void setUsersRepository(@Named("usersrepository") UsersRepository usersRepository) {
this.usersRepository = usersRepository;
}
@Inject
- @Named("mailboxmanager")
- public void setMailboxManager(MailboxManager mailboxManager) {
+ public void setMailboxManager(@Named("mailboxmanager") MailboxManager mailboxManager) {
this.mailboxManager = mailboxManager;
}
@Inject
- @Named("domainlist")
- public void setDomainList(DomainList domainList) {
+ public void setDomainList(@Named("domainlist") DomainList domainList) {
this.domainList = domainList;
}
@Inject
- @Named("filesystem")
- public void setFileSystem(FileSystem fileSystem) {
+ public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Fri Feb 15 14:36:21 2013
@@ -252,14 +252,12 @@ public class RemoteDelivery extends Gene
private boolean isSSLEnable = false;
@Inject
- @Named("domainlist")
- public void setDomainList(DomainList domainList) {
+ public void setDomainList(@Named("domainlist") DomainList domainList) {
this.domainList = domainList;
}
@Inject
- @Named("mailqueuefactory")
- public void setMailQueueFactory( MailQueueFactory queueFactory) {
+ public void setMailQueueFactory(@Named("mailqueuefactory") MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java Fri Feb 15 14:36:21 2013
@@ -56,8 +56,7 @@ public class ToRepository extends Generi
private MailRepositoryStore mailStore;
@Inject
- @Named("mailrepositorystore")
- public void setStore(MailRepositoryStore mailStore) {
+ public void setStore(@Named("mailrepositorystore") MailRepositoryStore mailStore) {
this.mailStore = mailStore;
}
Modified: james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java Fri Feb 15 14:36:21 2013
@@ -75,20 +75,17 @@ public class IMAPServer extends Abstract
public final static int DEFAULT_LITERAL_SIZE_LIMIT = 0;
@Inject
- @Named("imapProcessor")
- public void setImapProcessor(ImapProcessor processor) {
+ public void setImapProcessor(@Named("imapProcessor") ImapProcessor processor) {
this.processor = processor;
}
@Inject
- @Named("imapDecoder")
- public void setImapDecoder(ImapDecoder decoder) {
+ public void setImapDecoder(@Named("imapDecoder") ImapDecoder decoder) {
this.decoder = decoder;
}
@Inject
- @Named("imapEncoder")
- public void setImapEncoder(ImapEncoder encoder) {
+ public void setImapEncoder(@Named("imapEncoder") ImapEncoder encoder) {
this.encoder = encoder;
}
Modified: james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java (original)
+++ james/server/trunk/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java Fri Feb 15 14:36:21 2013
@@ -42,26 +42,22 @@ public class IMAPServerFactory extends A
private ImapProcessor processor;
@Inject
- @Named("filesystem")
- public final void setFileSystem(FileSystem filesystem) {
+ public final void setFileSystem(@Named("filesystem") FileSystem filesystem) {
this.fileSystem = filesystem;
}
@Inject
- @Named("imapProcessor")
- public void setImapProcessor(ImapProcessor processor) {
+ public void setImapProcessor(@Named("imapProcessor") ImapProcessor processor) {
this.processor = processor;
}
@Inject
- @Named("imapDecoder")
- public void setImapDecoder(ImapDecoder decoder) {
+ public void setImapDecoder(@Named("imapDecoder") ImapDecoder decoder) {
this.decoder = decoder;
}
@Inject
- @Named("imapEncoder")
- public void setImapEncoder(ImapEncoder encoder) {
+ public void setImapEncoder(@Named("imapEncoder") ImapEncoder encoder) {
this.encoder = encoder;
}
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java Fri Feb 15 14:36:21 2013
@@ -117,8 +117,7 @@ public abstract class AbstractConfigurab
private MBeanServer mbeanServer;
@Inject
- @Named("filesystem")
- public final void setFileSystem(FileSystem filesystem) {
+ public final void setFileSystem(@Named("filesystem") FileSystem filesystem) {
this.fileSystem = filesystem;
}
Modified: james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java (original)
+++ james/server/trunk/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java Fri Feb 15 14:36:21 2013
@@ -41,8 +41,7 @@ public abstract class AbstractProtocolAs
private HierarchicalConfiguration config;
@Inject
- @Named("protocolhandlerloader")
- public void setProtocolHandlerLoader(ProtocolHandlerLoader loader) {
+ public void setProtocolHandlerLoader(@Named("protocolhandlerloader") ProtocolHandlerLoader loader) {
this.loader = loader;
}
Modified: james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java (original)
+++ james/server/trunk/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java Fri Feb 15 14:36:21 2013
@@ -94,9 +94,17 @@ public class MockProtocolHandlerLoader i
private void injectResources(Object resource) {
final Method[] methods = resource.getClass().getMethods();
for (Method method : methods) {
- final Named namedAnnotation = method.getAnnotation(Named.class);
- if (namedAnnotation != null) {
- String name = namedAnnotation.value();
+ final Inject injectAnnotation = method.getAnnotation(Inject.class);
+ if (injectAnnotation != null) {
+ String name = null;
+ Annotation[][] paramAnnotations = method.getParameterAnnotations();
+ if (paramAnnotations.length == 1) {
+ if (paramAnnotations[0].length ==1) {
+ if (paramAnnotations[0][0].annotationType().equals(Named.class)) {
+ name = ((Named) paramAnnotations[0][0]).value();
+ }
+ }
+ }
if (name == null) {
throw new UnsupportedOperationException("@Inject annotation without @Named specified is not supported by this implementation");
} else {
Modified: james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java (original)
+++ james/server/trunk/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java Fri Feb 15 14:36:21 2013
@@ -48,8 +48,7 @@ public class PassCmdHandler extends Abst
private MailboxManager manager;
@Inject
- @Named("mailboxmanager")
- public void setMailboxManager(MailboxManager manager) {
+ public void setMailboxManager(@Named("mailboxmanager") MailboxManager manager) {
this.manager = manager;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java Fri Feb 15 14:36:21 2013
@@ -30,8 +30,7 @@ public class AuthRequiredToRelayRcptHook
private DomainList domains;
@Inject
- @Named("domainlist")
- public void setDomainList(DomainList domains) {
+ public void setDomainList(@Named("domainlist") DomainList domains) {
this.domains = domains;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java Fri Feb 15 14:36:21 2013
@@ -30,8 +30,7 @@ public class JamesMailCmdHandler extends
private DomainList domainList;
@Inject
- @Named("domainlist")
- public final void setDomainList(DomainList domainList) {
+ public final void setDomainList(@Named("domainlist") DomainList domainList) {
this.domainList = domainList;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java Fri Feb 15 14:36:21 2013
@@ -31,8 +31,7 @@ public class JamesRcptCmdHandler extends
private DomainList domainList;
@Inject
- @Named("domainlist")
- public final void setDomainList(DomainList domainList) {
+ public final void setDomainList(@Named("domainlist") DomainList domainList) {
this.domainList = domainList;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java Fri Feb 15 14:36:21 2013
@@ -44,8 +44,7 @@ public class SendMailHandler implements
private MailQueueFactory queueFactory;
@Inject
- @Named("mailqueuefactory")
- public void setMailQueueFactory(MailQueueFactory queueFactory) {
+ public void setMailQueueFactory(@Named("mailqueuefactory") MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java Fri Feb 15 14:36:21 2013
@@ -40,14 +40,12 @@ public class SenderAuthIdentifyVerificat
private UsersRepository users;
@Inject
- @Named("usersrepository")
- public final void setUsersRepository(UsersRepository users) {
+ public final void setUsersRepository(@Named("usersrepository") UsersRepository users) {
this.users = users;
}
@Inject
- @Named("domainlist")
- public void setDomainList(DomainList domains) {
+ public void setDomainList(@Named("domainlist") DomainList domains) {
this.domains = domains;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java Fri Feb 15 14:36:21 2013
@@ -51,8 +51,7 @@ public class UsersRepositoryAuthHook imp
* the users to set
*/
@Inject
- @Named("usersrepository")
- public final void setUsersRepository(UsersRepository users) {
+ public final void setUsersRepository(@Named("usersrepository") UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java Fri Feb 15 14:36:21 2013
@@ -37,8 +37,7 @@ public class DNSRBLHandler extends org.a
private DNSService dns;
@Inject
- @Named("dnsservice")
- public void setDNSService(DNSService dns) {
+ public void setDNSService(@Named("dnsservice") DNSService dns) {
this.dns = dns;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Fri Feb 15 14:36:21 2013
@@ -170,8 +170,7 @@ public class JDBCGreylistHandler extends
}
@Inject
- @Named("dnsservice")
- public final void setDNSService(DNSService dnsService) {
+ public final void setDNSService(@Named("dnsservice") DNSService dnsService) {
this.dnsService = dnsService;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java Fri Feb 15 14:36:21 2013
@@ -30,8 +30,7 @@ public class ResolvableEhloHeloHandler e
private DNSService dns;
@Inject
- @Named("dnsservice")
- public void setDNSService(DNSService dns) {
+ public void setDNSService(@Named("dnsservice") DNSService dns) {
this.dns = dns;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java Fri Feb 15 14:36:21 2013
@@ -30,8 +30,7 @@ public class ReverseEqualsEhloHeloHandle
private DNSService dns;
@Inject
- @Named("dnsservice")
- public void setDNSService(DNSService dns) {
+ public void setDNSService(@Named("dnsservice") DNSService dns) {
this.dns = dns;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java Fri Feb 15 14:36:21 2013
@@ -98,8 +98,7 @@ public class SPFHandler implements James
* The DNSService
*/
@Inject
- @Named("dnsservice")
- public void setDNSService(DNSService dnsService) {
+ public void setDNSService(@Named("dnsservice") DNSService dnsService) {
spf = new SPF(dnsService, new SPFLogger());
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java Fri Feb 15 14:36:21 2013
@@ -88,8 +88,7 @@ public class URIRBLHandler implements Ja
* the dnsService to set
*/
@Inject
- @Named("dnsservice")
- public final void setDNSService(DNSService dnsService) {
+ public final void setDNSService(@Named("dnsservice") DNSService dnsService) {
this.dnsService = dnsService;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Fri Feb 15 14:36:21 2013
@@ -66,8 +66,7 @@ public class ValidRcptHandler extends Ab
* the users to set
*/
@Inject
- @Named("usersrepository")
- public final void setUsersRepository(UsersRepository users) {
+ public final void setUsersRepository(@Named("usersrepository") UsersRepository users) {
this.users = users;
}
@@ -83,8 +82,7 @@ public class ValidRcptHandler extends Ab
}
@Inject
- @Named("domainlist")
- public void setDomainList(DomainList domains) {
+ public void setDomainList(@Named("domainlist") DomainList domains) {
this.domains = domains;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java Fri Feb 15 14:36:21 2013
@@ -90,8 +90,7 @@ public class ValidRcptMX implements Init
* @param dnsService the dnsService to set
*/
@Inject
- @Named("dnsservice")
- public final void setDNSService(DNSService dnsService) {
+ public final void setDNSService(@Named("dnsservice") DNSService dnsService) {
this.dnsService = dnsService;
}
Modified: james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java Fri Feb 15 14:36:21 2013
@@ -31,8 +31,7 @@ public class ValidSenderDomainHandler ex
private DNSService dnsService;
@Inject
- @Named("dnsservice")
- public void setDNSService(DNSService dnsService) {
+ public void setDNSService(@Named("dnsservice") DNSService dnsService) {
this.dnsService = dnsService;
}
Modified: james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java (original)
+++ james/server/trunk/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java Fri Feb 15 14:36:21 2013
@@ -39,9 +39,8 @@ public class FileSystemBlobTransferPolic
private FileSystemBlobStrategy strategy;
@Inject
- @Named("filesystem")
@Resource(name = "filesystem")
- public void setFileSystem(FileSystem fileSystem) {
+ public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java?rev=1446602&r1=1446601&r2=1446602&view=diff
==============================================================================
--- james/server/trunk/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java (original)
+++ james/server/trunk/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java Fri Feb 15 14:36:21 2013
@@ -35,9 +35,8 @@ public class JMSMailQueueFactory extends
protected ConnectionFactory connectionFactory;
@Inject
- @Named("jmsConnectionFactory")
@Resource(name = "jmsConnectionFactory")
- public void setConnectionFactory(ConnectionFactory connectionFactory) {
+ public void setConnectionFactory(@Named("jmsConnectionFactory") ConnectionFactory connectionFactory) {
this.connectionFactory = connectionFactory;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org