Author: bago
Date: Sat Aug 20 18:15:43 2005
New Revision: 234138
URL: http://svn.apache.org/viewcvs?rev=234138&view=rev
Log:
Reduced the visibility of FetchMail, NNTPServer and POP3Server from UserStore
to the LocalUsersRepository (part #7 of JAMES-412)
Also cleaned unused local variables in FetchMail.
Modified:
james/server/trunk/src/conf/james-assembly.xml
james/server/trunk/src/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo
james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.xinfo
james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java
james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo
Modified: james/server/trunk/src/conf/james-assembly.xml
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/conf/james-assembly.xml?rev=234138&r1=234137&r2=234138&view=diff
==============================================================================
--- james/server/trunk/src/conf/james-assembly.xml (original)
+++ james/server/trunk/src/conf/james-assembly.xml Sat Aug 20 18:15:43 2005
@@ -66,7 +66,7 @@
<!-- POP3 Server -->
<block name="pop3server" class="org.apache.james.pop3server.POP3Server" >
- <provide name="users-store" role="org.apache.james.services.UsersStore"/>
+ <provide name="localusersrepository"
role="org.apache.james.services.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -91,7 +91,7 @@
<!-- NNTP Server -->
<block name="nntpserver" class="org.apache.james.nntpserver.NNTPServer" >
- <provide name="users-store" role="org.apache.james.services.UsersStore"/>
+ <provide name="localusersrepository"
role="org.apache.james.services.UsersRepository"/>
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
@@ -110,7 +110,7 @@
<provide name="scheduler"
role="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"/>
<provide name="James" role="org.apache.james.services.MailServer"/>
- <provide name="users-store" role="org.apache.james.services.UsersStore"/>
+ <provide name="localusersrepository"
role="org.apache.james.services.UsersRepository"/>
</block>
<!-- The High Level Storage block -->
Modified: james/server/trunk/src/java/org/apache/james/fetchmail/FetchMail.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/fetchmail/FetchMail.java?rev=234138&r1=234137&r2=234138&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/fetchmail/FetchMail.java
(original)
+++ james/server/trunk/src/java/org/apache/james/fetchmail/FetchMail.java Sat
Aug 20 18:15:43 2005
@@ -38,7 +38,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
-import org.apache.james.services.UsersStore;
/**
* <p>Class <code>FetchMail</code> is an Avalon task that is periodically
@@ -595,13 +594,9 @@
throw new ServiceException("", errorBuffer.toString());
}
- UsersStore usersStore =
- (UsersStore)
manager.lookup("org.apache.james.services.UsersStore");
- setLocalUsers(usersStore.getRepository("LocalUsers"));
- if (getLocalUsers() == null)
- throw new ServiceException(
- "",
- "The user repository could not be found.");
+ UsersRepository usersRepository =
+ (UsersRepository)
manager.lookup("org.apache.james.services.UsersRepository");
+ setLocalUsers(usersRepository);
}
@@ -678,8 +673,7 @@
*/
protected List getStaticAccounts()
{
- List accounts = null;
- if (null == (accounts = getStaticAccountsBasic()))
+ if (null == getStaticAccountsBasic())
{
updateStaticAccounts();
return getStaticAccounts();
@@ -789,8 +783,7 @@
*/
protected Map getDynamicAccounts() throws ConfigurationException
{
- Map accounts = null;
- if (null == (accounts = getDynamicAccountsBasic()))
+ if (null == getDynamicAccountsBasic())
{
updateDynamicAccounts();
return getDynamicAccounts();
@@ -874,8 +867,7 @@
*/
protected List getParsedDynamicAccountParameters()
{
- List accounts = null;
- if (null == (accounts = getParsedDynamicAccountParametersBasic()))
+ if (null == getParsedDynamicAccountParametersBasic())
{
updateParsedDynamicAccountParameters();
return getParsedDynamicAccountParameters();
Modified:
james/server/trunk/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo?rev=234138&r1=234137&r2=234138&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo
(original)
+++ james/server/trunk/src/java/org/apache/james/fetchmail/FetchScheduler.xinfo
Sat Aug 20 18:15:43 2005
@@ -20,7 +20,7 @@
<service name="org.apache.james.services.MailServer" version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.UsersStore" version="1.0"/>
+ <service name="org.apache.james.services.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service
name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"
version="1.0"/>
Modified:
james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java?rev=234138&r1=234137&r2=234138&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java
(original)
+++ james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.java Sat
Aug 20 18:15:43 2005
@@ -33,13 +33,8 @@
import org.apache.james.core.AbstractJamesService;
import org.apache.james.nntpserver.repository.NNTPRepository;
import org.apache.james.services.UsersRepository;
-import org.apache.james.services.UsersStore;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
-import org.apache.james.util.watchdog.WatchdogTarget;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
/**
* NNTP Server
@@ -89,11 +84,7 @@
public void service( final ServiceManager componentManager )
throws ServiceException {
super.service(componentManager);
- UsersStore usersStore =
(UsersStore)componentManager.lookup(UsersStore.ROLE);
- userRepository = usersStore.getRepository("LocalUsers");
- if (userRepository == null) {
- throw new ServiceException("","The user repository could not be
found.");
- }
+ userRepository =
(UsersRepository)componentManager.lookup(UsersRepository.ROLE);
repo = (NNTPRepository)componentManager
.lookup("org.apache.james.nntpserver.repository.NNTPRepository");
Modified:
james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.xinfo
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.xinfo?rev=234138&r1=234137&r2=234138&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.xinfo
(original)
+++ james/server/trunk/src/java/org/apache/james/nntpserver/NNTPServer.xinfo
Sat Aug 20 18:15:43 2005
@@ -23,7 +23,7 @@
<service name="org.apache.james.nntpserver.repository.NNTPRepository"
version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.james.services.UsersStore" version="1.0"/>
+ <service name="org.apache.james.services.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service
name="org.apache.avalon.cornerstone.services.threads.ThreadManager"
version="1.0"/>
Modified:
james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java?rev=234138&r1=234137&r2=234138&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java
(original)
+++ james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.java Sat
Aug 20 18:15:43 2005
@@ -33,13 +33,9 @@
import org.apache.james.core.AbstractJamesService;
import org.apache.james.services.MailServer;
import org.apache.james.services.UsersRepository;
-import org.apache.james.services.UsersStore;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogFactory;
-import org.apache.james.util.watchdog.WatchdogTarget;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
/**
* <p>Accepts POP3 connections on a server socket and dispatches them to
POP3Handlers.</p>
*
@@ -95,12 +91,8 @@
super.service(componentManager);
mailServer = (MailServer)componentManager.
lookup( "org.apache.james.services.MailServer" );
- UsersStore usersStore = (UsersStore)componentManager.
- lookup( "org.apache.james.services.UsersStore" );
- users = usersStore.getRepository("LocalUsers");
- if (users == null) {
- throw new ServiceException("","The user repository could not be
found.");
- }
+ users = (UsersRepository)componentManager.
+ lookup( "org.apache.james.services.UsersRepository" );
}
/**
Modified:
james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo?rev=234138&r1=234137&r2=234138&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo
(original)
+++ james/server/trunk/src/java/org/apache/james/pop3server/POP3Server.xinfo
Sat Aug 20 18:15:43 2005
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <service name="org.apache.james.services.UsersStore" version="1.0"/>
+ <service name="org.apache.james.services.UsersRepository" version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.james.services.JamesConnectionManager"
version="1.0"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
