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 2010/12/17 09:49:58 UTC
svn commit: r1050318 - in /james/server/trunk:
container-spring/src/main/config/james/context/
fetchmail/src/main/java/org/apache/james/fetchmail/
lmtpserver/src/main/java/org/apache/james/lmtpserver/
mailbox-adapter/src/main/java/org/apache/james/adap...
Author: norman
Date: Fri Dec 17 08:49:57 2010
New Revision: 1050318
URL: http://svn.apache.org/viewvc?rev=1050318&view=rev
Log:
Replace @Resource(name="localusersrepository") with @Resource(name="usersrepository") to make it more consistent across the project
Removed:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/package.html
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java
Modified: james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/context/james-mailbox-maildir-context.xml Fri Dec 17 08:49:57 2010
@@ -41,7 +41,7 @@
</bean>
<bean id="maildirStore" name="maildir-uidProvider" class="org.apache.james.adapter.mailbox.maildir.MaildirStoreUtil" factory-method="create">
<constructor-arg index="0" ref="filesystem"/>
- <constructor-arg index="1" ref="localusersrepository"/>
+ <constructor-arg index="1" ref="usersrepository"/>
<constructor-arg index="2" value="file://var/store/maildir/"/>
</bean>
Modified: james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml Fri Dec 17 08:49:57 2010
@@ -224,7 +224,8 @@
<key>
<value>usersrepository</value>
</key>
- <value>localusersrepository</value>
+ <!-- no alias needed -->
+ <value></value>
</entry>
<entry>
<key>
Modified: james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java (original)
+++ james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java Fri Dec 17 08:49:57 2010
@@ -96,7 +96,7 @@ public class FetchScheduler implements F
}
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository urepos) {
this.urepos = urepos;
}
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java Fri Dec 17 08:49:57 2010
@@ -56,7 +56,7 @@ public class DataLineLMTPMessageHookHand
private UsersRepository users;
private MailboxManager mailboxManager;
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public final void setUsersRepository(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java (original)
+++ james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java Fri Dec 17 08:49:57 2010
@@ -32,7 +32,7 @@ public class UserRepositoryAuthenticator
private UsersRepository repos;
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository repos) {
this.repos = repos;
}
Modified: james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java (original)
+++ james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailetContext.java Fri Dec 17 08:49:57 2010
@@ -87,7 +87,7 @@ public class JamesMailetContext implemen
this.dns = dns;
}
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public void setUsersRepository(UsersRepository localusers) {
this.localusers = localusers;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java Fri Dec 17 08:49:57 2010
@@ -61,7 +61,7 @@ public class LocalDelivery extends Gener
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository usersRepository) {
this.usersRepository = usersRepository;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java Fri Dec 17 08:49:57 2010
@@ -47,7 +47,7 @@ public class SieveMailet extends SieveMa
private UsersRepository usersRepos;
private MailboxManager mailboxManager;
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository usersRepos) {
this.usersRepos = usersRepos;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Fri Dec 17 08:49:57 2010
@@ -67,7 +67,7 @@ public class UsersRepositoryAliasingForw
return "Local User Aliasing and Forwarding Mailet";
}
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository usersRepository) {
this.usersRepository = usersRepository;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java Fri Dec 17 08:49:57 2010
@@ -163,7 +163,7 @@ public class WhiteListManager extends Ge
this.datasource = datasource;
}
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository localusers) {
this.localusers = localusers;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java Fri Dec 17 08:49:57 2010
@@ -73,7 +73,7 @@ public abstract class AbstractSQLWhiteli
this.datasource = datasource;
}
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository localusers) {
this.localusers = localusers;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java Fri Dec 17 08:49:57 2010
@@ -63,7 +63,7 @@ abstract public class AbstractStorageQuo
this.manager = manager;
}
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository localusers) {
this.localusers = localusers;
}
Modified: james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java (original)
+++ james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/AbstractAsyncPOP3ServerTest.java Fri Dec 17 08:49:57 2010
@@ -98,7 +98,7 @@ public abstract class AbstractAsyncPOP3S
protected void setUpServiceManager() throws Exception {
serviceManager = new MockJSR250Loader();
- serviceManager.put("localusersrepository",
+ serviceManager.put("usersrepository",
m_usersRepository);
InMemoryMailboxSessionMapperFactory factory = new InMemoryMailboxSessionMapperFactory();
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -58,7 +58,7 @@ public class AddUserCmdHandler implement
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -50,7 +50,7 @@ public class DelUserCmdHandler implement
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -47,7 +47,7 @@ public class ListUsersCmdHandler impleme
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -52,7 +52,7 @@ public class SetPasswordCmdHandler imple
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -52,7 +52,7 @@ public class ShowAliasCmdHandler impleme
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -53,7 +53,7 @@ public class ShowForwardingCmdHandler im
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -49,7 +49,7 @@ public class UnsetAliasCmdHandler implem
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -50,7 +50,7 @@ public class UnsetForwardingCmdHandler i
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java Fri Dec 17 08:49:57 2010
@@ -47,7 +47,7 @@ public class VerifyCmdHandler implements
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Fri Dec 17 08:49:57 2010
@@ -161,7 +161,7 @@ public abstract class AbstractRemoteMana
serviceManager = new MockJSR250Loader();
m_mockUsersRepository = new MockUsersRepository();
- serviceManager.put("localusersrepository", m_mockUsersRepository);
+ serviceManager.put("usersrepository", m_mockUsersRepository);
filesystem = new MockFileSystem();
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java Fri Dec 17 08:49:57 2010
@@ -37,7 +37,7 @@ public class SenderAuthIdentifyVerificat
private DomainList domains;
private UsersRepository users;
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public final void setUsersRepository(UsersRepository users) {
this.users = users;
}
@@ -67,7 +67,10 @@ public class SenderAuthIdentifyVerificat
return domains.containsDomain(domain);
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook#useVirtualHosting()
+ */
protected boolean useVirtualHosting() {
return users.supportVirtualHosting();
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java Fri Dec 17 08:49:57 2010
@@ -45,7 +45,7 @@ public class UsersRepositoryAuthHook imp
* Sets the users repository.
* @param users the users to set
*/
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Fri Dec 17 08:49:57 2010
@@ -63,7 +63,7 @@ public class ValidRcptHandler extends Ab
* @param users
* the users to set
*/
- @Resource(name = "localusersrepository")
+ @Resource(name = "usersrepository")
public final void setUsers(UsersRepository users) {
this.users = users;
}
Modified: james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/AbstractSMTPServerTest.java Fri Dec 17 08:49:57 2010
@@ -212,7 +212,7 @@ public abstract class AbstractSMTPServer
protected void setUpFakeLoader() throws Exception {
m_serviceManager = new MockJSR250Loader();
- m_serviceManager.put("localusersrepository", m_usersRepository);
+ m_serviceManager.put("usersrepository", m_usersRepository);
m_dnsServer = new AlterableDNSServer();
m_serviceManager.put("dnsservice", m_dnsServer);
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java?rev=1050318&r1=1050317&r2=1050318&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java Fri Dec 17 08:49:57 2010
@@ -42,7 +42,7 @@ public class UserManagement extends Stan
*/
private UsersRepository localUsers;
- @Resource(name="localusersrepository")
+ @Resource(name="usersrepository")
public void setUsersRepository(UsersRepository localUsers) {
this.localUsers = localUsers;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org