Author: norman
Date: Tue Dec 22 11:48:02 2009
New Revision: 893146
URL: http://svn.apache.org/viewvc?rev=893146&view=rev
Log:
use component name for injection
Modified:
james/server/trunk/avalon-socket-library/src/main/java/org/apache/james/socket/AvalonProtocolServer.java
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/AvalonImapServer.java
james/server/trunk/nntpserver-function/src/main/java/org/apache/james/nntpserver/AvalonNNTPServer.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/AvalonPOP3Server.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/AvalonRemoteManager.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/AvalonSMTPServer.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=893146&r1=893145&r2=893146&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
Tue Dec 22 11:48:02 2009
@@ -230,7 +230,7 @@
this.dnsService = dnsServer;
}
- @Resource(name="org.apache.james.socket.JamesConnectionManager")
+ @Resource(name="connections")
public void setConnectionManager(JamesConnectionManager connectionManager)
{
this.connectionManager = connectionManager;
}
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=893146&r1=893145&r2=893146&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
Tue Dec 22 11:48:02 2009
@@ -123,7 +123,7 @@
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("sockets")).toInstance(socketManager);
-
bind(JamesConnectionManager.class).annotatedWith(Names.named("org.apache.james.socket.JamesConnectionManager")).toInstance(connectionManager);
+
bind(JamesConnectionManager.class).annotatedWith(Names.named("connections")).toInstance(connectionManager);
bind(ThreadManager.class).annotatedWith(Names.named("thread-manager")).toInstance(threadManager);
}
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=893146&r1=893145&r2=893146&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
Tue Dec 22 11:48:02 2009
@@ -132,7 +132,7 @@
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("sockets")).toInstance(socketManager);
-
bind(JamesConnectionManager.class).annotatedWith(Names.named("org.apache.james.socket.JamesConnectionManager")).toInstance(connectionManager);
+
bind(JamesConnectionManager.class).annotatedWith(Names.named("connections")).toInstance(connectionManager);
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);
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=893146&r1=893145&r2=893146&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
Tue Dec 22 11:48:02 2009
@@ -131,7 +131,7 @@
bind(ProtocolServer.class).annotatedWith(Names.named("org.apache.james.socket.api.ProtocolServer")).to(AvalonProtocolServer.class);
bind(SocketManager.class).annotatedWith(Names.named("sockets")).toInstance(socketManager);
-
bind(JamesConnectionManager.class).annotatedWith(Names.named("org.apache.james.socket.JamesConnectionManager")).toInstance(connectionManager);
+
bind(JamesConnectionManager.class).annotatedWith(Names.named("connections")).toInstance(connectionManager);
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/remotemanager-function/src/main/java/org/apache/james/remotemanager/AvalonRemoteManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/AvalonRemoteManager.java?rev=893146&r1=893145&r2=893146&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
Tue Dec 22 11:48:02 2009
@@ -146,7 +146,7 @@
bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger);
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(JamesConnectionManager.class).annotatedWith(Names.named("connections")).toInstance(connectionManager);
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);
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=893146&r1=893145&r2=893146&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
Tue Dec 22 11:48:02 2009
@@ -146,7 +146,7 @@
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("sockets")).toInstance(socketManager);
-
bind(JamesConnectionManager.class).annotatedWith(Names.named("org.apache.james.socket.JamesConnectionManager")).toInstance(connectionManager);
+
bind(JamesConnectionManager.class).annotatedWith(Names.named("connections")).toInstance(connectionManager);
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>() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
