Author: matthieu
Date: Tue Nov 3 16:45:35 2015
New Revision: 1712326
URL: http://svn.apache.org/viewvc?rev=1712326&view=rev
Log:
JAMES-1626 cleanup injection annotations to conform to javax.inject usage
Removed unneeded @Named annotations, @Resource that doesn't belong to
javax.inject and fix some injection usages that only work with Spring
Modified:
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/project/trunk/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java
james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
james/project/trunk/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java
james/project/trunk/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
Modified:
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
(original)
+++
james/project/trunk/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
Tue Nov 3 16:45:35 2015
@@ -23,6 +23,9 @@ import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MessageRange;
@@ -47,9 +50,12 @@ import org.apache.james.mailbox.store.ma
*
* @param <Id>
*/
+@Singleton
public class SimpleMessageSearchIndex<Id extends MailboxId> implements
MessageSearchIndex<Id> {
private final MessageMapperFactory<Id> factory;
+
+ @Inject
public SimpleMessageSearchIndex(MessageMapperFactory<Id> factory) {
this.factory = factory;
}
Modified:
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
(original)
+++
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
Tue Nov 3 16:45:35 2015
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
@@ -46,9 +45,7 @@ public class MailboxCopierManagement imp
private MailboxManagerResolver resolver;
@Inject
- @Named("mailboxcopier")
- @Resource(name = "mailboxcopier")
- public void setMailboxCopier(MailboxCopier copier) {
+ public void setMailboxCopier(@Named("mailboxcopier") MailboxCopier copier)
{
this.copier = copier;
}
Modified:
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
(original)
+++
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
Tue Nov 3 16:45:35 2015
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
import javax.management.NotCompliantMBeanException;
@@ -48,7 +47,6 @@ public class MailboxManagerManagement ex
private Logger log;
@Inject
- @Resource(name = "mailboxmanager")
public void setMailboxManager(@Named("mailboxmanager") MailboxManager
mailboxManager) {
this.mailboxManager = mailboxManager;
}
Modified:
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
(original)
+++
james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
Tue Nov 3 16:45:35 2015
@@ -19,9 +19,7 @@
package org.apache.james.adapter.mailbox.store;
-import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.mailbox.store.Authenticator;
@@ -39,8 +37,7 @@ public class UserRepositoryAuthenticator
private Logger log;
@Inject
- @Resource(name = "usersrepository")
- public void setUsersRepository(@Named("usersrepository") UsersRepository
repos) {
+ public void setUsersRepository(UsersRepository repos) {
this.repos = repos;
}
Modified:
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
(original)
+++
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
Tue Nov 3 16:45:35 2015
@@ -56,21 +56,18 @@ public class James23Importer implements
* James 3.0 users repository.
*/
@Inject
- @Named("usersrepository")
private UsersRepository james30UsersRepository;
/**
* James 3.0 users repository.
*/
@Inject
- @Named("mailrepositorystore")
private MailRepositoryStore mailRepositoryStore;
/**
* James 3.0 domain list.
*/
@Inject
- @Named("domainlist")
private DomainList domainList;
/**
Modified:
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
(original)
+++
james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
Tue Nov 3 16:45:35 2015
@@ -23,7 +23,6 @@ import org.apache.james.mailrepository.a
import org.apache.james.user.api.UsersRepositoryException;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.mail.MessagingException;
import java.io.IOException;
@@ -33,7 +32,6 @@ import java.io.IOException;
public class James23ImporterManagement implements
James23ImporterManagementMBean {
@Inject
- @Named("james23importer")
private James23Importer james23Importer;
@Override
Modified:
james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
(original)
+++
james/project/trunk/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
Tue Nov 3 16:45:35 2015
@@ -21,9 +21,12 @@
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:camel="http://camel.apache.org/schema/spring";
+ xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://www.springframework.org/schema/context
+
http://www.springframework.org/schema/context/spring-context-2.5.xsd";>
<import resource="classpath:META-INF/cassandra-session.xml"/>
@@ -33,6 +36,9 @@
===========================================================================
-->
+
+ <context:component-scan base-package="org.apache.james" />
+
<!-- Enable Java Annotations processing. -->
<bean
class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor">
<property name="order" value="3"/>
@@ -132,6 +138,8 @@
<!-- Mailbox Copier -->
<bean id="mailboxcopier"
class="org.apache.james.mailbox.copier.MailboxCopierImpl"/>
+ <bean id="mailboxmanagerresolver"
class="org.apache.james.container.spring.mailbox.SpringResolver" />
+
<!-- Mailbox Importer -->
<!--
<bean id="james23importer"
class="org.apache.james.container.spring.tool.James23Importer"/>
Modified:
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
(original)
+++
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
Tue Nov 3 16:45:35 2015
@@ -29,9 +29,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import javax.inject.Singleton;
+
/**
* Mimic the old behavior of JAMES
*/
+@Singleton
public class XMLDomainList extends AbstractDomainList implements Configurable {
private final List<String> domainNames = new ArrayList<String>();
Modified:
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
(original)
+++
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
Tue Nov 3 16:45:35 2015
@@ -31,7 +31,6 @@ import org.apache.mailet.Mail;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import java.io.IOException;
@@ -72,7 +71,7 @@ public class FileMailRepository extends
private FileSystem fileSystem;
@Inject
- public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
+ public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified:
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
(original)
+++
james/project/trunk/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
Tue Nov 3 16:45:35 2015
@@ -23,7 +23,7 @@ import java.util.Iterator;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import javax.inject.Named;
+import javax.inject.Singleton;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
@@ -52,6 +52,7 @@ import org.apache.james.user.lib.Abstrac
* </p>
*/
@Deprecated
+@Singleton
public class UsersFileRepository extends AbstractJamesUsersRepository {
/**
@@ -69,7 +70,7 @@ public class UsersFileRepository extends
private FileSystem fileSystem;
@Inject
- public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
+ public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified:
james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
(original)
+++
james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
Tue Nov 3 16:45:35 2015
@@ -43,7 +43,6 @@ import java.util.StringTokenizer;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.sql.DataSource;
@@ -154,7 +153,7 @@ public class JDBCMailRepository extends
}
@Inject
- public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
+ public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified:
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
(original)
+++
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
Tue Nov 3 16:45:35 2015
@@ -25,10 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
-import javax.xml.ws.RequestWrapper;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -51,8 +48,7 @@ public abstract class AbstractDomainList
private String defaultDomain;
@Inject
- @Resource
- public void setDNSService(@Named("dnsservice") DNSService dns) {
+ public void setDNSService(DNSService dns) {
this.dns = dns;
}
Modified:
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
(original)
+++
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java
Tue Nov 3 16:45:35 2015
@@ -18,9 +18,7 @@
****************************************************************/
package org.apache.james.domainlist.lib;
-import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
@@ -37,9 +35,7 @@ public class DomainListManagement extend
}
@Inject
- @Resource(
- name = "domainlist")
- public void setDomainList(@Named("domainlist") DomainList domainList) {
+ public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
Modified:
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
(original)
+++
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java
Tue Nov 3 16:45:35 2015
@@ -33,7 +33,6 @@ import java.util.List;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -74,7 +73,7 @@ public abstract class AbstractFileReposi
}
@Inject
- public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
+ public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified:
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
(original)
+++
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java
Tue Nov 3 16:45:35 2015
@@ -24,7 +24,6 @@ import java.util.regex.PatternSyntaxExce
import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.mail.internet.ParseException;
import org.apache.commons.configuration.ConfigurationException;
@@ -55,8 +54,7 @@ public abstract class AbstractRecipientR
private DomainList domainList;
@Inject
- @Resource
- public void setDomainList(@Named("domainlist") DomainList domainList) {
+ public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
Modified:
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
(original)
+++
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableManagement.java
Tue Nov 3 16:45:35 2015
@@ -20,9 +20,7 @@ package org.apache.james.rrt.lib;
import java.util.Map;
-import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
@@ -42,8 +40,7 @@ public class RecipientRewriteTableManage
}
@Inject
- @Resource(name = "recipientrewritetable")
- public void
setManageableRecipientRewriteTable(@Named("recipientrewritetable")
RecipientRewriteTable rrt) {
+ public void setManageableRecipientRewriteTable(RecipientRewriteTable rrt) {
this.rrt = rrt;
}
Modified:
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
(original)
+++
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
Tue Nov 3 16:45:35 2015
@@ -21,7 +21,6 @@ package org.apache.james.user.lib;
import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -70,8 +69,7 @@ public abstract class AbstractUsersRepos
}
@Inject
- @Resource
- public void setDomainList(@Named("domainlist") DomainList domainList) {
+ public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
Modified:
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
(original)
+++
james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
Tue Nov 3 16:45:35 2015
@@ -24,9 +24,7 @@ import org.apache.james.user.api.UsersRe
import org.apache.james.user.api.model.JamesUser;
import org.apache.james.user.api.model.User;
-import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.management.NotCompliantMBeanException;
import javax.management.StandardMBean;
import java.util.ArrayList;
@@ -41,8 +39,7 @@ public class UsersRepositoryManagement e
private UsersRepository usersRepository;
@Inject
- @Resource(name = "usersrepository")
- public void setUsersRepository(@Named("usersrepository") UsersRepository
usersRepository) {
+ public void setUsersRepository(UsersRepository usersRepository) {
this.usersRepository = usersRepository;
}
Modified:
james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
(original)
+++
james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
Tue Nov 3 16:45:35 2015
@@ -21,7 +21,6 @@ package org.apache.james.mailetcontainer
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
@@ -48,12 +47,12 @@ public class CamelCompositeProcessor ext
private MailetLoader mailetLoader;
@Inject
- public void setMatcherLoader(@Named("matcherloader") MatcherLoader
matcherLoader) {
+ public void setMatcherLoader(MatcherLoader matcherLoader) {
this.matcherLoader = matcherLoader;
}
@Inject
- public void setMailetLoader(@Named("mailetloader") MailetLoader
mailetLoader) {
+ public void setMailetLoader(MailetLoader mailetLoader) {
this.mailetLoader = mailetLoader;
}
Modified:
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
(original)
+++
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
Tue Nov 3 16:45:35 2015
@@ -54,12 +54,12 @@ public class LocalDelivery extends Gener
private FileSystem fileSystem;
@Inject
- public void setRrt(@Named("recipientrewritetable")
org.apache.james.rrt.api.RecipientRewriteTable rrt) {
+ public void setRrt(org.apache.james.rrt.api.RecipientRewriteTable rrt) {
this.rrt = rrt;
}
@Inject
- public void setUsersRepository(@Named("usersrepository") UsersRepository
usersRepository) {
+ public void setUsersRepository(UsersRepository usersRepository) {
this.usersRepository = usersRepository;
}
@@ -69,12 +69,12 @@ public class LocalDelivery extends Gener
}
@Inject
- public void setDomainList(@Named("domainlist") DomainList domainList) {
+ public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
@Inject
- public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
+ public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified:
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
(original)
+++
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
Tue Nov 3 16:45:35 2015
@@ -44,12 +44,10 @@ import java.util.regex.Pattern;
import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.mail.Address;
import javax.mail.MessagingException;
import javax.mail.SendFailedException;
import javax.mail.Session;
-import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
@@ -162,8 +160,6 @@ public class RemoteDelivery extends Gene
private static final Pattern PATTERN =
Patterns.compilePatternUncheckedException(PATTERN_STRING);
@Inject
- @Named("dnsservice")
- @Resource
private DNSService dnsServer;
/**
@@ -265,12 +261,12 @@ public class RemoteDelivery extends Gene
private boolean isSSLEnable = false;
@Inject
- public void setDomainList(@Named("domainlist") DomainList domainList) {
+ public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
@Inject
- public void setMailQueueFactory(@Named("mailqueuefactory")
MailQueueFactory queueFactory) {
+ public void setMailQueueFactory(MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
Modified:
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
(original)
+++
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
Tue Nov 3 16:45:35 2015
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Iterator;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.mail.MessagingException;
import org.apache.commons.collections.iterators.IteratorChain;
@@ -52,15 +53,27 @@ import org.apache.mailet.base.GenericMai
*/
public class ToRecipientFolder extends GenericMailet {
- @Inject
private MailboxManager mailboxManager;
-
- @Inject
+
private UsersRepository usersRepository;
-
- @Inject
+
private FileSystem fileSystem;
+ @Inject
+ public void setMailboxManager(@Named("mailboxmanager")MailboxManager
mailboxManager) {
+ this.mailboxManager = mailboxManager;
+ }
+
+ @Inject
+ public void setUsersRepository(UsersRepository usersRepository) {
+ this.usersRepository = usersRepository;
+ }
+
+ @Inject
+ public void setFileSystem(FileSystem fileSystem) {
+ this.fileSystem = fileSystem;
+ }
+
private SieveMailet sieveMailet; // Mailet that actually stores the
message
/**
Modified:
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
(original)
+++
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRepository.java
Tue Nov 3 16:45:35 2015
@@ -20,7 +20,6 @@
package org.apache.james.transport.mailets;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.mail.MessagingException;
import org.apache.james.mailrepository.api.MailRepository;
@@ -56,7 +55,7 @@ public class ToRepository extends Generi
private MailRepositoryStore mailStore;
@Inject
- public void setStore(@Named("mailrepositorystore") MailRepositoryStore
mailStore) {
+ public void setStore(MailRepositoryStore mailStore) {
this.mailStore = mailStore;
}
Modified:
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
(original)
+++
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
Tue Nov 3 16:45:35 2015
@@ -20,8 +20,8 @@ package org.apache.james.transport.maile
import java.util.Date;
-import javax.annotation.Resource;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.mail.MessagingException;
import org.apache.james.core.MimeMessageInputStream;
@@ -58,11 +58,10 @@ import org.apache.mailet.base.GenericMai
public class ToSenderFolder extends GenericMailet {
@Inject
- @Resource(name = "usersrepository")
private UsersRepository usersRepository;
@Inject
- @Resource(name = "mailboxmanager")
+ @Named("mailboxmanager")
private MailboxManager mailboxManager;
private String folder;
Modified:
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
(original)
+++
james/project/trunk/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
Tue Nov 3 16:45:35 2015
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Locale;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.mail.MessagingException;
import org.apache.james.mailbox.MailboxManager;
@@ -67,7 +68,7 @@ abstract public class AbstractStorageQuo
private MailboxManager manager;
@Inject
- public void setMailboxManager(MailboxManager manager) {
+ public void setMailboxManager(@Named("mailboxmanager") MailboxManager
manager) {
this.manager = manager;
}
Modified:
james/project/trunk/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
(original)
+++
james/project/trunk/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
Tue Nov 3 16:45:35 2015
@@ -70,25 +70,21 @@ public class FetchScheduler implements F
private DomainList domainList;
@Inject
- @Resource
public void setMailQueueFactory(MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
@Inject
- @Resource
public void setDNSService(DNSService dns) {
this.dns = dns;
}
@Inject
- @Resource
public void setUsersRepository(UsersRepository urepos) {
this.urepos = urepos;
}
@Inject
- @Resource
public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
Modified:
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
(original)
+++
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
Tue Nov 3 16:45:35 2015
@@ -22,9 +22,7 @@ import static org.jboss.netty.channel.Ch
import java.util.concurrent.TimeUnit;
-import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.net.ssl.SSLEngine;
import org.apache.commons.configuration.ConfigurationException;
@@ -75,17 +73,17 @@ public class IMAPServer extends Abstract
public final static int DEFAULT_LITERAL_SIZE_LIMIT = 0;
@Inject
- public void setImapProcessor(@Named("imapProcessor") ImapProcessor
processor) {
+ public void setImapProcessor(ImapProcessor processor) {
this.processor = processor;
}
@Inject
- public void setImapDecoder(@Named("imapDecoder") ImapDecoder decoder) {
+ public void setImapDecoder(ImapDecoder decoder) {
this.decoder = decoder;
}
@Inject
- public void setImapEncoder(@Named("imapEncoder") ImapEncoder encoder) {
+ public void setImapEncoder(ImapEncoder encoder) {
this.encoder = encoder;
}
Modified:
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java
(original)
+++
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java
Tue Nov 3 16:45:35 2015
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.filesystem.api.FileSystem;
@@ -41,22 +40,22 @@ public class IMAPServerFactory extends A
private ImapProcessor processor;
@Inject
- public final void setFileSystem(@Named("filesystem") FileSystem
filesystem) {
+ public final void setFileSystem(FileSystem filesystem) {
this.fileSystem = filesystem;
}
@Inject
- public void setImapProcessor(@Named("imapProcessor") ImapProcessor
processor) {
+ public void setImapProcessor(ImapProcessor processor) {
this.processor = processor;
}
@Inject
- public void setImapDecoder(@Named("imapDecoder") ImapDecoder decoder) {
+ public void setImapDecoder(ImapDecoder decoder) {
this.decoder = decoder;
}
@Inject
- public void setImapEncoder(@Named("imapEncoder") ImapEncoder encoder) {
+ public void setImapEncoder(ImapEncoder encoder) {
this.encoder = encoder;
}
Modified:
james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Tue Nov 3 16:45:35 2015
@@ -31,7 +31,6 @@ import java.util.concurrent.Executor;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.net.ssl.KeyManagerFactory;
@@ -117,7 +116,7 @@ public abstract class AbstractConfigurab
private MBeanServer mbeanServer;
@Inject
- public final void setFileSystem(@Named("filesystem") FileSystem
filesystem) {
+ public final void setFileSystem(FileSystem filesystem) {
this.fileSystem = filesystem;
}
Modified:
james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
(original)
+++
james/project/trunk/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
Tue Nov 3 16:45:35 2015
@@ -19,7 +19,6 @@
package org.apache.james.protocols.lib.netty;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -41,7 +40,7 @@ public abstract class AbstractProtocolAs
private HierarchicalConfiguration config;
@Inject
- public void setProtocolHandlerLoader(@Named("protocolhandlerloader")
ProtocolHandlerLoader loader) {
+ public void setProtocolHandlerLoader(ProtocolHandlerLoader loader) {
this.loader = loader;
}
Modified:
james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
(original)
+++
james/project/trunk/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
Tue Nov 3 16:45:35 2015
@@ -36,13 +36,19 @@ public class MockProtocolHandlerLoader i
}
private final Map<String, Object> servicesByName = new HashMap<String,
Object>();
+ private final Map<Class<?>, Object> servicesByType = new HashMap<Class<?>,
Object>();
+
public Object get(String name) {
- Object service = servicesByName.get(name);
- return service;
+ return servicesByName.get(name);
}
- public void put(String role, Object service) {
- servicesByName.put(role, service);
+ public Object get(Class<?> type) {
+ return servicesByType.get(type);
+ }
+
+ public <T, U extends T> void put(String role, Class<T> serviceType, U
instance) {
+ servicesByName.put(role, instance);
+ servicesByType.put(serviceType, instance);
}
private final List<Object> loaderRegistry = new ArrayList<Object>();
@@ -97,6 +103,7 @@ public class MockProtocolHandlerLoader i
for (Method method : methods) {
final Inject injectAnnotation = method.getAnnotation(Inject.class);
if (injectAnnotation != null) {
+ Object service = null;
String name = null;
Annotation[][] paramAnnotations =
method.getParameterAnnotations();
if (paramAnnotations.length == 1) {
@@ -106,25 +113,27 @@ public class MockProtocolHandlerLoader i
}
}
}
- if (name == null) {
- throw new UnsupportedOperationException("@Inject
annotation without @Named specified is not supported by this implementation");
- } else {
+ if (name != null) {
// Name indicates a service
- final Object service = getObjectForName(name);
- if (service == null) {
- throw new RuntimeException("Injection failed for
object " + resource + " on method " + method + " with resource name " + name +
", because no mapping was found");
- } else {
- try {
- Object[] args = { service };
- method.invoke(resource, args);
- } catch (IllegalAccessException e) {
- throw new RuntimeException("Injection failed for
object " + resource + " on method " + method + " with resource " + service, e);
- } catch (IllegalArgumentException e) {
- throw new RuntimeException("Injection failed for
object " + resource + " on method " + method + " with resource " + service, e);
- } catch (InvocationTargetException e) {
- throw new RuntimeException("Injection failed for
object " + resource + " on method " + method + " with resource " + service, e);
- }
+ service = get(name);
+ }
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ if (parameterTypes.length == 1) {
+ service = get(parameterTypes[0]);
+ }
+ if (service != null) {
+ try {
+ Object[] args = { service };
+ method.invoke(resource, args);
+ } catch (IllegalAccessException e) {
+ throw new RuntimeException("Injection failed for
object " + resource + " on method " + method + " with resource " + service, e);
+ } catch (IllegalArgumentException e) {
+ throw new RuntimeException("Injection failed for
object " + resource + " on method " + method + " with resource " + service, e);
+ } catch (InvocationTargetException e) {
+ throw new RuntimeException("Injection failed for
object " + resource + " on method " + method + " with resource " + service, e);
}
+ } else {
+ throw new RuntimeException("Injection failed for object "
+ resource + " on method " + method + " with resource name " + name + ",
because no mapping was found");
}
}
}
Modified:
james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java
Tue Nov 3 16:45:35 2015
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.Date;
import javax.inject.Inject;
+import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -58,7 +59,7 @@ public class MailboxDeliverToRecipientHa
}
@Inject
- public final void setMailboxManager(MailboxManager mailboxManager) {
+ public final void setMailboxManager(@Named("mailboxmanager")
MailboxManager mailboxManager) {
this.mailboxManager = mailboxManager;
}
Modified:
james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/project/trunk/server/protocols/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Tue Nov 3 16:45:35 2015
@@ -36,7 +36,9 @@ import javax.mail.Flags;
import org.apache.commons.net.pop3.POP3Client;
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3Reply;
+import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.filesystem.api.mock.MockFileSystem;
+import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.acl.GroupMembershipResolver;
@@ -54,6 +56,7 @@ import org.apache.james.pop3server.netty
import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
import org.apache.james.protocols.lib.PortUtil;
import org.apache.james.protocols.lib.mock.MockProtocolHandlerLoader;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.mock.MockUsersRepository;
import org.junit.After;
@@ -705,7 +708,7 @@ public class POP3ServerTest {
protected void setUpServiceManager() throws Exception {
protocolHandlerChain = new MockProtocolHandlerLoader();
- protocolHandlerChain.put("usersrepository", usersRepository);
+ protocolHandlerChain.put("usersrepository", UsersRepository.class,
usersRepository);
InMemoryMailboxSessionMapperFactory factory = new
InMemoryMailboxSessionMapperFactory();
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
@@ -724,10 +727,10 @@ public class POP3ServerTest {
}, aclResolver, groupMembershipResolver);
mailboxManager.init();
- protocolHandlerChain.put("mailboxmanager", mailboxManager);
+ protocolHandlerChain.put("mailboxmanager", MailboxManager.class,
mailboxManager);
fileSystem = new MockFileSystem();
- protocolHandlerChain.put("fileSystem", fileSystem);
+ protocolHandlerChain.put("fileSystem", FileSystem.class, fileSystem);
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.java
Tue Nov 3 16:45:35 2015
@@ -19,7 +19,6 @@
package org.apache.james.smtpserver;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -32,7 +31,7 @@ public class AuthRequiredToRelayRcptHook
private DomainList domains;
@Inject
- public void setDomainList(@Named("domainlist") DomainList domains) {
+ public void setDomainList(DomainList domains) {
this.domains = domains;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
Tue Nov 3 16:45:35 2015
@@ -19,7 +19,6 @@
package org.apache.james.smtpserver;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
@@ -30,7 +29,7 @@ public class JamesMailCmdHandler extends
private DomainList domainList;
@Inject
- public final void setDomainList(@Named("domainlist") DomainList
domainList) {
+ public final void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
Tue Nov 3 16:45:35 2015
@@ -20,7 +20,6 @@
package org.apache.james.smtpserver;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
@@ -31,7 +30,7 @@ public class JamesRcptCmdHandler extends
private DomainList domainList;
@Inject
- public final void setDomainList(@Named("domainlist") DomainList
domainList) {
+ public final void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java
Tue Nov 3 16:45:35 2015
@@ -22,7 +22,6 @@ package org.apache.james.smtpserver;
import java.util.Collection;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.mail.MessagingException;
import org.apache.commons.configuration.Configuration;
@@ -45,7 +44,7 @@ public class SendMailHandler implements
private MailQueueFactory queueFactory;
@Inject
- public void setMailQueueFactory(@Named("mailqueuefactory")
MailQueueFactory queueFactory) {
+ public void setMailQueueFactory(MailQueueFactory queueFactory) {
this.queueFactory = queueFactory;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
Tue Nov 3 16:45:35 2015
@@ -19,7 +19,6 @@
package org.apache.james.smtpserver;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -42,12 +41,12 @@ public class SenderAuthIdentifyVerificat
private UsersRepository users;
@Inject
- public final void setUsersRepository(@Named("usersrepository")
UsersRepository users) {
+ public final void setUsersRepository(UsersRepository users) {
this.users = users;
}
@Inject
- public void setDomainList(@Named("domainlist") DomainList domains) {
+ public void setDomainList(DomainList domains) {
this.domains = domains;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
Tue Nov 3 16:45:35 2015
@@ -19,7 +19,6 @@
package org.apache.james.smtpserver;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -53,7 +52,7 @@ public class UsersRepositoryAuthHook imp
* the users to set
*/
@Inject
- public final void setUsersRepository(@Named("usersrepository")
UsersRepository users) {
+ public final void setUsersRepository(UsersRepository users) {
this.users = users;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java
Tue Nov 3 16:45:35 2015
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Collections;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -37,7 +36,7 @@ public class DNSRBLHandler extends org.a
private DNSService dns;
@Inject
- public void setDNSService(@Named("dnsservice") DNSService dns) {
+ public void setDNSService(DNSService dns) {
this.dns = dns;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java
Tue Nov 3 16:45:35 2015
@@ -33,7 +33,6 @@ import java.util.List;
import java.util.Map;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.sql.DataSource;
import org.apache.commons.configuration.Configuration;
@@ -170,7 +169,7 @@ public class JDBCGreylistHandler extends
}
@Inject
- public final void setDNSService(@Named("dnsservice") DNSService
dnsService) {
+ public final void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
Tue Nov 3 16:45:35 2015
@@ -21,7 +21,6 @@ package org.apache.james.smtpserver.fast
import java.net.UnknownHostException;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.james.dnsservice.api.DNSService;
@@ -30,7 +29,7 @@ public class ResolvableEhloHeloHandler e
private DNSService dns;
@Inject
- public void setDNSService(@Named("dnsservice") DNSService dns) {
+ public void setDNSService(DNSService dns) {
this.dns = dns;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
Tue Nov 3 16:45:35 2015
@@ -21,7 +21,6 @@ package org.apache.james.smtpserver.fast
import java.net.UnknownHostException;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.james.dnsservice.api.DNSService;
@@ -30,7 +29,7 @@ public class ReverseEqualsEhloHeloHandle
private DNSService dns;
@Inject
- public void setDNSService(@Named("dnsservice") DNSService dns) {
+ public void setDNSService(DNSService dns) {
this.dns = dns;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
Tue Nov 3 16:45:35 2015
@@ -19,7 +19,6 @@
package org.apache.james.smtpserver.fastfail;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -98,7 +97,7 @@ public class SPFHandler implements James
* The DNSService
*/
@Inject
- public void setDNSService(@Named("dnsservice") DNSService dnsService) {
+ public void setDNSService(DNSService dnsService) {
spf = new SPF(dnsService, new SPFLogger());
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
Tue Nov 3 16:45:35 2015
@@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.Iterator;
import javax.inject.Inject;
-import javax.inject.Named;
import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
@@ -88,7 +87,7 @@ public class URIRBLHandler implements Ja
* the dnsService to set
*/
@Inject
- public final void setDNSService(@Named("dnsservice") DNSService
dnsService) {
+ public final void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
Tue Nov 3 16:45:35 2015
@@ -19,7 +19,6 @@
package org.apache.james.smtpserver.fastfail;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -65,7 +64,7 @@ public class ValidRcptHandler extends Ab
* the users to set
*/
@Inject
- public final void setUsersRepository(@Named("usersrepository")
UsersRepository users) {
+ public final void setUsersRepository(UsersRepository users) {
this.users = users;
}
@@ -81,7 +80,7 @@ public class ValidRcptHandler extends Ab
}
@Inject
- public void setDomainList(@Named("domainlist") DomainList domains) {
+ public void setDomainList(DomainList domains) {
this.domains = domains;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java
Tue Nov 3 16:45:35 2015
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Iterator;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -90,7 +89,7 @@ public class ValidRcptMX implements Rcpt
* @param dnsService the dnsService to set
*/
@Inject
- public final void setDNSService(@Named("dnsservice") DNSService
dnsService) {
+ public final void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidSenderDomainHandler.java
Tue Nov 3 16:45:35 2015
@@ -33,7 +33,7 @@ public class ValidSenderDomainHandler ex
private DNSService dnsService;
@Inject
- public void setDNSService(@Named("dnsservice") DNSService dnsService) {
+ public void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified:
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++
james/project/trunk/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Tue Nov 3 16:45:35 2015
@@ -48,18 +48,23 @@ import org.apache.commons.net.ProtocolCo
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.mock.SimpleDomainList;
+import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.filesystem.api.mock.MockFileSystem;
+import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.apache.james.mailrepository.mock.MockMailRepositoryStore;
import org.apache.james.protocols.lib.PortUtil;
import org.apache.james.protocols.lib.mock.MockProtocolHandlerLoader;
import org.apache.james.protocols.netty.AbstractChannelPipelineFactory;
+import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.mock.MockMailQueue;
import org.apache.james.queue.api.mock.MockMailQueueFactory;
import org.apache.james.rrt.api.RecipientRewriteTable;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.Mappings;
import org.apache.james.smtpserver.netty.SMTPServer;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.lib.mock.MockUsersRepository;
import org.apache.mailet.HostAddress;
import org.apache.mailet.Mail;
@@ -219,19 +224,18 @@ public class SMTPServerTest {
chain = new MockProtocolHandlerLoader();
- chain.put("usersrepository", usersRepository);
+ chain.put("usersrepository", UsersRepository.class, usersRepository);
dnsServer = new AlterableDNSServer();
- chain.put("dnsservice", dnsServer);
+ chain.put("dnsservice", DNSService.class, dnsServer);
store = new MockMailRepositoryStore();
- chain.put("mailStore", store);
+ chain.put("mailStore", MailRepositoryStore.class, store);
fileSystem = new MockFileSystem();
- chain.put("fileSystem", fileSystem);
- chain.put("org.apache.james.smtpserver.protocol.DNSService",
dnsService);
+ chain.put("fileSystem", FileSystem.class, fileSystem);
- chain.put("recipientrewritetable", new RecipientRewriteTable() {
+ chain.put("recipientrewritetable", RecipientRewriteTable.class, new
RecipientRewriteTable() {
@Override
public void addRegexMapping(String user, String domain, String
regex) throws RecipientRewriteTableException {
@@ -307,11 +311,10 @@ public class SMTPServerTest {
}
});
- chain.put("org.apache.james.smtpserver.protocol.DNSService",
dnsService);
queueFactory = new MockMailQueueFactory();
queue = (MockMailQueue)
queueFactory.getQueue(MockMailQueueFactory.SPOOL);
- chain.put("mailqueuefactory", queueFactory);
- chain.put("domainlist", new SimpleDomainList() {
+ chain.put("mailqueuefactory", MailQueueFactory.class, queueFactory);
+ chain.put("domainlist", DomainList.class, new SimpleDomainList() {
@Override
public boolean containsDomain(String serverName) {
Modified:
james/project/trunk/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java
(original)
+++
james/project/trunk/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java
Tue Nov 3 16:45:35 2015
@@ -18,9 +18,7 @@
****************************************************************/
package org.apache.james.queue.activemq;
-import javax.annotation.Resource;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.activemq.blob.BlobDownloadStrategy;
import org.apache.activemq.blob.BlobTransferPolicy;
@@ -39,8 +37,7 @@ public class FileSystemBlobTransferPolic
private FileSystemBlobStrategy strategy;
@Inject
- @Resource(name = "filesystem")
- public void setFileSystem(@Named("filesystem") FileSystem fileSystem) {
+ public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified:
james/project/trunk/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
(original)
+++
james/project/trunk/server/queue/queue-activemq/src/main/resources/META-INF/spring/activemq-queue-context.xml
Tue Nov 3 16:45:35 2015
@@ -24,7 +24,9 @@
http://activemq.apache.org/schema/core/activemq-core.xsd";>
<!-- James Mail Queue Factory -->
- <bean id="mailqueuefactory"
class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory"
depends-on="broker"/>
+ <bean id="mailqueuefactory"
class="org.apache.james.queue.activemq.ActiveMQMailQueueFactory"
depends-on="broker">
+ <property name="connectionFactory" ref="jmsConnectionFactory"/>
+ </bean>
<!--
ActiveMQ Broker, Connections, Blob
Modified:
james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
(original)
+++
james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
Tue Nov 3 16:45:35 2015
@@ -42,7 +42,6 @@ public class FileMailQueueFactory implem
private boolean sync = true;
@Inject
- @Resource
public void setFileSystem(FileSystem fs) {
this.fs = fs;
}
Modified:
james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java?rev=1712326&r1=1712325&r2=1712326&view=diff
==============================================================================
---
james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
(original)
+++
james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
Tue Nov 3 16:45:35 2015
@@ -18,9 +18,6 @@
****************************************************************/
package org.apache.james.queue.jms;
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
import javax.jms.ConnectionFactory;
import org.apache.james.queue.api.MailQueue;
@@ -34,9 +31,7 @@ public class JMSMailQueueFactory extends
protected ConnectionFactory connectionFactory;
- @Inject
- @Resource(name = "jmsConnectionFactory")
- public void setConnectionFactory(@Named("jmsConnectionFactory")
ConnectionFactory connectionFactory) {
+ public void setConnectionFactory(ConnectionFactory connectionFactory) {
this.connectionFactory = connectionFactory;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
