[prev in list] [next in list] [prev in thread] [next in thread]
List: james-dev
Subject: svn commit: r892500 [2/3] - in /james/server/trunk:
From: norman () apache ! org
Date: 2009-12-19 19:13:49
Message-ID: 20091219191357.037A82388A02 () eris ! apache ! org
[Download RAW message or body]
Modified: james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket-library/src/main/java \
/org/apache/james/socket/mina/AbstractAsyncServer.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java \
(original)
+++ james/server/trunk/mina-socket-library/src/main/java/org/apache/james/socket/mina/AbstractAsyncServer.java \
Sat Dec 19 19:13:46 2009 @@ -139,22 +139,22 @@
this.loader = loader;
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public final void setDNSService(DNSService dns) {
this.dns = dns;
}
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public final void setFileSystem(FileSystem filesystem) {
this.fileSystem = filesystem;
}
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
- @Resource(name="org.apache.mailet.MailetContext")
+ @Resource(name="James")
public final void setMailetContext(MailetContext mailetcontext) {
this.mailetcontext = mailetcontext;
}
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/AvalonNNTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java \
/org/apache/james/nntpserver/AvalonNNTPServer.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/AvalonNNTPServer.java \
(original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/AvalonNNTPServer.java \
Sat Dec 19 19:13:46 2009 @@ -124,17 +124,17 @@
@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(ProtocolHandlerFactory.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolHandlerFactory")).to(NNTPServerProtocolHandlerFactory.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(NNTPRepository.class).annotatedWith(Names.named("org.apache.james.nntpserver.repository.NNTPRepository")).toInstance(nntpRepos);
+ bind(ThreadManager.class).annotatedWith(Names.named("thread-manager")).toInstance(threadManager);
+ bind(NNTPRepository.class).annotatedWith(Names.named("nntp-repository")).toInstance(nntpRepos);
bind(ProtocolServer.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolServer")).to(AvalonProtocolServer.class);
// we bind the LoaderService to an Provider to get sure everything is \
there when the SMTPLoaderService get created.
bind(LoaderService.class).annotatedWith(Names.named("org.apache.james.LoaderService")).toProvider(new \
Provider<LoaderService>() {
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java \
/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java \
(original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/NNTPServerProtocolHandlerFactory.java \
Sat Dec 19 19:13:46 2009 @@ -60,7 +60,7 @@
*
* @param userRepository the UserRepository
*/
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public void setUserRepository(UsersRepository userRepository) {
this.userRepository = userRepository;
}
@@ -70,12 +70,12 @@
*
* @param nntpRepository the NNTPRepository
*/
- @Resource(name="org.apache.james.nntpserver.repository.NNTPRepository")
+ @Resource(name="nntp-repository")
public void setNNTPRepository(NNTPRepository nntpRepository) {
this.nntpRepository = nntpRepository;
}
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/AvalonNNTPRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java \
/org/apache/james/nntpserver/repository/AvalonNNTPRepository.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/AvalonNNTPRepository.java \
(original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/AvalonNNTPRepository.java \
Sat Dec 19 19:13:46 2009 @@ -102,7 +102,7 @@
protected void configure() {
bind(org.apache.commons.configuration.HierarchicalConfiguration.class).an \
notatedWith(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(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
bind(LoaderService.class).annotatedWith(Names.named("org.apache.james.LoaderService")).toProvider(new \
Provider<LoaderService>() {
public LoaderService get() {
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java \
/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java \
(original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java \
Sat Dec 19 19:13:46 2009 @@ -157,7 +157,7 @@
*
* @param system filesystem service
*/
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem system) {
this.fileSystem = system;
}
@@ -476,9 +476,9 @@
protected void configure() {
\
bind(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.co \
nfiguration.Configuration")).toInstance(spoolerConfiguration.configurationAt("configuration"));
\
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(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fileSystem);
bind(ArticleIDRepository.class).annotatedWith(Names.named("org.apache.james.nntpserver.repository.ArticleIDRepository")).toInstance(articleIDRepo);
- \
bind(NNTPRepository.class).annotatedWith(Names.named("org.apache.james.nntpserver.repository.NNTPRepository")).toInstance(new \
NNTPRepository() { + \
bind(NNTPRepository.class).annotatedWith(Names.named("nntp-repository")).toInstance(new \
NNTPRepository() {
public void createArticle(InputStream in) {
NNTPRepositoryImpl.this.createArticle(in);
Modified: james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/src/main/java \
/org/apache/james/nntpserver/repository/NNTPSpooler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPSpooler.java \
(original)
+++ james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/repository/NNTPSpooler.java \
Sat Dec 19 19:13:46 2009 @@ -123,7 +123,7 @@
*
* @param repo the repository to be used
*/
- @Resource(name="org.apache.james.nntpserver.repository.NNTPRepository")
+ @Resource(name="nntp-repository")
void setNNTPRepository(NNTPRepository nntpRepos) {
this.nntpRepos = nntpRepos;
}
@@ -339,7 +339,7 @@
*
* @param fileSystem fs
*/
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem fileSystem) {
this.fileSystem = fileSystem;
}
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/AvalonPOP3Server.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java \
/org/apache/james/pop3server/AvalonPOP3Server.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/AvalonPOP3Server.java \
(original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/AvalonPOP3Server.java \
Sat Dec 19 19:13:46 2009 @@ -121,18 +121,18 @@
@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(ProtocolHandlerFactory.class).annotatedWith(Names.named("org.apache.james.socke \
t.api.ProtocolHandlerFactory")).to(POP3ServerProtocolServerHandlerFactory.class);
bind(ProtocolServer.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolServer")).to(AvalonProtocolServer.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);
// we bind the LoaderService to an Provider to get sure everything is \
there when the SMTPLoaderService get created.
bind(LoaderService.class).annotatedWith(Names.named("org.apache.james.LoaderService")).toProvider(new \
Provider<LoaderService>() {
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3ServerProtocolServerHandlerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java \
/org/apache/james/pop3server/POP3ServerProtocolServerHandlerFactory.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3ServerProtocolServerHandlerFactory.java \
(original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3ServerProtocolServerHandlerFactory.java \
Sat Dec 19 19:13:46 2009 @@ -64,7 +64,7 @@
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java \
/org/apache/james/pop3server/core/PassCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java \
(original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -49,7 +49,7 @@
* Sets the users repository.
* @param users the users to set
*/
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
@@ -58,7 +58,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/AvalonRemoteManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/AvalonRemoteManager.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/AvalonRemoteManager.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/AvalonRemoteManager.java \
Sat Dec 19 19:13:46 2009 @@ -140,21 +140,21 @@
@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(SocketManager.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.sockets.SocketManager")).toInstance(socketManager);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(filesystem);
+ 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(SpoolManagementService.class).annotatedWith(Names.named("org.apache.james.management.SpoolManagementService")).toInstance(spoolService);
- bind(BayesianAnalyzerManagementService.class).annotatedWith(Names.named(" \
org.apache.james.management.BayesianAnalyzerManagementService")).toInstance(bayesianServer);
- bind(UsersStore.class).annotatedWith(Names.named("org.apache.james.api.user.UsersStore")).toInstance(usersStore);
- bind(ProcessorManagementService.class).annotatedWith(Names.named("org.apache.james.management.ProcessorManagementService")).toInstance(processorService);
- bind(VirtualUserTableManagementService.class).annotatedWith(Names.named(" \
org.apache.james.api.vut.management.VirtualUserTableManagementService")).toInstance(vutService);
- bind(DomainListManagementService.class).annotatedWith(Names.named("org.apache.james.management.DomainListManagementService")).toInstance(domainService);
- bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(store);
+ bind(ThreadManager.class).annotatedWith(Names.named("thread-manager")).toInstance(threadManager);
+ bind(SpoolManagementService.class).annotatedWith(Names.named("spoolmanagement")).toInstance(spoolService);
+ bind(BayesianAnalyzerManagementService.class).annotatedWith(Names.named("bayesiananalyzermanagement")).toInstance(bayesianServer);
+ bind(UsersStore.class).annotatedWith(Names.named("users-store")).toInstance(usersStore);
+ bind(ProcessorManagementService.class).annotatedWith(Names.named("processormanagement")).toInstance(processorService);
+ bind(VirtualUserTableManagementService.class).annotatedWith(Names.named("virtualusertablemanagement")).toInstance(vutService);
+ bind(DomainListManagementService.class).annotatedWith(Names.named("domainlistmanagement")).toInstance(domainService);
+ bind(Store.class).annotatedWith(Names.named("mailstore")).toInstance(store);
bind(ProtocolHandlerFactory.class).annotatedWith(Names.named("org.apache. \
james.socket.api.ProtocolHandlerFactory")).to(RemoteManagerProtocolHandlerFactory.class);
bind(ProtocolServer.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolServer")).to(AvalonProtocolServer.class);
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerProtocolHandlerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/RemoteManagerProtocolHandlerFactory.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerProtocolHandlerFactory.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerProtocolHandlerFactory.java \
Sat Dec 19 19:13:46 2009 @@ -54,7 +54,7 @@
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AbstractMappingCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -31,7 +31,7 @@
protected final static String REMOVE_MAPPING_ACTION = "REMOVEMAPPING";
protected VirtualUserTableManagementService vutManagement;
- @Resource(name = \
"org.apache.james.api.vut.management.VirtualUserTableManagementService") + \
@Resource(name = "virtualusertablemanagement")
public final void \
setVirtualUserTableManagementService(VirtualUserTableManagementService vutManagement) \
{ this.vutManagement = vutManagement;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/AddDomainCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -43,7 +43,7 @@
private DomainListManagementService domService;
- @Resource(name="org.apache.james.management.DomainListManagementService")
+ @Resource(name="domainlistmanagement")
public final void setDomainListManagement(DomainListManagementService \
domService) { this.domService = domService;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/AddHamCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -47,7 +47,7 @@
*
* @param bayesianAnalyzerManagement the BayesianAnalyzerManagementService
*/
- @Resource(name="org.apache.james.management.BayesianAnalyzerManagementService")
+ @Resource(name="bayesiananalyzermanagement")
public final void \
setBayesianAnalyzerManagement(BayesianAnalyzerManagementService \
bayesianAnalyzerManagement) { this.bayesianAnalyzerManagement = \
bayesianAnalyzerManagement; }
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/AddSpamCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -47,7 +47,7 @@
*
* @param bayesianAnalyzerManagement the BayesianAnalyzerManagementService
*/
- @Resource(name="org.apache.james.management.BayesianAnalyzerManagementService")
+ @Resource(name="bayesiananalyzermanagement")
public final void \
setBayesianAnalyzerManagement(BayesianAnalyzerManagementService \
bayesianAnalyzerManagement) { this.bayesianAnalyzerManagement = \
bayesianAnalyzerManagement; }
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -47,7 +47,7 @@
private MailServer mailServer;
private DomainListManagementService domService;
- @Resource(name="org.apache.james.management.DomainListManagementService")
+ @Resource(name="domainlistmanagement")
public final void setDomainListManagement(DomainListManagementService \
domService) { this.domService = domService;
}
@@ -56,7 +56,7 @@
* Sets the users store.
* @param users the users to set
*/
- @Resource(name="org.apache.james.api.user.UsersStore")
+ @Resource(name="users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
@@ -65,7 +65,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/DelUserCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -49,7 +49,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -50,7 +50,7 @@
* @param spoolManagement
* the SpoolManagementService
*/
- @Resource(name = "org.apache.james.management.SpoolManagementService")
+ @Resource(name = "spoolmanagement")
public final void setSpoolManagement(SpoolManagementService spoolManagement) {
this.spoolManagement = spoolManagement;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -43,7 +43,7 @@
*
* @param bayesianAnalyzerManagement the BayesianAnalyzerManagementService
*/
- @Resource(name="org.apache.james.management.BayesianAnalyzerManagementService")
+ @Resource(name="bayesiananalyzermanagement")
public final void \
setBayesianAnalyzerManagement(BayesianAnalyzerManagementService \
bayesianAnalyzerManagement) { this.bayesianAnalyzerManagement = \
bayesianAnalyzerManagement; }
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -48,7 +48,7 @@
* @param spoolManagement
* the SpoolManagementService
*/
- @Resource(name = "org.apache.james.management.SpoolManagementService")
+ @Resource(name = "spoolmanagement")
public final void setSpoolManagement(SpoolManagementService spoolManagement) {
this.spoolManagement = spoolManagement;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -43,7 +43,7 @@
*
* @param bayesianAnalyzerManagement the BayesianAnalyzerManagementService
*/
- @Resource(name="org.apache.james.management.BayesianAnalyzerManagementService")
+ @Resource(name="bayesiananalyzermanagement")
public final void \
setBayesianAnalyzerManagement(BayesianAnalyzerManagementService \
bayesianAnalyzerManagement) { this.bayesianAnalyzerManagement = \
bayesianAnalyzerManagement; }
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -41,7 +41,7 @@
protected VirtualUserTableManagementService vutManagement;
- @Resource(name = \
"org.apache.james.api.vut.management.VirtualUserTableManagementService") + \
@Resource(name = "virtualusertablemanagement")
public final void \
setVirtualUserTableManagementService(VirtualUserTableManagementService vutManagement) \
{ this.vutManagement = vutManagement;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -42,7 +42,7 @@
private DomainListManagementService domService;
- @Resource(name="org.apache.james.management.DomainListManagementService")
+ @Resource(name="domainlistmanagement")
public final void setDomainListManagement(DomainListManagementService \
domService) { this.domService = domService;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -25,7 +25,7 @@
*
* @param processorManagement the ProcessorManagementService
*/
- @Resource(name="org.apache.james.management.ProcessorManagementService")
+ @Resource(name="processormanagement")
public final void setProcessorManagement(ProcessorManagementService \
processorManagement) { this.processorManagementService = processorManagement;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -50,7 +50,7 @@
* @param spoolManagement
* the SpoolManagementService
*/
- @Resource(name = "org.apache.james.management.SpoolManagementService")
+ @Resource(name = "spoolmanagement")
public final void setSpoolManagement(SpoolManagementService spoolManagement) {
this.spoolManagement = spoolManagement;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ListUsersCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -48,7 +48,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
@@ -58,7 +58,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -49,7 +49,7 @@
* @param spoolManagement
* the SpoolManagementService
*/
- @Resource(name = "org.apache.james.management.SpoolManagementService")
+ @Resource(name = "spoolmanagement")
public final void setSpoolManagement(SpoolManagementService spoolManagement) {
this.spoolManagement = spoolManagement;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -44,7 +44,7 @@
private DomainListManagementService domService;
- @Resource(name="org.apache.james.management.DomainListManagementService")
+ @Resource(name="domainlistmanagement")
public final void setDomainListManagement(DomainListManagementService \
domService) { this.domService = domService;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -43,7 +43,7 @@
*
* @param bayesianAnalyzerManagement the BayesianAnalyzerManagementService
*/
- @Resource(name="org.apache.james.management.BayesianAnalyzerManagementService")
+ @Resource(name="bayesiananalyzermanagement")
public final void \
setBayesianAnalyzerManagement(BayesianAnalyzerManagementService \
bayesianAnalyzerManagement) { this.bayesianAnalyzerManagement = \
bayesianAnalyzerManagement; }
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/SetAliasCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetAliasCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetAliasCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -50,7 +50,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetForwardingCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -34,7 +34,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -50,7 +50,7 @@
* Sets the users store.
* @param users the users to set
*/
- @Resource(name="org.apache.james.api.user.UsersStore")
+ @Resource(name="users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -51,7 +51,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -52,7 +52,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -46,7 +46,7 @@
*
* @param processorManagement the ProcessorManagementService
*/
- @Resource(name="org.apache.james.management.ProcessorManagementService")
+ @Resource(name="processormanagement")
public final void setProcessorManagement(ProcessorManagementService \
processorManagement) { this.processorManagementService = processorManagement;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -48,7 +48,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -49,7 +49,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/UserCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -27,7 +27,7 @@
* Sets the users store.
* @param users the users to set
*/
- @Resource(name="org.apache.james.api.user.UsersStore")
+ @Resource(name="users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/j \
ava/org/apache/james/remotemanager/core/VerifyCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java \
(original)
+++ james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -47,7 +47,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersStore")
+ @Resource(name = "users-store")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/DNSService.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/src/main/ja \
va/org/apache/james/smtpserver/protocol/DNSService.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/DNSService.java \
(original)
+++ james/server/trunk/smtp-protocol-library/src/main/java/org/apache/james/smtpserver/protocol/DNSService.java \
Sat Dec 19 19:13:46 2009 @@ -40,7 +40,7 @@
/**
* The component role used by components implementing this service
*/
- String ROLE = "org.apache.james.api.dnsservice.DNSService";
+ String ROLE = "org.apache.james.smtpserver.protocol.DNSService";
/**
* <p>Return a prioritized unmodifiable list of host handling mail
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/AvalonSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/AvalonSMTPServer.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/AvalonSMTPServer.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/AvalonSMTPServer.java \
Sat Dec 19 19:13:46 2009 @@ -133,21 +133,21 @@
@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.james.smtpserver.protocol.DNSService.class).annotatedWith(Names.name \
d("org.apache.james.smtpserver.protocol.DNSService")).toInstance(dnsServiceAdapter);
- bind(MailServer.class).annotatedWith(Names.named("org.apache.james.services.MailServer")).toInstance(mailserver);
+ 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(MailetContext.class).annotatedWith(Names.named("org.apache.mailet.MailetContext")).toInstance(context);
- 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(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(dselector);
- bind(VirtualUserTableStore.class).annotatedWith(Names.named("org.apache.james.api.vut.VirtualUserTableStore")).toInstance(vutStore);
+ bind(MailetContext.class).annotatedWith(Names.named("James")).toInstance(context);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(filesystem);
+ bind(UsersRepository.class).annotatedWith(Names.named("localusersrepository")).toInstance(userRepos);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(dselector);
+ bind(VirtualUserTableStore.class).annotatedWith(Names.named("virtualusertable-store")).toInstance(vutStore);
bind(ProtocolHandlerFactory.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolHandlerFactory")).to(SMTPServerProtocolHandlerFactory.class);
bind(ProtocolServer.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolServer")).to(AvalonProtocolServer.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);
// we bind the LoaderService to an Provider to get sure everything is \
there when the SMTPLoaderService get created.
bind(LoaderService.class).annotatedWith(Names.named("org.apache.james.LoaderService")).toProvider(new \
Provider<LoaderService>() {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerProtocolHandlerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/SMTPServerProtocolHandlerFactory.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerProtocolHandlerFactory.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerProtocolHandlerFactory.java \
Sat Dec 19 19:13:46 2009 @@ -104,12 +104,12 @@
private boolean addressBracketsEnforcement = true;
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
- @Resource(name="org.apache.mailet.MailetContext")
+ @Resource(name="James")
public final void setMailetContext(MailetContext mailetcontext) {
this.mailetcontext = mailetcontext;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java \
Sat Dec 19 19:13:46 2009 @@ -38,7 +38,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java \
Sat Dec 19 19:13:46 2009 @@ -88,7 +88,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java \
Sat Dec 19 19:13:46 2009 @@ -123,7 +123,7 @@
*
* @param system The filesystem service
*/
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem system) {
this.fileSystem = system;
}
@@ -141,7 +141,7 @@
* @param datasources
* The datasources
*/
- @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
+ @Resource(name="database-connections")
public void setDataSources(DataSourceSelector datasources) {
this.datasources = datasources;
}
@@ -189,7 +189,7 @@
setUnseenLifeTime(TimeConverter.getMilliSeconds(unseenLifeTime));
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public final void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -56,7 +56,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -39,7 +39,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java \
Sat Dec 19 19:13:46 2009 @@ -42,7 +42,7 @@
* @param mailServer
* the mailServer to set
*/
- @Resource(name = "org.apache.james.services.MailServer")
+ @Resource(name = "James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java \
Sat Dec 19 19:13:46 2009 @@ -38,7 +38,7 @@
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(org.apache.james.api.dnsservice.DNSService dns) {
this.dns = dns;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/SendMailHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java \
Sat Dec 19 19:13:46 2009 @@ -53,7 +53,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java \
Sat Dec 19 19:13:46 2009 @@ -42,7 +42,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="org.apache.james.services.MailServer")
+ @Resource(name="James")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/URIRBLHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java \
Sat Dec 19 19:13:46 2009 @@ -93,7 +93,7 @@
* Sets the DNS service.
* @param dnsService the dnsService to set
*/
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public final void setDNSService(DNSService dnsService) {
this.dnsService = dnsService;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java \
Sat Dec 19 19:13:46 2009 @@ -45,7 +45,7 @@
* Sets the users repository.
* @param users the users to set
*/
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/integration/ValidRcptHandler.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java \
Sat Dec 19 19:13:46 2009 @@ -73,7 +73,7 @@
* @param users
* the users to set
*/
- @Resource(name = "org.apache.james.api.user.UsersRepository")
+ @Resource(name = "localusersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
@@ -93,7 +93,7 @@
* @param tableStore
* the tableStore to set
*/
- @Resource(name = "org.apache.james.api.vut.VirtualUserTableStore")
+ @Resource(name = "virtualusertable-store")
public final void setTableStore(VirtualUserTableStore tableStore) {
this.tableStore = tableStore;
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java \
/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java \
(original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java \
Sat Dec 19 19:13:46 2009 @@ -118,16 +118,16 @@
@Override
protected void configure() {
bind(AsyncSMTPServer.class).in(Singleton.class);
- 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.james.smtpserver.protocol.DNSService.class).annotatedWith(Names.name \
d("org.apache.james.smtpserver.protocol.DNSService")).toInstance(dnsServiceAdapter);
- bind(MailServer.class).annotatedWith(Names.named("org.apache.james.services.MailServer")).toInstance(mailserver);
+ 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(MailetContext.class).annotatedWith(Names.named("org.apache.mailet.MailetContext")).toInstance(context);
- 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(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(dselector);
- bind(VirtualUserTableStore.class).annotatedWith(Names.named("org.apache.james.api.vut.VirtualUserTableStore")).toInstance(vutStore);
+ bind(MailetContext.class).annotatedWith(Names.named("James")).toInstance(context);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(filesystem);
+ bind(UsersRepository.class).annotatedWith(Names.named("localusersrepository")).toInstance(userRepos);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(dselector);
+ bind(VirtualUserTableStore.class).annotatedWith(Names.named("virtualusertable-store")).toInstance(vutStore);
// we bind the LoaderService to an Provider to get sure everything is \
there when the SMTPLoaderService get created.
bind(LoaderService.class).annotatedWith(Names.named("org.apache.james.LoaderService")).toProvider(new \
Provider<LoaderService>() { @@ -138,7 +138,7 @@
// Mimic the loaderservice
class SMTPLoaderService implements LoaderService {
- Injector injector = Guice.createInjector(new LoaderServiceModule(), new \
SMTPServerModule(), new Jsr250Module()); + Injector injector = \
Guice.createInjector(new SMTPServerModule(), new Jsr250Module());
public <T> T load(Class<T> type) {
return injector.getInstance(type);
@@ -150,25 +150,7 @@
}
}
-
- /**
- * This Module mimic the current implementation of LoaderService. It use the \
name of the block to find the right thing to inject
- *
- */
- private final class LoaderServiceModule extends AbstractModule {
- @Override
- protected void configure() {
- bind(DNSService.class).annotatedWith(Names.named("dnsserver")).toInstance(dns);
- bind(MailServer.class).annotatedWith(Names.named("James")).toInstance(mailserver);
- bind(MailetContext.class).annotatedWith(Names.named("James")).toInstance(context);
- bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(filesystem);
- bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(dselector);
- bind(UsersRepository.class).annotatedWith(Names.named("localusersrepository")).toInstance(userRepos);
- bind(VirtualUserTableStore.class).annotatedWith(Names.named("virtualusertable-store")).toInstance(vutStore);
-
- }
- }
/**
* @see org.apache.james.smtpserver.protocol.SMTPServerMBean#getNetworkInterface()
Modified: james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/ja \
va/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java \
(original)
+++ james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractProtocolHandlerFactory.java \
Sat Dec 19 19:13:46 2009 @@ -52,7 +52,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;
}
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/AvalonJames.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/AvalonJames.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/AvalonJames.java \
(original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/AvalonJames.java \
Sat Dec 19 19:13:46 2009 @@ -224,15 +224,15 @@
@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(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log@MailetLog")).toInstance(mailetLogger);
- bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(store);
- bind(FileSystem.class).annotatedWith(Names.named("org.apache.james.services.FileSystem")).toInstance(fs);
- bind(UsersRepository.class).annotatedWith(Names.named("org.apache.james.api.user.UsersRepository")).toInstance(userRepos);
- bind(SpoolRepository.class).annotatedWith(Names.named("org.apache.james.services.SpoolRepository")).toInstance(spoolRepos);
- bind(DomainList.class).annotatedWith(Names.named("org.apache.james.api.domainlist.DomainList")).toInstance(domainList);
+ bind(Store.class).annotatedWith(Names.named("mailstore")).toInstance(store);
+ bind(FileSystem.class).annotatedWith(Names.named("filesystem")).toInstance(fs);
+ bind(UsersRepository.class).annotatedWith(Names.named("localusersrepository")).toInstance(userRepos);
+ bind(SpoolRepository.class).annotatedWith(Names.named("spoolrepository")).toInstance(spoolRepos);
+ bind(DomainList.class).annotatedWith(Names.named("domainlist")).toInstance(domainList);
}
}).getInstance(James.class);
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java \
(original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java \
Sat Dec 19 19:13:46 2009 @@ -186,17 +186,17 @@
*
* @param system the new service
*/
- @Resource(name="org.apache.james.services.FileSystem")
+ @Resource(name="filesystem")
public void setFileSystem(FileSystem system) {
this.fileSystem = system;
}
- @Resource(name="org.apache.james.api.domainlist.DomainList")
+ @Resource(name="domainlist")
public void setDomainList(DomainList domains) {
this.domains = domains;
}
- @Resource(name="org.apache.james.api.dnsservice.DNSService")
+ @Resource(name="dnsserver")
public void setDNSService(DNSService dns) {
this.dns = dns;
}
@@ -424,7 +424,7 @@
*
* @param store the Store to use
*/
- @Resource(name="org.apache.avalon.cornerstone.services.store.Store")
+ @Resource(name="mailstore")
public void setStore(Store store) {
this.store = store;
}
@@ -434,7 +434,7 @@
*
* @param spool the SpoleRepository to use
*/
- @Resource(name="org.apache.james.services.SpoolRepository")
+ @Resource(name="spoolrepository")
public void setSpoolRepository(SpoolRepository spool) {
this.spool = spool;
}
@@ -444,7 +444,7 @@
*
* @param localusers the UserRepository to use
*/
- @Resource(name="org.apache.james.api.user.UsersRepository")
+ @Resource(name="localusersrepository")
public void setUsersRepository(UsersRepository localusers) {
this.localusers = localusers;
}
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/ja \
va/org/apache/james/transport/AbstractAvalonJamesLoader.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java \
(original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractAvalonJamesLoader.java \
Sat Dec 19 19:13:46 2009 @@ -108,18 +108,18 @@
@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(MailetContext.class).annotatedWith(Names.named("org.apache.mailet.MailetContext")).toInstance(context);
+ bind(MailetContext.class).annotatedWith(Names.named("James")).toInstance(context);
bind(Poster.class).annotatedWith(Names.named("org.apache.jsieve.mailet.Poster")).toInstance(poster);
- 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(DataSourceSelector.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")).toInstance(dselector);
- bind(VirtualUserTable.class).annotatedWith(Names.named("org.apache.james.api.vut.VirtualUserTable")).toInstance(vut);
- bind(VirtualUserTableStore.class).annotatedWith(Names.named("org.apache.james.api.vut.VirtualUserTableStore")).toInstance(vutStore);
- bind(Store.class).annotatedWith(Names.named("org.apache.avalon.cornerstone.services.store.Store")).toInstance(store);
- bind(UsersStore.class).annotatedWith(Names.named("org.apache.james.api.user.UsersStore")).toInstance(usersStore);
+ bind(MailServer.class).annotatedWith(Names.named("James")).toInstance(mailserver);
+ bind(UsersRepository.class).annotatedWith(Names.named("localusersrepository")).toInstance(userRepos);
+ bind(DataSourceSelector.class).annotatedWith(Names.named("database-connections")).toInstance(dselector);
+ bind(VirtualUserTable.class).annotatedWith(Names.named("defaultvirtualusertable")).toInstance(vut);
+ bind(VirtualUserTableStore.class).annotatedWith(Names.named("virtualusertable-store")).toInstance(vutStore);
+ bind(Store.class).annotatedWith(Names.named("mailstore")).toInstance(store);
+ bind(UsersStore.class).annotatedWith(Names.named("users-store")).toInstance(usersStore);
bind(LoaderService.class).annotatedWith(Names.named("org.apache.james.LoaderService")).toProvider(new \
Provider<LoaderService>() {
public LoaderService get() {
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/ja \
va/org/apache/james/transport/AbstractLoader.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractLoader.java \
(original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AbstractLoader.java \
Sat Dec 19 19:13:46 2009 @@ -87,7 +87,7 @@
*
* @param mailetContext the MailetContext
*/
- @Resource(name="org.apache.mailet.MailetContext")
+ @Resource(name="James")
public void setMailetContext(MailetContext mailetContext) {
this.mailetContext = mailetContext;
}
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AvalonJamesSpoolManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/ja \
va/org/apache/james/transport/AvalonJamesSpoolManager.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AvalonJamesSpoolManager.java \
(original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/AvalonJamesSpoolManager.java \
Sat Dec 19 19:13:46 2009 @@ -104,9 +104,9 @@
protected void configure() {
bind(org.apache.commons.configuration.HierarchicalConfiguration.class).an \
notatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config);
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
- bind(SpoolRepository.class).annotatedWith(Names.named("org.apache.james.services.SpoolRepository")).toInstance(repos);
- bind(MailetLoader.class).annotatedWith(Names.named("org.apache.james.transport.MailetLoader")).toInstance(mailetLoader);
- bind(MatcherLoader.class).annotatedWith(Names.named("org.apache.james.transport.MatcherLoader")).toInstance(matcherLoader);
+ bind(SpoolRepository.class).annotatedWith(Names.named("spoolrepository")).toInstance(repos);
+ bind(MailetLoader.class).annotatedWith(Names.named("mailetpackages")).toInstance(mailetLoader);
+ bind(MatcherLoader.class).annotatedWith(Names.named("matcherpackages")).toInstance(matcherLoader);
bind(LoaderService.class).annotatedWith(Names.named("org.apache.james.LoaderService")).toProvider(new \
Provider<LoaderService>() {
public LoaderService get() {
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/ja \
va/org/apache/james/transport/JamesSpoolManager.java?rev=892500&r1=892499&r2=892500&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java \
(original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java \
Sat Dec 19 19:13:46 2009 @@ -109,7 +109,7 @@
*
* @param spool the SpoolRepository
*/
- @Resource(name="org.apache.james.services.SpoolRepository")
+ @Resource(name="spoolrepository")
public void setSpoolRepository(SpoolRepository spool) {
this.spool = spool;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic