You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2009/12/19 20:13:49 UTC
svn commit: r892500 [1/3] - in /james/server/trunk:
avalon-socket-library/src/main/java/org/apache/james/socket/
avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/
avalon-user-function/src/main/java/org/apache/jam...
Author: norman
Date: Sat Dec 19 19:13:46 2009
New Revision: 892500
URL: http://svn.apache.org/viewvc?rev=892500&view=rev
Log:
use "component" names for @Resource(name="...) injections. This makes it work spring deployment too. Copy up-to-date configurations to spring-deployment. Phoenix and Spring deployments now work!
Removed:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/RecipientIsOverFixedQuota.java
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonSimpleConnectionManager.java
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java
james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonVirtualUserTableStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceUsersStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceVirtualUserTableStore.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/AvalonJDBCVirtualUserTable.java
james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractAvalonDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/AvalonJDBCDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStoreSpoolRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/AvalonFetchScheduler.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/AvalonImapServer.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonBayesianAnalyzerManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonDomainListManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonProcessorManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonSpoolManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/DomainListManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/ProcessorManagement.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java
james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/AvalonNNTPServer.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/AvalonNNTPRepository.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/AvalonPOP3Server.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3ServerProtocolServerHandlerFactory.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/AvalonRemoteManager.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerProtocolHandlerFactory.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetAliasCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/DNSService.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/AvalonSMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerProtocolHandlerFactory.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/AvalonJames.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractLoader.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AvalonJamesSpoolManager.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java
james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml
james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
james/server/trunk/spring-deployment/src/main/config/james/james-jms.xml
james/server/trunk/spring-deployment/src/main/config/james/james-smtphandlerchain.xml
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonVirtualUserTableManagement.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java
james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java Sat Dec 19 19:13:46 2009
@@ -225,7 +225,7 @@
* Sets the DNS service.
* @param dnsServer the dnsServer to set
*/
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public final void setDNSService(DNSService dnsServer) {
this.dnsService = dnsServer;
}
@@ -235,7 +235,7 @@
this.connectionManager = connectionManager;
}
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fSystem) {
this.fSystem = fSystem;
}
@@ -264,12 +264,12 @@
this.configuration = configuration;
}
- @Resource(name="org.apache.avalon.cornerstone.services.threads.ThreadManager")
+ @Resource(name="thread-manager")
public void setThreadManager(ThreadManager threadManager) {
this.threadManager = threadManager;
}
- @Resource(name="org.apache.avalon.cornerstone.services.sockets.SocketManager")
+ @Resource(name="sockets")
public void setSocketManager(SocketManager socketManager) {
this.socketManager = socketManager;
}
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonSimpleConnectionManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonSimpleConnectionManager.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonSimpleConnectionManager.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonSimpleConnectionManager.java Sat Dec 19 19:13:46 2009
@@ -124,7 +124,7 @@
@Override
protected void configure() {
- bind(ThreadManager.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.threads.ThreadManager")).toInstance(threadManager);
+ bind(ThreadManager.class).annotatedWith(Names.named("thread-manager")).toInstance(threadManager);
bind(org.apache.commons.configuration.HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
}
Modified: james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java (original)
+++ james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/SimpleConnectionManager.java Sat Dec 19 19:13:46 2009
@@ -90,7 +90,7 @@
private Log logger;
private HierarchicalConfiguration configuration;
- @Resource(name="org.apache.avalon.cornerstone.services.threads.ThreadManager")
+ @Resource(name="thread-manager")
public void setThreadManager(ThreadManager threadManager) {
this.threadManager = threadManager;
}
Modified: james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java (original)
+++ james/server/trunk/avalon-spring-bridge-library/src/main/java/org/apache/james/container/spring/beanfactory/AvalonServiceReference.java Sat Dec 19 19:13:46 2009
@@ -21,7 +21,7 @@
/**
* content of a "provide" XML element from an assembly file.
* occurs within a block element like this:
- * <provide name="domainlist" role="org.apache.james.api.domainlist.DomainList"/>
+ * <provide name="domainlist" role="domainlist"/>
*
*/
public class AvalonServiceReference {
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonUsersStore.java Sat Dec 19 19:13:46 2009
@@ -58,9 +58,9 @@
protected void configure() {
bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(configuration);
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(selector);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(store);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(selector);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(Store.class).annotatedWith(Names.named("mailstore")).toInstance(store);
}
}
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonVirtualUserTableStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonVirtualUserTableStore.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonVirtualUserTableStore.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/AvalonVirtualUserTableStore.java Sat Dec 19 19:13:46 2009
@@ -60,9 +60,9 @@
protected void configure() {
bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(configuration);
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(selector);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(DNSService.class).annotatedWith(Names.named("org.apache.james.api.dnsservice.DNSService")).toInstance(dns);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(selector);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(DNSService.class).annotatedWith(Names.named("dnsserver")).toInstance(dns);
}
}
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceUsersStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceUsersStore.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceUsersStore.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceUsersStore.java Sat Dec 19 19:13:46 2009
@@ -51,17 +51,17 @@
private DataSourceSelector selector;
private Store store;
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fs) {
this.fs = fs;
}
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store store) {
this.store = store;
}
@@ -123,9 +123,9 @@
@Override
protected void configure() {
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(selector);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(store);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(selector);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(Store.class).annotatedWith(Names.named("mailstore")).toInstance(store);
}
};
}
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceVirtualUserTableStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceVirtualUserTableStore.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceVirtualUserTableStore.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/core/GuiceVirtualUserTableStore.java Sat Dec 19 19:13:46 2009
@@ -58,18 +58,18 @@
super.init();
}
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fs) {
this.fs = fs;
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(DNSService dns) {
this.dns = dns;
}
@@ -115,9 +115,9 @@
@Override
protected void configure() {
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(selector);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(DNSService.class).annotatedWith(Names.named("org.apache.james.api.dnsservice.DNSService")).toInstance(dns);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(selector);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(DNSService.class).annotatedWith(Names.named("dnsserver")).toInstance(dns);
}
};
}
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java Sat Dec 19 19:13:46 2009
@@ -231,7 +231,7 @@
* @param datasources
* the DataSourceSelector
*/
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
void setDatasources(DataSourceSelector datasources) {
m_datasources = datasources;
}
@@ -241,7 +241,7 @@
* @param system
* the new service
*/
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
void setFileSystem(FileSystem system) {
this.fileSystem = system;
}
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/userrepository/UsersFileRepository.java Sat Dec 19 19:13:46 2009
@@ -71,7 +71,7 @@
*
* @param store the Store
*/
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store store) {
this.store = store;
}
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/AvalonJDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/AvalonJDBCVirtualUserTable.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/AvalonJDBCVirtualUserTable.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/AvalonJDBCVirtualUserTable.java Sat Dec 19 19:13:46 2009
@@ -58,8 +58,8 @@
@Override
protected void configure() {
super.configure();
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(selector);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(selector);
}
}
Modified: james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/avalon-user-function/src/main/java/org/apache/james/vut/JDBCVirtualUserTable.java Sat Dec 19 19:13:46 2009
@@ -223,12 +223,12 @@
this.dataSourceComponent = dataSourceComponent;
}
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector datasources) {
this.datasources = datasources;
}
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java (original)
+++ james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java Sat Dec 19 19:13:46 2009
@@ -32,18 +32,54 @@
public class FakeLoader implements LoaderService, org.apache.avalon.framework.service.ServiceManager{
private final Map<String, Object> servicesByName;
-
+ private final Map<String, String> mappings = new HashMap<String, String>();
public FakeLoader() {
servicesByName = new HashMap<String, Object>();
servicesByName.put("org.apache.james.LoaderService", this);
+
+ mappings.put("James", "org.apache.james.services.MailServer");
+ mappings.put("filesystem", "org.apache.james.services.FileSystem");
+ mappings.put("dnsserver", "org.apache.james.api.dnsservice.DNSService");
+ mappings.put("mailstore", "org.apache.avalon.cornerstone.services.store.Store");
+ mappings.put("users-store", "org.apache.james.api.user.UsersStore");
+ mappings.put("localusersrepository", "org.apache.james.api.user.UsersRepository");
+ mappings.put("spoolrepository", "org.apache.james.services.SpoolRepository");
+ mappings.put("domainlist", "org.apache.james.api.domainlist.DomainList");
+ mappings.put("sockets", "org.apache.avalon.cornerstone.services.sockets.SocketManager");
+ mappings.put("scheduler", "org.apache.avalon.cornerstone.services.scheduler.TimeScheduler");
+ mappings.put("database-connections", "org.apache.avalon.cornerstone.services.datasources.DataSourceSelector");
+ mappings.put("defaultvirtualusertable", "org.apache.james.api.vut.VirtualUserTable");
+
+ mappings.put("spoolmanager", "org.apache.james.services.SpoolManager");
+ mappings.put("matcherpackages", "org.apache.james.transport.MatcherLoader");
+ mappings.put("mailetpackages", "org.apache.james.transport.MailetLoader");
+ mappings.put("virtualusertable-store", "org.apache.james.api.vut.VirtualUserTableStore");
+ mappings.put("imapserver", "org.org.apache.jsieve.mailet.Poster");
+ mappings.put("threadmanager", "org.apache.avalon.cornerstone.services.threads.ThreadManager");
+ mappings.put("spoolmanagement", "org.apache.james.management.SpoolManagementService");
+ mappings.put("bayesiananalyzermanagement", "org.apache.james.management.BayesianAnalyzerManagementService");
+ mappings.put("processormanagement", "org.apache.james.management.ProcessorManagementService");
+ mappings.put("virtualusertablemanagement", "org.apache.james.api.vut.management.VirtualUserTableManagementService");
+ mappings.put("domainlistmanagement", "org.apache.james.management.DomainListManagementService");
+ mappings.put("nntp-repository", "org.apache.james.nntpserver.repository.NNTPRepository");
}
- public Object get(String name) {
- Object service = servicesByName.get(name);
+ public Object get(String name) {
+ Object service = servicesByName.get(mapName(name));
+
+ System.out.println("KEYS="+servicesByName.keySet().toString());
return service;
}
+ private String mapName(String name) {
+ String newName = mappings.get(name);
+ if(newName == null) {
+ newName = name;
+ }
+ System.out.println("NEW=" + newName);
+ return newName;
+ }
private void injectResources(Object resource) {
final Method[] methods = resource.getClass().getMethods();
for (Method method : methods) {
@@ -55,6 +91,8 @@
} else {
// Name indicates a service
final Object service = get(name);
+
+ System.out.println("SERVICE=" + service);
if (service == null) {
} else {
try {
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractAvalonDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractAvalonDomainList.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractAvalonDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractAvalonDomainList.java Sat Dec 19 19:13:46 2009
@@ -94,7 +94,7 @@
protected void configure() {
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
- bind(DNSService.class).annotatedWith(Names.named("org.apache.james.api.dnsservice.DNSService")).toInstance(dns);
+ bind(DNSService.class).annotatedWith(Names.named("dnsserver")).toInstance(dns);
}
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/AbstractDomainList.java Sat Dec 19 19:13:46 2009
@@ -43,7 +43,7 @@
private boolean autoDetectIP = true;
private Log logger;
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(DNSService dns) {
this.dns = dns;
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/AvalonJDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/AvalonJDBCDomainList.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/AvalonJDBCDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/AvalonJDBCDomainList.java Sat Dec 19 19:13:46 2009
@@ -45,8 +45,8 @@
@Override
protected void configure() {
super.configure();
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(datasources);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(datasources);
}
}).getInstance(JDBCDomainList.class);
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/domain/JDBCDomainList.java Sat Dec 19 19:13:46 2009
@@ -79,12 +79,12 @@
}
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector datasources) {
this.datasources = datasources;
}
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailRepository.java Sat Dec 19 19:13:46 2009
@@ -78,7 +78,7 @@
*
* @param store the Store
*/
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store store) {
this.store = store;
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStore.java Sat Dec 19 19:13:46 2009
@@ -69,8 +69,8 @@
protected void configure() {
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(selector);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(selector);
}
}).getInstance(GuiceMailStore.class);
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStoreSpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStoreSpoolRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStoreSpoolRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AvalonMailStoreSpoolRepository.java Sat Dec 19 19:13:46 2009
@@ -74,7 +74,7 @@
protected void configure() {
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
- bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(store);
+ bind(Store.class).annotatedWith(Names.named("mailstore")).toInstance(store);
}
}).getInstance(MailStoreSpoolRepository.class);
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/GuiceMailStore.java Sat Dec 19 19:13:46 2009
@@ -79,7 +79,7 @@
private DataSourceSelector datasources;
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDatasources(DataSourceSelector datasources) {
this.datasources = datasources;
}
@@ -104,7 +104,7 @@
*
* @param store the Store
*/
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fs) {
this.fs = fs;
}
@@ -285,9 +285,9 @@
protected void configure() {
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(datasources);
- bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(new Store() {
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(datasources);
+ bind(Store.class).annotatedWith(Names.named("mailstore")).toInstance(new Store() {
public Object select(Object arg0) throws ServiceException {
return GuiceMailStore.this.select(arg0);
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/JDBCMailRepository.java Sat Dec 19 19:13:46 2009
@@ -139,13 +139,13 @@
private FileSystem fileSystem;
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDatasources(DataSourceSelector datasources) {
this.datasources = datasources;
}
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/MailStoreSpoolRepository.java Sat Dec 19 19:13:46 2009
@@ -76,7 +76,7 @@
this.configuration = configuration;
}
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store store) {
mailStore = store;
}
Modified: james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java (original)
+++ james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/javamail/AbstractJavamailStoreMailRepository.java Sat Dec 19 19:13:46 2009
@@ -107,7 +107,7 @@
private HierarchicalConfiguration configuration;
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/mailrepository/filepair/AbstractFileRepository.java Sat Dec 19 19:13:46 2009
@@ -79,7 +79,7 @@
}
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/AvalonFetchScheduler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/AvalonFetchScheduler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/AvalonFetchScheduler.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/AvalonFetchScheduler.java Sat Dec 19 19:13:46 2009
@@ -74,12 +74,12 @@
@Override
protected void configure() {
- bind(DNSService.class).annotatedWith(Names.named("org.apache.james.api.dnsservice.DNSService")).toInstance(dns);
+ bind(DNSService.class).annotatedWith(Names.named("dnsserver")).toInstance(dns);
bind(org.apache.commons.configuration.HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(TimeScheduler.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.scheduler.TimeScheduler")).toInstance(tscheduler);
- bind(MailServer.class).annotatedWith(Names.named("org.apache.james.services.MailServer")).toInstance(mailserver);
- bind(UsersRepository.class).annotatedWith(Names.named("org.apache.james.api.user.UsersRepository")).toInstance(userRepos);
+ bind(TimeScheduler.class).annotatedWith(Names.named("scheduler")).toInstance(tscheduler);
+ bind(MailServer.class).annotatedWith(Names.named("James")).toInstance(mailserver);
+ bind(UsersRepository.class).annotatedWith(Names.named("localusersrepository")).toInstance(userRepos);
}
}).getInstance(FetchScheduler.class);
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchMail.java Sat Dec 19 19:13:46 2009
@@ -661,18 +661,18 @@
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(DNSService dns) {
this.dnsServer = dns;
}
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public void setMailServer(MailServer mailserver) {
this.fieldServer = mailserver;
}
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public void setUsersRepository(UsersRepository urepos) {
this.fieldLocalUsers = urepos;
}
Modified: james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java (original)
+++ james/server/trunk/fetchmail-function/src/main/java/org/apache/james/fetchmail/FetchScheduler.java Sat Dec 19 19:13:46 2009
@@ -75,24 +75,24 @@
private Log logger;
- @Resource(name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler")
+ @Resource(name="scheduler")
public void setTimeScheduler(TimeScheduler scheduler) {
this.scheduler = scheduler;
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(DNSService dns) {
this.dns = dns;
}
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public void setMailServer(MailServer mailserver) {
this.mailserver = mailserver;
}
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public void setUsersRepository(UsersRepository urepos) {
this.urepos = urepos;
}
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/AvalonImapServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/AvalonImapServer.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/AvalonImapServer.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/AvalonImapServer.java Sat Dec 19 19:13:46 2009
@@ -112,19 +112,19 @@
@Override
protected void configure() {
- bind(DNSService.class).annotatedWith(Names.named("org.apache.james.api.dnsservice.DNSService")).toInstance(dns);
- bind(MailServer.class).annotatedWith(Names.named("org.apache.james.services.MailServer")).toInstance(mailserver);
+ bind(DNSService.class).annotatedWith(Names.named("dnsserver")).toInstance(dns);
+ bind(MailServer.class).annotatedWith(Names.named("James")).toInstance(mailserver);
bind(org.apache.commons.configuration.HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(filesystem);
- bind(UsersRepository.class).annotatedWith(Names.named("org.apache.james.api.user.UsersRepository")).toInstance(userRepos);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(filesystem);
+ bind(UsersRepository.class).annotatedWith(Names.named("localusersrepository")).toInstance(userRepos);
bind(ImapServerProtocolHandlerFactory.class).in(Singleton.class);
bind(Poster.class).to(ImapServerProtocolHandlerFactory.class);
bind(ProtocolHandlerFactory.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolHandlerFactory")).to(ImapServerProtocolHandlerFactory.class);
bind(ProtocolServer.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolServer")).to(AvalonProtocolServer.class).in(Singleton.class);
- bind(SocketManager.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.sockets.SocketManager")).toInstance(socketManager);
+ bind(SocketManager.class).annotatedWith(Names.named("sockets")).toInstance(socketManager);
bind(JamesConnectionManager.class).annotatedWith(Names.named("org.apache.james.socket.JamesConnectionManager")).toInstance(connectionManager);
- bind(ThreadManager.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.threads.ThreadManager")).toInstance(threadManager);
+ bind(ThreadManager.class).annotatedWith(Names.named("thread-manager")).toInstance(threadManager);
}
}
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java Sat Dec 19 19:13:46 2009
@@ -66,17 +66,17 @@
private MailServer mailServer;
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public void setUsersRepository(UsersRepository usersRepos) {
this.usersRepos = usersRepos;
}
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fSystem) {
this.fSystem = fSystem;
}
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public void setMailSerer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/SieveMailet.java Sat Dec 19 19:13:46 2009
@@ -35,7 +35,7 @@
private MailServer mailServer;
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public void setMailSerer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java Sat Dec 19 19:13:46 2009
@@ -100,7 +100,7 @@
private UsersStore usersStore;
- @Resource(name="org.apache.james.api.user.UsersStore")
+ @Resource(name="users-store")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java Sat Dec 19 19:13:46 2009
@@ -43,7 +43,7 @@
private UsersStore usersStore;
- @Resource(name="org.apache.james.api.user.UsersStore")
+ @Resource(name="users-store")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java Sat Dec 19 19:13:46 2009
@@ -184,7 +184,7 @@
return this.lastCorpusLoadTime;
}
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java Sat Dec 19 19:13:46 2009
@@ -155,7 +155,7 @@
}
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java Sat Dec 19 19:13:46 2009
@@ -334,7 +334,7 @@
xmlResources = initXMLResources(new String[]{"List Manager"})[0];
}
- @Resource(name="org.apache.james.api.user.UsersStore")
+ @Resource(name="users-store")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java Sat Dec 19 19:13:46 2009
@@ -414,7 +414,7 @@
xmlResources = getCommandListservManager().initXMLResources(new String[]{"List Manager"})[0];
}
- @Resource(name="org.apache.james.api.user.UsersStore")
+ @Resource(name="users-store")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java Sat Dec 19 19:13:46 2009
@@ -61,7 +61,7 @@
private DataSourceSelector selector;
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCListserv.java Sat Dec 19 19:13:46 2009
@@ -79,7 +79,7 @@
private DataSourceSelector selector;
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/JDBCVirtualUserTable.java Sat Dec 19 19:13:46 2009
@@ -110,7 +110,7 @@
private DataSourceSelector selector;
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Sat Dec 19 19:13:46 2009
@@ -264,12 +264,12 @@
private Store mailStore;
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store mailStore) {
this.mailStore = mailStore;
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(DNSService dnsService) {
this.dnsServer = dnsService;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java Sat Dec 19 19:13:46 2009
@@ -235,7 +235,7 @@
private Store mailStore;
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store mailStore) {
this.mailStore = mailStore;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ToRepository.java Sat Dec 19 19:13:46 2009
@@ -58,7 +58,7 @@
private Store mailStore;
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store mailStore) {
this.mailStore = mailStore;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java Sat Dec 19 19:13:46 2009
@@ -160,12 +160,12 @@
private DataSourceSelector selector;
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public void setUsersRepository(UsersRepository localusers) {
this.localusers = localusers;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java Sat Dec 19 19:13:46 2009
@@ -97,7 +97,7 @@
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(DNSService dnsService) {
this.dnsServer = dnsService;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java Sat Dec 19 19:13:46 2009
@@ -51,12 +51,12 @@
private MailServer mailServer;
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public void setUsersRepository(UsersRepository localusers) {
this.localusers = localusers;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java Sat Dec 19 19:13:46 2009
@@ -58,7 +58,7 @@
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(DNSService dnsService) {
this.dnsServer = dnsService;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java Sat Dec 19 19:13:46 2009
@@ -98,12 +98,12 @@
private DataSourceSelector selector;
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector(DataSourceSelector selector) {
this.selector = selector;
}
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public void setUsersRepository(UsersRepository localusers) {
this.localusers = localusers;
}
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonBayesianAnalyzerManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonBayesianAnalyzerManagement.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonBayesianAnalyzerManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonBayesianAnalyzerManagement.java Sat Dec 19 19:13:46 2009
@@ -65,8 +65,8 @@
protected void configure() {
bind(org.apache.commons.configuration.HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(selector);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(selector);
}
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonDomainListManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonDomainListManagement.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonDomainListManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonDomainListManagement.java Sat Dec 19 19:13:46 2009
@@ -56,7 +56,7 @@
@Override
protected void configure() {
- bind(DomainList.class).annotatedWith(Names.named("org.apache.james.api.domainlist.DomainList")).toInstance(dList);
+ bind(DomainList.class).annotatedWith(Names.named("domainlist")).toInstance(dList);
}
}).getInstance(DomainListManagement.class);
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonProcessorManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonProcessorManagement.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonProcessorManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonProcessorManagement.java Sat Dec 19 19:13:46 2009
@@ -48,7 +48,7 @@
@Override
protected void configure() {
- bind(SpoolManager.class).annotatedWith(Names.named("org.apache.james.services.SpoolManager")).toInstance(smanager);
+ bind(SpoolManager.class).annotatedWith(Names.named("spoolmanager")).toInstance(smanager);
}
}).getInstance(ProcessorManagement.class);
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonSpoolManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonSpoolManagement.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonSpoolManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/AvalonSpoolManagement.java Sat Dec 19 19:13:46 2009
@@ -85,7 +85,7 @@
@Override
protected void configure() {
- bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(mailStore);
+ bind(Store.class).annotatedWith(Names.named("mailstore")).toInstance(mailStore);
}
}).getInstance(SpoolManagement.class);
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/BayesianAnalyzerManagement.java Sat Dec 19 19:13:46 2009
@@ -72,7 +72,7 @@
*
* @param system new service
*/
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem system) {
this.fileSystem = system;
}
@@ -122,7 +122,7 @@
*
* @param selector The DataSourceSelector
*/
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSourceSelector (DataSourceSelector selector) {
this.selector = selector;
}
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/DomainListManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/DomainListManagement.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/DomainListManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/DomainListManagement.java Sat Dec 19 19:13:46 2009
@@ -37,7 +37,7 @@
public class DomainListManagement implements DomainListManagementService,DomainListManagementMBean {
private DomainList domList;
- @Resource(name="org.apache.james.api.domainlist.DomainList")
+ @Resource(name="domainlist")
public void setDomainList(DomainList domList) {
this.domList = domList;
}
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/ProcessorManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/ProcessorManagement.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/ProcessorManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/ProcessorManagement.java Sat Dec 19 19:13:46 2009
@@ -108,7 +108,7 @@
}
}
- @Resource(name="org.apache.james.services.SpoolManager")
+ @Resource(name="spoolmanager")
public void setProcessorManager(SpoolManager processorManager) {
this.processorManager = processorManager;
}
Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java (original)
+++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java Sat Dec 19 19:13:46 2009
@@ -57,7 +57,7 @@
*
* @param mailStore the store
*/
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store mailStore) {
this.mailStore = mailStore;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org