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 do...@apache.org on 2001/09/06 15:19:32 UTC
cvs commit: jakarta-james/src/java/org/apache/james/services DNSServer.java MailServer.java MailStore.java UsersRepository.java UsersStore.java
donaldp 01/09/06 06:19:32
Modified: src/java/org/apache/james James.java
src/java/org/apache/james/imapserver Host.java
IMAPSystem.java
src/java/org/apache/james/services DNSServer.java
MailServer.java MailStore.java UsersRepository.java
UsersStore.java
Log:
Use ROLE constants rather than strings.
Revision Changes Path
1.8 +9 -11 jakarta-james/src/java/org/apache/james/James.java
Index: James.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/James.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- James.java 2001/08/11 21:31:18 1.7
+++ James.java 2001/09/06 13:19:32 1.8
@@ -52,8 +52,8 @@
* @author Serge
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * This is $Revision: 1.7 $
- * Committed on $Date: 2001/08/11 21:31:18 $ by: $Author: serge $
+ * This is $Revision: 1.8 $
+ * Committed on $Date: 2001/09/06 13:19:32 $ by: $Author: donaldp $
*/
public class James
extends AbstractLoggable
@@ -119,15 +119,13 @@
// BlockContext that is set up in server.xml
// workerPool = blockContext.getThreadPool( "default" );
try {
- mailstore = (MailStore) compMgr.lookup(
- "org.apache.james.services.MailStore");
+ mailstore = (MailStore) compMgr.lookup( MailStore.ROLE );
} catch (Exception e) {
getLogger().warn("Can't get Store: " + e);
}
getLogger().debug("Using MailStore: " + mailstore.toString());
try {
- usersStore = (UsersStore) compMgr.lookup(
- "org.apache.james.services.UsersStore");
+ usersStore = (UsersStore) compMgr.lookup( UsersStore.ROLE );
} catch (Exception e) {
getLogger().warn("Can't get Store: " + e);
}
@@ -194,7 +192,7 @@
throw e;
}
//}
- compMgr.put("org.apache.james.services.UsersRepository", (Component)localusers);
+ compMgr.put( UsersRepository.ROLE, (Component)localusers);
getLogger().info("Local users repository opened");
// Get storage system
@@ -225,7 +223,7 @@
if (imapSystem instanceof Initializable) {
((Initializable)imapSystem).initialize();
}
- compMgr.put("org.apache.james.imapserver.IMAPSystem", (Component)imapSystem);
+ compMgr.put( IMAPSystem.ROLE, (Component)imapSystem);
getLogger().info("Using SimpleSystem.");
imapHost = (Host) Class.forName(imapHostClass).newInstance();
//imapHost = new JamesHost();
@@ -235,7 +233,7 @@
if (imapHost instanceof Initializable) {
((Initializable)imapHost).initialize();
}
- compMgr.put("org.apache.james.imapserver.Host", (Component)imapHost);
+ compMgr.put( Host.ROLE, (Component)imapHost);
getLogger().info("Using: " + imapHostClass);
} catch (Exception e) {
getLogger().error("Exception in IMAP Storage init: " + e.getMessage());
@@ -255,7 +253,7 @@
getLogger().info("Private Repository LocalInbox opened");
// Add this to comp
- compMgr.put("org.apache.james.services.MailServer", this);
+ compMgr.put( MailServer.ROLE, this);
spool = mailstore.getInboundSpool();
if (DEEP_DEBUG) getLogger().debug("Got spool");
@@ -371,7 +369,7 @@
public Collection getMailServers(String host) {
DNSServer dnsServer = null;
try {
- dnsServer = (DNSServer) compMgr.lookup("org.apache.james.services.DNSServer");
+ dnsServer = (DNSServer) compMgr.lookup( DNSServer.ROLE );
} catch ( final ComponentException cme ) {
getLogger().error("Fatal configuration error - DNS Servers lost!", cme );
throw new RuntimeException("Fatal configuration error - DNS Servers lost!");
1.2 +2 -0 jakarta-james/src/java/org/apache/james/imapserver/Host.java
Index: Host.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/imapserver/Host.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Host.java 2001/05/11 11:01:11 1.1
+++ Host.java 2001/09/06 13:19:32 1.2
@@ -37,6 +37,8 @@
public interface Host
extends Configurable, Composable, Contextualizable, Service {
+ String ROLE = "org.apache.james.imapserver.Host";
+
String IMAP_HOST = "IMAP_HOST";
/**
1.2 +2 -0 jakarta-james/src/java/org/apache/james/imapserver/IMAPSystem.java
Index: IMAPSystem.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/imapserver/IMAPSystem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IMAPSystem.java 2001/05/11 11:03:29 1.1
+++ IMAPSystem.java 2001/09/06 13:19:32 1.2
@@ -28,6 +28,8 @@
public interface IMAPSystem
extends Configurable, Contextualizable, Composable {
+ String ROLE = "org.apache.james.imapserver.IMAPSystem";
+
String IMAP_SYSTEM = "IMAP_SYSTEM";
String PRIVATE = "Private";
String OTHER_USERS = "OtherUsers";
1.2 +2 -0 jakarta-james/src/java/org/apache/james/services/DNSServer.java
Index: DNSServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/DNSServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DNSServer.java 2001/05/11 09:39:34 1.1
+++ DNSServer.java 2001/09/06 13:19:32 1.2
@@ -10,5 +10,7 @@
import java.util.Collection;
public interface DNSServer {
+ String ROLE = "org.apache.james.services.DNSServer";
+
Collection findMXRecords(String hostname);
}
1.3 +4 -2 jakarta-james/src/java/org/apache/james/services/MailServer.java
Index: MailServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/MailServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailServer.java 2001/06/19 16:00:42 1.2
+++ MailServer.java 2001/09/06 13:19:32 1.3
@@ -21,11 +21,13 @@
* @author Federico Barbieri <sc...@pop.systemy.it>
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * This is $Revision: 1.2 $
- * Committed on $Date: 2001/06/19 16:00:42 $ by: $Author: charlesb $
+ * This is $Revision: 1.3 $
+ * Committed on $Date: 2001/09/06 13:19:32 $ by: $Author: donaldp $
*/
public interface MailServer
extends Service {
+
+ String ROLE = "org.apache.james.services.MailServer";
/**
* Reserved user name for the mail delivery agent for multi-user mailboxes
1.3 +5 -2 jakarta-james/src/java/org/apache/james/services/MailStore.java
Index: MailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/MailStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailStore.java 2001/06/21 17:20:28 1.2
+++ MailStore.java 2001/09/06 13:19:32 1.3
@@ -23,11 +23,14 @@
* @author Federico Barbieri <sc...@pop.systemy.it>
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*
- * This is $Revision: 1.2 $
- * Committed on $Date: 2001/06/21 17:20:28 $ by: $Author: charlesb $
+ * This is $Revision: 1.3 $
+ * Committed on $Date: 2001/09/06 13:19:32 $ by: $Author: donaldp $
*/
public interface MailStore
extends Store {
+
+ String ROLE = "org.apache.james.services.MailStore";
+
// MailRepository getInbox(String user);
/**
1.3 +4 -2 jakarta-james/src/java/org/apache/james/services/UsersRepository.java
Index: UsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/UsersRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UsersRepository.java 2001/06/11 09:29:32 1.2
+++ UsersRepository.java 2001/09/06 13:19:32 1.3
@@ -18,10 +18,12 @@
* @author Federico Barbieri <sc...@pop.systemy.it>
* @author Charles Benett <ch...@benett1.demon.co.uk>
*
- * Last changed by: $Author: charlesb $ on $Date: 2001/06/11 09:29:32 $
- * $Revision: 1.2 $
+ * Last changed by: $Author: donaldp $ on $Date: 2001/09/06 13:19:32 $
+ * $Revision: 1.3 $
*/
public interface UsersRepository {
+
+ String ROLE = "org.apache.james.services.UsersRepository";
String USER = "USER";
1.2 +2 -0 jakarta-james/src/java/org/apache/james/services/UsersStore.java
Index: UsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/UsersStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UsersStore.java 2001/05/11 09:39:34 1.1
+++ UsersStore.java 2001/09/06 13:19:32 1.2
@@ -21,5 +21,7 @@
public interface UsersStore
extends Service {
+ String ROLE = "org.apache.james.services.UsersStore";
+
UsersRepository getRepository( String name );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org