You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2009/10/22 18:00:22 UTC
svn commit: r828763 - in /james/server/trunk/smtpserver-function/src:
main/java/org/apache/james/smtpserver/integration/
main/java/org/apache/james/smtpserver/mina/
test/java/org/apache/james/smtpserver/
Author: norman
Date: Thu Oct 22 16:00:21 2009
New Revision: 828763
URL: http://svn.apache.org/viewvc?rev=828763&view=rev
Log:
Use full class names as Resource name
add last missing dependencies to bindings
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JDBCGreylistHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/URIRBLHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/ValidRcptHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -38,7 +38,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="org.apache.james.services.MailServer")
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -88,7 +88,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="org.apache.james.services.MailServer")
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -130,7 +130,7 @@
* @param datasources
* The datasources
*/
- @Resource(name="database-connections")
+ @Resource(name="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector")
public void setDataSources(DataSourceSelector datasources) {
this.datasources = datasources;
}
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -56,7 +56,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="org.apache.james.services.MailServer")
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -39,7 +39,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="org.apache.james.services.MailServer")
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -42,7 +42,7 @@
* @param mailServer
* the mailServer to set
*/
- @Resource(name = "James")
+ @Resource(name = "org.apache.james.services.MailServer")
public final void setMailServer(MailServer mailServer) {
this.mailServer = mailServer;
}
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -53,7 +53,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="org.apache.james.services.MailServer")
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -42,7 +42,7 @@
* Sets the mail server.
* @param mailServer the mailServer to set
*/
- @Resource(name="James")
+ @Resource(name="org.apache.james.services.MailServer")
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -93,7 +93,7 @@
* Sets the DNS service.
* @param dnsService the dnsService to set
*/
- @Resource(name="dnsserver")
+ @Resource(name="org.apache.james.api.dnsservice.DNSService")
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -45,7 +45,7 @@
* Sets the users repository.
* @param users the users to set
*/
- @Resource(name="localusersrepository")
+ @Resource(name="org.apache.james.api.user.UsersRepository")
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -76,7 +76,7 @@
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "org.apache.james.api.user.UsersRepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
@@ -96,7 +96,7 @@
* @param tableStore
* the tableStore to set
*/
- @Resource(name = "virtualusertable-store")
+ @Resource(name = "org.apache.james.api.vut.VirtualUserTableStore")
public final void setTableStore(VirtualUserTableStore tableStore) {
this.tableStore = tableStore;
loadTable();
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=828763&r1=828762&r2=828763&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 Thu Oct 22 16:00:21 2009
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.james.smtpserver.mina;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -32,6 +33,7 @@
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.socket.configuration.JamesConfiguration;
@@ -60,6 +62,8 @@
private org.apache.commons.configuration.HierarchicalConfiguration config;
private Injector injector;
private UsersRepository userRepos;
+ private DataSourceSelector dselector;
+ private VirtualUserTableStore vutStore;
/**
* @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
@@ -81,6 +85,8 @@
context = (MailetContext) manager.lookup("org.apache.mailet.MailetContext");
filesystem = (FileSystem) manager.lookup(FileSystem.ROLE);
userRepos = (UsersRepository) manager.lookup(UsersRepository.ROLE);
+ dselector = (DataSourceSelector) manager.lookup(DataSourceSelector.ROLE);
+ vutStore = (VirtualUserTableStore) manager.lookup(VirtualUserTableStore.ROLE);
}
/**
@@ -114,7 +120,9 @@
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);
+
// 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>() {
@@ -149,7 +157,10 @@
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);
+
}
}
}
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java?rev=828763&r1=828762&r2=828763&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java Thu Oct 22 16:00:21 2009
@@ -19,11 +19,15 @@
package org.apache.james.smtpserver;
+import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.kernel.mock.FakeLoader;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.api.vut.VirtualUserTableStore;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.mina.AvalonAsyncSMTPServer;
@@ -44,7 +48,6 @@
ContainerUtil.enableLogging(m_smtpServer,new MockLogger());
m_serviceManager = setUpServiceManager();
ContainerUtil.service(m_smtpServer, m_serviceManager);
- //m_smtpServer.setLoader(m_serviceManager);
m_testConfiguration = new SMTPTestConfiguration(m_smtpListenerPort);
}
@@ -60,16 +63,14 @@
m_serviceManager.put(MailetContext.class.getName(), new FakeMailContext());
m_mailServer = new MockMailServer(new MockUsersRepository());
m_serviceManager.put(MailServer.ROLE, m_mailServer);
- // Phoenix loader does not understand aliases
- m_serviceManager.put("James", m_mailServer);
- m_serviceManager.put("localusersrepository", m_usersRepository);
m_serviceManager.put(UsersRepository.ROLE, m_usersRepository);
m_dnsServer = new AlterableDNSServer();
m_serviceManager.put(DNSService.ROLE, m_dnsServer);
- m_serviceManager.put("dnsserver", m_dnsServer);
m_serviceManager.put(Store.ROLE, new MockStore());
m_serviceManager.put(FileSystem.ROLE, new MockFileSystem());
-
+ m_serviceManager.put(VirtualUserTableStore.ROLE, new DummyVirtualUserTableStore());
+ m_serviceManager.put(DataSourceSelector.ROLE, new DummyDataSourceSelector());
+
return m_serviceManager;
}
@@ -78,5 +79,33 @@
// TODO try to understand and fix it.
}
+ private class DummyVirtualUserTableStore implements VirtualUserTableStore {
+
+ public VirtualUserTable getTable(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ }
+
+ private class DummyDataSourceSelector implements DataSourceSelector {
+
+ public boolean isSelectable(Object arg0) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void release(Object arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Object select(Object arg0) throws ServiceException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org