Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java Sat Dec 19 19:13:46 2009 @@ -125,7 +125,7 @@ * * @throws IllegalArgumentException when the spool passed in is null */ - @Resource(name="org.apache.james.services.SpoolRepository") + @Resource(name="spoolrepository") public void setSpoolRepository(SpoolRepository spool) { if (spool == null) { throw new IllegalArgumentException("The spool cannot be null"); @@ -138,7 +138,7 @@ * * @param mailetLoader the MailetLoader */ - @Resource(name="org.apache.james.transport.MailetLoader") + @Resource(name="mailetpackages") public void setMailetLoader(MailetLoader mailetLoader) { this.mailetLoader = mailetLoader; } @@ -148,7 +148,7 @@ * * @param matchLoader the MatcherLoader */ - @Resource(name="org.apache.james.transport.MatcherLoader") + @Resource(name="matcherpackages") public void setMatchLoader(MatcherLoader matchLoader) { this.matchLoader = matchLoader; }
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/StateAwareProcessorList.java Sat Dec 19 19:13:46 2009 @@ -83,17 +83,17 @@ this.config = config; } - @Resource(name="org.apache.james.transport.MailetLoader") + @Resource(name="mailetpackages") public final void setMailetLoader(MailetLoader mailetLoader) { this.mailetLoader = mailetLoader; } - @Resource(name="org.apache.james.transport.MatcherLoader") + @Resource(name="matcherpackages") public final void setMatcherLoader(MatcherLoader matcherLoader) { this.matcherLoader = matcherLoader; } - @Resource(name="org.apache.james.services.SpoolRepository") + @Resource(name="spoolrepository") public final void setSpoolRepository(SpoolRepository spoolRepos) { this.spoolRepos = spoolRepos; } @@ -119,9 +119,9 @@ protected void configure() { bind(org.apache.commons.configuration.HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(processorConf); bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(logger); - 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("org.apache.james.services.SpoolRepository")).toInstance(spoolRepos); + bind(MailetLoader.class).annotatedWith(Names.named("mailetpackages")).toInstance(mailetLoader); + bind(MatcherLoader.class).annotatedWith(Names.named("matcherpackages")).toInstance(matcherLoader); + bind(SpoolRepository.class).annotatedWith(Names.named("spoolrepository")).toInstance(spoolRepos); } }).getInstance(cObj); Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java Sat Dec 19 19:13:46 2009 @@ -64,17 +64,17 @@ private MailServer mailServer; - @Resource(name="org.apache.james.api.user.UsersRepository") + @Resource(name="localusersrepository") public void setUsersRepository(UsersRepository usersRepository) { this.usersRepository = usersRepository; } - @Resource(name="org.apache.james.api.user.UsersStore") + @Resource(name="users-store") public void setUsersStore(UsersStore usersStore) { this.usersStore = usersStore; } - @Resource(name="org.apache.james.services.MailServer") + @Resource(name="James") public void setMailServer(MailServer mailServer) { this.mailServer = mailServer; } Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java Sat Dec 19 19:13:46 2009 @@ -113,7 +113,7 @@ private boolean resetReturnPath; - @Resource(name="org.apache.james.services.MailServer") + @Resource(name="James") public void setMailServer(MailServer mailServer) { this.mailServer = mailServer; } Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Sat Dec 19 19:13:46 2009 @@ -67,12 +67,12 @@ return "Local User Aliasing and Forwarding Mailet"; } - @Resource(name="org.apache.james.api.user.UsersRepository") + @Resource(name="localusersrepository") public void setUsersRepository(UsersRepository usersRepository) { this.usersRepository = usersRepository; } - @Resource(name="org.apache.james.api.user.UsersStore") + @Resource(name="users-store") public void setUsersStore(UsersStore usersStore) { this.usersStore = usersStore; } Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/VirtualUserTable.java Sat Dec 19 19:13:46 2009 @@ -59,7 +59,7 @@ * Sets the virtual user table. * @param vut the vut to set */ - @Resource(name="org.apache.james.api.vut.VirtualUserTable") + @Resource(name="defaultvirtualusertable") public final void setVut(org.apache.james.api.vut.VirtualUserTable vut) { this.vut = vut; } @@ -76,7 +76,7 @@ * Sets the virtual table store. * @param vutStore the vutStore to set, possibly null */ - @Resource(name="org.apache.james.api.vut.VirtualUserTableStore") + @Resource(name="virtualusertable-store") public final void setVutStore(VirtualUserTableStore vutStore) { this.vutStore = vutStore; } Modified: james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml (original) +++ james/server/trunk/spring-deployment/src/main/config/james/james-assembly.xml Sat Dec 19 19:13:46 2009 @@ -36,7 +36,7 @@ <!-- --> <!-- The James block --> - <block name="James" class="org.apache.james.James" > + <block name="James" class="org.apache.james.AvalonJames" > <!-- Specify which components will provide the services required by this block. The roles are specified in the code and the .xinfo file. The names @@ -53,40 +53,73 @@ <provide name="scheduler" role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> <provide name="database-connections" - role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" /> + role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" /> + <provide name="defaultvirtualusertable" + role="org.apache.james.api.vut.VirtualUserTable" /> + <proxy disable='true'/> </block> <!-- The James Spool Manager block --> - <block name="spoolmanager" class="org.apache.james.transport.JamesSpoolManager" > + <block name="spoolmanager" class="org.apache.james.transport.AvalonJamesSpoolManager" > <provide name="spoolrepository" role="org.apache.james.services.SpoolRepository"/> <provide name="matcherpackages" role="org.apache.james.transport.MatcherLoader"/> <provide name="mailetpackages" role="org.apache.james.transport.MailetLoader"/> + <proxy disable='true'/> </block> - <block name="matcherpackages" class="org.apache.james.transport.JamesMatcherLoader" > + <block name="matcherpackages" class="org.apache.james.transport.AvalonJamesMatcherLoader" > + <provide name="James" role="org.apache.mailet.MailetContext"/> + <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> + <provide name="James" role="org.apache.james.services.MailServer"/> + <provide name="database-connections" + role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" /> + <provide name="defaultvirtualusertable" + role="org.apache.james.api.vut.VirtualUserTable" /> + <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/> + <provide name="imapserver" role="org.apache.jsieve.mailet.Poster"/> + <provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/> + <provide name="users-store" role="org.apache.james.api.user.UsersStore"/> + <proxy disable='true'/> </block> - <block name="mailetpackages" class="org.apache.james.transport.JamesMailetLoader" > + <block name="mailetpackages" class="org.apache.james.transport.AvalonJamesMailetLoader" > + <provide name="James" role="org.apache.mailet.MailetContext"/> + <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> + <provide name="James" role="org.apache.james.services.MailServer"/> + <provide name="database-connections" + role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" /> + <provide name="defaultvirtualusertable" + role="org.apache.james.api.vut.VirtualUserTable" /> + <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/> + <provide name="imapserver" role="org.apache.jsieve.mailet.Poster"/> + <provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/> + <provide name="users-store" role="org.apache.james.api.user.UsersStore"/> + <proxy disable='true'/> </block> - <block name="dnsserver" class="org.apache.james.dnsserver.DNSServer" /> + <block name="dnsserver" class="org.apache.james.dnsserver.AvalonDNSServer" /> <!-- The Spool Management block --> - <block name="spoolmanagement" class="org.apache.james.management.impl.SpoolManagement" > + <block name="spoolmanagement" class="org.apache.james.management.impl.AvalonSpoolManagement" > <provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/> + <proxy disable='true'/> </block> - <block name="processormanagement" class="org.apache.james.management.impl.ProcessorManagement" > + <block name="processormanagement" class="org.apache.james.management.impl.AvalonProcessorManagement" > <provide name="spoolmanager" role="org.apache.james.services.SpoolManager"/> + <proxy disable='true'/> </block> - <block name="bayesiananalyzermanagement" class="org.apache.james.management.impl.BayesianAnalyzerManagement" > + <block name="bayesiananalyzermanagement" class="org.apache.james.management.impl.AvalonBayesianAnalyzerManagement" > <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" /> <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <proxy disable='true'/> </block> - <block name="remotemanager" class="org.apache.james.remotemanager.RemoteManager" > + <block name="remotemanager" class="org.apache.james.remotemanager.AvalonRemoteManager" > <provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store"/> <provide name="users-store" role="org.apache.james.api.user.UsersStore"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> @@ -105,16 +138,19 @@ <provide name="processormanagement" role="org.apache.james.management.ProcessorManagementService"/> <provide name="virtualusertablemanagement" role="org.apache.james.api.vut.management.VirtualUserTableManagementService"/> <provide name="domainlistmanagement" role="org.apache.james.management.DomainListManagementService"/> + <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <proxy disable='true'/> </block> <!-- The User Management block --> - <block name="usermanagement" class="org.apache.james.impl.user.UserManagement" > + <block name="usermanagement" class="org.apache.james.impl.user.AvalonUserManagement" > <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> <provide name="users-store" role="org.apache.james.api.user.UsersStore"/> + <proxy disable='true'/> </block> <!-- POP3 Server --> - <block name="pop3server" class="org.apache.james.pop3server.POP3Server" > + <block name="pop3server" class="org.apache.james.pop3server.AvalonPOP3Server" > <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> @@ -124,13 +160,16 @@ <provide name="thread-manager" role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> + <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <proxy disable='true'/> </block> <!-- SMTP Server --> - <block name="smtpserver" class="org.apache.james.smtpserver.SMTPServer" > + <block name="smtpserver" class="org.apache.james.smtpserver.AvalonSMTPServer" > <provide name="James" role="org.apache.mailet.MailetContext"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> + <provide name="org.apache.james.smtpserver.protocol.DNSService" role="org.apache.james.smtpserver.protocol.DNSService"/> <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> <provide name="connections" @@ -143,10 +182,35 @@ <provide name="filesystem" role="org.apache.james.services.FileSystem" /> <provide name="defaultvirtualusertable" role="org.apache.james.api.vut.VirtualUserTable" /> + <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/> + <proxy disable='true'/> </block> + + <!-- Async SMTP Server --> + <!-- enable this to use the MINA based SMTP Server which uses NIO --> + <!-- + <block name="smtpserver" class="org.apache.james.smtpserver.mina.AvalonAsyncSMTPServer" > + <provide name="James" role="org.apache.mailet.MailetContext"/> + <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> + <provide name="org.apache.james.smtpserver.protocol.DNSService" role="org.apache.james.smtpserver.protocol.DNSService"/> + <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> + <provide name="James" role="org.apache.james.services.MailServer"/> + <provide name="database-connections" + role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" /> + <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <provide name="defaultvirtualusertable" + role="org.apache.james.api.vut.VirtualUserTable" /> + <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/> + <proxy disable='true'/> + </block> + --> + <block name="org.apache.james.smtpserver.protocol.DNSService" class="org.apache.james.smtpserver.integration.SMTPServerDNSServiceAdapter" > + <proxy disable='true'/> + </block> + <!-- NNTP Server --> - <block name="nntpserver" class="org.apache.james.nntpserver.NNTPServer" > + <block name="nntpserver" class="org.apache.james.nntpserver.AvalonNNTPServer" > <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> @@ -158,20 +222,24 @@ role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="James" role="org.apache.james.services.MailServer"/> + <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <proxy disable='true'/> </block> <!-- NNTP Repository --> - <block name="nntp-repository" class="org.apache.james.nntpserver.repository.NNTPRepositoryImpl"> + <block name="nntp-repository" class="org.apache.james.nntpserver.repository.AvalonNNTPRepository"> <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <proxy disable='true'/> </block> <!-- FetchMail Service --> - <block name="fetchmail" class="org.apache.james.fetchmail.FetchScheduler" > + <block name="fetchmail" class="org.apache.james.fetchmail.AvalonFetchScheduler" > <provide name="scheduler" role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/> <provide name="James" role="org.apache.james.services.MailServer"/> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> + <proxy disable='true'/> </block> <!-- JMS Service @@ -187,12 +255,14 @@ <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" /> <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <proxy disable='true'/> </block> <!-- The main SpoolRepository --> - <block name="spoolrepository" class="org.apache.james.mailrepository.MailStoreSpoolRepository" > + <block name="spoolrepository" class="org.apache.james.mailrepository.AvalonMailStoreSpoolRepository" > <provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store" /> + <proxy disable='true'/> </block> <!-- The User Storage block --> @@ -203,6 +273,7 @@ <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" /> <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <proxy disable='true'/> </block> <!-- This is needed to link the smtpserver to the local user repository --> @@ -210,9 +281,10 @@ <!-- This is needed to support <usernames> configuraion inside James --> <!-- If backward compatibility is not need the LocalUsersRepository implementaion --> <!-- could be safely used --> - <block name="localusersrepository" class="org.apache.james.impl.jamesuser.LocalJamesUsersRepository"> + <block name="localusersrepository" class="org.apache.james.impl.jamesuser.AvalonLocalJamesUsersRepository"> <provide name="users-store" role="org.apache.james.api.user.UsersStore"/> + <proxy disable='true'/> </block> <!-- The context FileSystem implementation --> @@ -220,9 +292,10 @@ </block> <!-- The VirtualUserTable Management block --> - <block name="virtualusertablemanagement" class="org.apache.james.impl.vut.VirtualUserTableManagement" > + <block name="virtualusertablemanagement" class="org.apache.james.impl.vut.AvalonVirtualUserTableManagement" > <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/> <provide name="defaultvirtualusertable" role="org.apache.james.api.vut.management.VirtualUserTableManagement" /> + <proxy disable='true'/> </block> <!-- VirtualUserTable Store --> @@ -231,23 +304,26 @@ role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> + <proxy disable='true'/> </block> - <block name="defaultvirtualusertable" class="org.apache.james.impl.vut.DefaultVirtualUserTable"> + <block name="defaultvirtualusertable" class="org.apache.james.impl.vut.AvalonDefaultVirtualUserTable"> <provide name="virtualusertable-store" role="org.apache.james.api.vut.VirtualUserTableStore"/> + <proxy disable='true'/> </block> <!-- ######################################################################## --> <!-- The context domainlist implementation --> - <block name="domainlist" class="org.apache.james.domain.XMLDomainList"> + <block name="domainlist" class="org.apache.james.domain.AvalonXMLDomainList"> <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> + <proxy disable='true'/> </block> <!-- JDBC implementation of the domainlist service--> <!-- - <block name="domainlist" class="org.apache.james.domain.JDBCDomainList"> + <block name="domainlist" class="org.apache.james.domain.AvalonJDBCDomainList"> <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> @@ -257,7 +333,7 @@ <!-- JDBC VirtualUserTable implementation of the domainlist service --> <!-- - <block name="domainlist" class="org.apache.james.vut.JDBCVirtualUserTable"> + <block name="domainlist" class="org.apache.james.vut.AvalonJDBCVirtualUserTable"> <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> @@ -267,14 +343,14 @@ <!-- XML VirtualUserTable implementation of the domainlist service --> <!-- - <block name="domainlist" class="org.apache.james.vut.XMLVirtualUserTable"> + <block name="domainlist" class="org.apache.james.vut.AvalonXMLVirtualUserTable"> <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> </block> --> <!-- IMAP server --> - <block name="imapserver" class="org.apache.james.imapserver.ImapServer"> + <block name="imapserver" class="org.apache.james.imapserver.AvalonImapServer"> <provide name="localusersrepository" role="org.apache.james.api.user.UsersRepository"/> <provide name="sockets" role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/> @@ -285,13 +361,15 @@ <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <provide name="James" role="org.apache.james.services.MailServer"/> <provide name="filesystem" role="org.apache.james.services.FileSystem" /> + <proxy disable='true'/> </block> <!-- #################################################################### --> - <block name="domainlistmanagement" class="org.apache.james.management.impl.DomainListManagement"> + <block name="domainlistmanagement" class="org.apache.james.management.impl.AvalonDomainListManagement"> <provide name="domainlist" role="org.apache.james.api.domainlist.DomainList"/> + <proxy disable='true'/> </block> <!-- Configuration for Cornerstone Blocks only after here @@ -300,28 +378,37 @@ <!-- The Connection Manager block --> <block name="connections" - class="org.apache.james.socket.SimpleConnectionManager" > + class="org.apache.james.socket.AvalonSimpleConnectionManager" > <provide name="thread-manager" role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> + <proxy disable='true'/> </block> <!-- The Socket Manager block --> <block name="sockets" - class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"/> + class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"> + <proxy disable='true'/> + </block> <!-- The Time Scheduler block --> <block name="scheduler" class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler" > <provide name="thread-manager" role="org.apache.avalon.cornerstone.services.threads.ThreadManager" /> + <proxy disable='true'/> </block> <!-- The DataSourceSelector block --> <block name="database-connections" - class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector" /> + class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector" > + <proxy disable='true'/> + </block> <!-- The ThreadManager block --> <block name="thread-manager" - class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" /> + class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" > + <proxy disable='true'/> + </block> + <listener name="JamesLoader" class="org.apache.james.phoenix.PhoenixLoader"/> </assembly> Modified: james/server/trunk/spring-deployment/src/main/config/james/james-config.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-config.xml?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spring-deployment/src/main/config/james/james-config.xml (original) +++ james/server/trunk/spring-deployment/src/main/config/james/james-config.xml Sat Dec 19 19:13:46 2009 @@ -41,7 +41,7 @@ <!-- For production use you will probably need to make more extensive changes, see --> <!-- http://james.apache.org/server/2.3.0/ --> -<!-- $Revision: 724137 $ Committed on $Date: 2008-12-07 14:40:42 +0000 (Sun, 07 Dec 2008) $ by: $Author: rdonkin $ --> +<!-- $Revision: 885240 $ Committed on $Date: 2009-11-29 16:15:13 +0100 (So, 29 Nov 2009) $ by: $Author: norman $ --> <config> <James> @@ -344,10 +344,6 @@ </mapping> </mailet> --> - - <!-- Deliver To IMAP mailboxes, applying a Sieve script if the user has one - <mailet match="All" class="SieveMailet"/> - --> <!-- Anti-spam processing --> <!-- The following two entries avoid double anti-spam analysis --> @@ -544,6 +540,16 @@ </mailet> --> + + <mailet match="All" class="VirtualUserTable"> + <virtualusertable>DefaultVirtualUserTable</virtualusertable> + </mailet> + + + <!-- Deliver To IMAP mailboxes, applying a Sieve script if the user has one + <mailet match="All" class="SieveMailet"/> + --> + <!-- Is the recipient is for a local account, deliver it locally --> <mailet match="RecipientIsLocal" class="LocalDelivery"/> @@ -891,6 +897,11 @@ <!-- <prompt>james></prompt> --> + <handlerchain> + <!-- This loads the core CommandHandlers. Only remove this if you really --> + <!-- know what you are doing --> + <handler class="org.apache.james.remotemanager.core.CoreCmdHandlerLoader"/> + </handlerchain> </handler> </remotemanager> @@ -918,6 +929,19 @@ For example, Uncomment this if you want to use BouncyCastle JCE (http://www.bouncycastle.org) <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> --> + + <!-- Set enable to true to support STARTTLS. + To use this you need to copy sunjce_provider.jar to /path/james/lib directory. + --> + <startTLS enable="false"> + <!-- To create a new keystore execute: + keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore + --> + <keystore>file://conf/keystore</keystore> + <secret>yoursecret</secret> + <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> + </startTLS> + <handler> <!-- This is the name used by the server to identify itself in the POP3 --> <!-- protocol. If autodetect is TRUE, the server will discover its --> @@ -928,6 +952,12 @@ <helloName autodetect="true">myMailServer</helloName> --> <connectiontimeout>120000</connectiontimeout> + + <handlerchain> + <!-- This loads the core CommandHandlers. Only remove this if you really --> + <!-- know what you are doing --> + <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/> + </handlerchain> </handler> </pop3server> @@ -935,7 +965,10 @@ <!-- Disabling blocks will stop them from listening, --> <!-- but does not free as many resources as removing them would --> <smtpserver enabled="true"> - <!-- port 25 is the well-known/IANA registered port for SMTP --> + <!-- + Port 25 is the well-known/IANA registered port for SMTP. + Port 465 is the well-known/IANA registered port for SMTP over TLS. + --> <port>25</port> <!-- Uncomment this if you want to bind to a specific inetaddress --> @@ -944,19 +977,37 @@ <!-- <bind> </bind> --> - <!-- JAMES TLS uses JSSE. This means that for many Sun JVMs, + <!-- + JAMES TLS uses JSSE. This means that for many Sun JVMs, the sunjce_provider.jar must be copied from $JAVA_HOME/lib/ext into $JAMES_HOME/lib. It may also be necessary to download and - install unlimited strength policies. --> + install unlimited strength policies. + + The standard port for SMTP over TLS is 465. + --> <!-- <useTLS>true</useTLS> --> + <!-- Use provider elements to specify additional JCE providers. The jars should be put into $JAMES_HOME/lib. For example, Uncomment this if you want to use BouncyCastle JCE (http://www.bouncycastle.org) <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> --> + <!-- Set enable to true to support STARTTLS. + To use this you need to copy sunjce_provider.jar to /path/james/lib directory. + --> + <startTLS enable="false"> + + <!-- To create a new keystore execute: + keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore + --> + <keystore>file://conf/keystore</keystore> + <secret>yoursecret</secret> + <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> + </startTLS> + <handler> <!-- This is the name used by the server to identify itself in the SMTP --> <!-- protocol. If autodetect is TRUE, the server will discover its --> @@ -1160,7 +1211,7 @@ <newsgroup>org.apache.avalon.user</newsgroup> </newsgroups> - <spool> + <spool class="org.apache.james.nntpserver.repository.NNTPSpooler"> <configuration> <spoolPath>file://var/nntp/spool</spoolPath> <!-- The number of threads that process spooler related tasks. --> @@ -1192,20 +1243,9 @@ <!-- The Mailstore block --> <mailstore> <repositories> - <repository class="org.apache.james.mailboxmanager.repository.MailboxManagerMailRepository"> - <protocols> - <protocol>mailboxmanager</protocol> - </protocols> - <types> - <type>MAIL</type> - </types> - <config> - <sqlFile>file://conf/mailboxManagerSqlResources.xml</sqlFile> - </config> - </repository> <!-- File based repositories. These repositories store all message data --> <!-- in the file system. --> - <repository class="org.apache.james.mailrepository.AvalonMailRepository"> + <repository class="org.apache.james.mailrepository.FileMailRepository"> <protocols> <protocol>file</protocol> </protocols> @@ -1215,7 +1255,7 @@ <!-- Set if the messages should be listed sorted. False by default --> <config FIFO="false"/> </repository> - <repository class="org.apache.james.mailrepository.AvalonSpoolRepository"> + <repository class="org.apache.james.mailrepository.FileSpoolRepository"> <protocols> <protocol>file</protocol> </protocols> @@ -1636,5 +1676,4 @@ <min-spare-threads>20</min-spare-threads> </thread-group> </thread-manager> - </config> Modified: james/server/trunk/spring-deployment/src/main/config/james/james-jms.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-jms.xml?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spring-deployment/src/main/config/james/james-jms.xml (original) +++ james/server/trunk/spring-deployment/src/main/config/james/james-jms.xml Sat Dec 19 19:13:46 2009 @@ -24,6 +24,7 @@ 1. This service is EXPERIMENTAL! 2. Before enabling, uncomment jms in assembly.xml and environment.xml. + 3. Additionally, uncomment &jmsConfig; in config.xml --> <jms enabled="true"> Modified: james/server/trunk/spring-deployment/src/main/config/james/james-smtphandlerchain.xml URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-smtphandlerchain.xml?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/spring-deployment/src/main/config/james/james-smtphandlerchain.xml (original) +++ james/server/trunk/spring-deployment/src/main/config/james/james-smtphandlerchain.xml Sat Dec 19 19:13:46 2009 @@ -56,7 +56,7 @@ please speak with your local system/network admins. --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler"> + <handler class="org.apache.james.smtpserver.protocol.core.fastfail.DNSRBLHandler"> <getDetail> false </getDetail> <rblservers> <whitelist> query.bondedsender.org. </whitelist> @@ -72,7 +72,7 @@ <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that --> <!-- are allowed to relay. Default is false. --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.SPFHandler"> + <handler class="org.apache.james.smtpserver.integration.JamesSPFHandler"> <checkAuthNetworks> false </checkAuthNetworks> <blockSoftFail> false </blockSoftFail> <blockPermError> true </blockPermError> @@ -86,7 +86,7 @@ <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that --> <!-- are allowed to relay. Default is false. --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.ResolvableEhloHeloHandler"> + <handler class="org.apache.james.smtpserver.protocol.core.fastfail.ResolvableEhloHeloHandler"> <checkAuthNetworks> false </checkAuthNetworks> <checkAuthUsers> false </checkAuthUsers> </handler> @@ -96,7 +96,7 @@ <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that --> <!-- are allowed to relay. Default is false. --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.ReverseEqualsEhloHeloHandler"> + <handler class="org.apache.james.smtpserver.protocol.core.fastfail.ReverseEqualsEhloHeloHandler"> <checkAuthClients> false </checkAuthClients> <checkAuthUsers> false </checkAuthUsers> </handler> @@ -107,7 +107,7 @@ <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that --> <!-- are allowed to relay. Default is false. --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.ValidSenderDomainHandler"> + <handler class="org.apache.james.smtpserver.protocol.core.fastfail.ValidSenderDomainHandler"> <checkAuthClients> false </checkAuthClients> <checkAuthUsers> false </checkAuthUsers> </handler> @@ -118,7 +118,7 @@ <!-- You need to add the recipient to the validRecipient list if you want --> <!-- to accept email for a recipient which not exist on the server --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.ValidRcptHandler"> + <handler class="org.apache.james.smtpserver.integration.ValidRcptHandler"> <validRecipients> </validRecipients> <validDomains> </validDomains> <validRegexPattern> </validRegexPattern> @@ -127,7 +127,7 @@ <!-- If activated you can limit the maximal recipients --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.MaxRcptHandler"> + <handler class="org.apache.james.smtpserver.protocol.core.fastfail.MaxRcptHandler"> <maxRcpt> 10 </maxRcpt> </handler> --> @@ -135,7 +135,7 @@ <!-- If uncomment this block you can enable greylisting. For more infos--> <!-- how greylisting work see: http://projects.puremagic.com/greylisting/whitepaper.html --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.GreylistHandler"> + <handler class="org.apache.james.smtpserver.integration.JDBCGreylistHandler"> <repositoryPath> db://maildb </repositoryPath> <sqlFile>file://conf/sqlResources.xml</sqlFile> <tempBlockTime> 1 hour </tempBlockTime> @@ -150,7 +150,7 @@ <!-- Default is set to 0 (disabled). --> <!-- You can also configure the time to sleep in milliseconds --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.TarpitHandler"> + <handler class="org.apache.james.smtpserver.protocol.core.fastfail.TarpitHandler"> <tarpitRcptCount> 5 </tarpitRcptCount> <tarpitSleepTime> 5000 </tarpitSleepTime> </handler> @@ -159,11 +159,11 @@ <!-- This handler ignore duplicated recipients per session. So the email will get only send on time even --> <!-- if the recipient is specified more then once --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.SuppressDuplicateRcptHandler"/> + <handler class="org.apache.james.smtpserver.protocol.core.fastfail.SuppressDuplicateRcptHandler"/> --> <!-- Load the core command handlers --> - <handler class="org.apache.james.smtpserver.core.CoreCmdHandlerLoader"/> + <handler class="org.apache.james.smtpserver.integration.CoreCmdHandlerLoader"/> <!-- The message handler configuration --> @@ -171,7 +171,7 @@ <!-- accept the email. So its possible to reject a message on smtplevel if a --> <!-- configured hits amount is reached. --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.SpamAssassinHandler"> + <handler class="org.apache.james.smtpserver.integration.SpamAssassinHandler"> <spamdHost> 127.0.0.1 </spamdHost> <spamdPort> 783 </spamdPort> <spamdRejectionHits> 10 </spamdRejectionHits> @@ -183,7 +183,7 @@ <!-- this domains against uriRbllists. See http://www.surbl.org for more informations. --> <!-- The message get rejected if a domain matched . --> <!-- - <handler class="org.apache.james.smtpserver.core.filter.fastfail.URIRBLHandler"> + <handler class="org.apache.james.smtpserver.integration.URIRBLHandler"> <action> reject </action> <getDetail> true </getDetail> <checkAuthNetworks> false </checkAuthNetworks> @@ -194,7 +194,7 @@ --> <!-- - <handler class="org.apache.james.smtpserver.core.SetMimeHeaderHandler"> + <handler class="org.apache.james.smtpserver.integration.SetMimeHeaderHandler"> <headername>SPF-test</headername> <headervalue>passed</headervalue> </handler> @@ -203,5 +203,5 @@ <!-- The default message receiving handler --> <!-- The default behaviour is to put the message in the root processor of --> <!-- the spooler --> - <handler class="org.apache.james.smtpserver.core.SendMailHandler"></handler> + <handler class="org.apache.james.smtpserver.integration.SendMailHandler"></handler> </handlerchain> Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonLocalUsersRepository.java Sat Dec 19 19:13:46 2009 @@ -51,7 +51,7 @@ @Override protected void configure() { - bind(UsersStore.class).annotatedWith(Names.named("org.apache.james.api.user.UsersStore")).toInstance(usersStore); + bind(UsersStore.class).annotatedWith(Names.named("users-store")).toInstance(usersStore); } } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/AvalonUserManagement.java Sat Dec 19 19:13:46 2009 @@ -106,8 +106,8 @@ @Override protected void configure() { - bind(UsersStore.class).annotatedWith(Names.named("org.apache.james.api.user.UsersStore")).toInstance(store); - bind(UsersRepository.class).annotatedWith(Names.named("org.apache.james.api.user.UsersRepository")).toInstance(repos); + bind(UsersStore.class).annotatedWith(Names.named("users-store")).toInstance(store); + bind(UsersRepository.class).annotatedWith(Names.named("localusersrepository")).toInstance(repos); } } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/LocalUsersRepository.java Sat Dec 19 19:13:46 2009 @@ -36,7 +36,7 @@ private UsersStore usersStore; protected UsersRepository users; - @Resource(name="org.apache.james.api.user.UsersStore") + @Resource(name="users-store") public void setUsersStore(UsersStore usersStore) { this.usersStore = usersStore; } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/user/UserManagement.java Sat Dec 19 19:13:46 2009 @@ -46,12 +46,12 @@ private UsersRepository localUsers; private UsersStore usersStore; - @Resource(name="org.apache.james.api.user.UsersRepository") + @Resource(name="localusersrepository") public void setUsersRepository(UsersRepository localUsers) { this.localUsers = localUsers; } - @Resource(name="org.apache.james.api.user.UsersStore") + @Resource(name="users-store") public void setUsersStore(UsersStore usersStore) { this.usersStore = usersStore; } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractAvalonVirtualUserTable.java Sat Dec 19 19:13:46 2009 @@ -146,7 +146,7 @@ @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(HierarchicalConfiguration.class).annotatedWith(Names.named("org.apache.commons.configuration.Configuration")).toInstance(config); bind(Log.class).annotatedWith(Names.named("org.apache.commons.logging.Log")).toInstance(log); } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AbstractVirtualUserTable.java Sat Dec 19 19:13:46 2009 @@ -64,7 +64,7 @@ private HierarchicalConfiguration config; private Log logger; - @Resource(name="org.apache.james.api.dnsservice.DNSService") + @Resource(name="dnsserver") public void setDNSService(DNSService dns) { this.dns = dns; } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonDefaultVirtualUserTable.java Sat Dec 19 19:13:46 2009 @@ -107,7 +107,7 @@ @Override protected void configure() { - bind(VirtualUserTableStore.class).annotatedWith(Names.named("org.apache.james.api.vut.VirtualUserTableStore")).toInstance(store); + bind(VirtualUserTableStore.class).annotatedWith(Names.named("virtualusertable-store")).toInstance(store); } } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonVirtualUserTableManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonVirtualUserTableManagement.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonVirtualUserTableManagement.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/AvalonVirtualUserTableManagement.java Sat Dec 19 19:13:46 2009 @@ -102,8 +102,8 @@ @Override protected void configure() { - bind(VirtualUserTableStore.class).annotatedWith(Names.named("org.apache.james.api.vut.VirtualUserTableStore")).toInstance(store); - bind(org.apache.james.api.vut.management.VirtualUserTableManagement.class).annotatedWith(Names.named("org.apache.james.api.vut.management.VirtualUserTableManagement")).toInstance(vManage); + bind(VirtualUserTableStore.class).annotatedWith(Names.named("virtualusertable-store")).toInstance(store); + bind(org.apache.james.api.vut.management.VirtualUserTableManagement.class).annotatedWith(Names.named("virtualusertablemanagement")).toInstance(vManage); } } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/DefaultVirtualUserTable.java Sat Dec 19 19:13:46 2009 @@ -41,7 +41,7 @@ VirtualUserTableStore store = null; - @Resource(name="org.apache.james.api.vut.VirtualUserTableStore") + @Resource(name="virtualusertable-store") public void setVirtualUserTableStore(VirtualUserTableStore store) { this.store = store; } Modified: james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java?rev=892500&r1=892499&r2=892500&view=diff ============================================================================== --- james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java (original) +++ james/server/trunk/user-library/src/main/java/org/apache/james/impl/vut/VirtualUserTableManagement.java Sat Dec 19 19:13:46 2009 @@ -43,12 +43,12 @@ private VirtualUserTableStore store; private org.apache.james.api.vut.management.VirtualUserTableManagement defaultVUT; - @Resource(name="org.apache.james.api.vut.VirtualUserTableStore") + @Resource(name="virtualusertable-store") public void setVirtualUserTableStore(VirtualUserTableStore store) { this.store = store; } - @Resource(name="org.apache.james.api.vut.management.VirtualUserTableManagement") + @Resource(name="virtualusertablemanagement") public void setVirtualUserTableManagement(org.apache.james.api.vut.management.VirtualUserTableManagement defaultVUT) { this.defaultVUT = defaultVUT; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
