Index: src/java/org/apache/james/BaseConnectionHandler.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/BaseConnectionHandler.java,v retrieving revision 1.6 diff -u -r1.6 BaseConnectionHandler.java --- src/java/org/apache/james/BaseConnectionHandler.java 18 Jan 2002 02:48:35 -0000 1.6 +++ src/java/org/apache/james/BaseConnectionHandler.java 27 Feb 2002 04:52:21 -0000 @@ -36,18 +36,13 @@ } catch (UnknownHostException ue) { hostName = "localhost"; } - + Configuration helloConf = configuration.getChild("helloName"); - String autodetect = null; - try { - autodetect = helloConf.getAttribute("autodetect"); - } catch(ConfigurationException ex) { - autodetect = "TRUE"; - } - if ("TRUE".equals(autodetect)) + boolean autodetect = helloConf.getAttributeAsBoolean("autodetect", true); + if (autodetect) helloName = hostName; else helloName = helloConf.getValue("localhost"); getLogger().info("Hello Name is: " + helloName); } -} +} \ No newline at end of file Index: src/java/org/apache/james/James.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/James.java,v retrieving revision 1.18 diff -u -r1.18 James.java --- src/java/org/apache/james/James.java 4 Feb 2002 15:34:11 -0000 1.18 +++ src/java/org/apache/james/James.java 27 Feb 2002 04:52:22 -0000 @@ -144,7 +144,7 @@ // Get the domains and hosts served by this instance serverNames = new Vector(); Configuration serverConf = conf.getChild("servernames"); - if (serverConf.getAttribute("autodetect").equals("TRUE") && (!hostName.equals("localhost"))) { + if (serverConf.getAttributeAsBoolean("autodetect") && (!hostName.equals("localhost"))) { serverNames.add(hostName.toLowerCase()); } @@ -169,21 +169,9 @@ context.put( Constants.POSTMASTER, postmaster ); Configuration userNamesConf = conf.getChild("usernames"); - if (userNamesConf.getAttribute("ignoreCase").equals("TRUE")) { - ignoreCase = true; - } else { - ignoreCase = false; - } - if (userNamesConf.getAttribute("enableAliases").equals("TRUE")) { - enableAliases = true; - } else { - enableAliases = false; - } - if (userNamesConf.getAttribute("enableForwarding").equals("TRUE")) { - enableForwarding = true; - } else { - enableForwarding = false; - } + ignoreCase = userNamesConf.getAttributeAsBoolean("ignoreCase", false); + enableAliases = userNamesConf.getAttributeAsBoolean("enableAliases", false); + enableForwarding = userNamesConf.getAttributeAsBoolean("enableForwarding", false); //Get localusers try { Index: src/java/org/apache/james/nntpserver/NNTPServer.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPServer.java,v retrieving revision 1.4 diff -u -r1.4 NNTPServer.java --- src/java/org/apache/james/nntpserver/NNTPServer.java 18 Jan 2002 02:48:36 -0000 1.4 +++ src/java/org/apache/james/nntpserver/NNTPServer.java 27 Feb 2002 04:52:22 -0000 @@ -41,9 +41,11 @@ throw new ConfigurationException( "Malformed bind parameter", unhe ); } - final String useTLS = configuration.getChild("useTLS").getValue( "" ); - if( useTLS.equals( "TRUE" ) ) + final boolean useTLS = configuration.getChild("userTLS").getValueAsBoolean( false ); + if ( useTLS ) + { m_serverSocketType = "ssl"; + } super.configure( configuration.getChild( "handler" ) ); getLogger().info("configured NNTPServer to run at : "+m_port); Index: src/java/org/apache/james/pop3server/POP3Server.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Server.java,v retrieving revision 1.2 diff -u -r1.2 POP3Server.java --- src/java/org/apache/james/pop3server/POP3Server.java 18 Jan 2002 02:48:37 -0000 1.2 +++ src/java/org/apache/james/pop3server/POP3Server.java 27 Feb 2002 04:52:22 -0000 @@ -20,7 +20,7 @@ * @version 1.0.0, 24/04/1999 * @author Federico Barbieri */ -public class POP3Server +public class POP3Server extends AbstractService { protected ConnectionHandlerFactory createFactory() @@ -33,21 +33,23 @@ m_port = configuration.getChild( "port" ).getValueAsInteger( 25 ); - try - { + try + { final String bindAddress = configuration.getChild( "bind" ).getValue( null ); if( null != bindAddress ) { - m_bindTo = InetAddress.getByName( bindAddress ); + m_bindTo = InetAddress.getByName( bindAddress ); } } - catch( final UnknownHostException unhe ) + catch( final UnknownHostException unhe ) { throw new ConfigurationException( "Malformed bind parameter", unhe ); } - final String useTLS = configuration.getChild("useTLS").getValue( "" ); - if( useTLS.equals( "TRUE" ) ) m_serverSocketType = "ssl"; + final boolean useTLS = configuration.getChild("useTLS").getValueAsBoolean( false ); + if( useTLS ) { + m_serverSocketType = "ssl"; + } super.configure( configuration.getChild( "handler" ) ); } @@ -61,4 +63,4 @@ System.out.println("Started POP3 Server "+m_connectionName); } } - + Index: src/java/org/apache/james/remotemanager/RemoteManager.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManager.java,v retrieving revision 1.2 diff -u -r1.2 RemoteManager.java --- src/java/org/apache/james/remotemanager/RemoteManager.java 18 Jan 2002 02:48:37 -0000 1.2 +++ src/java/org/apache/james/remotemanager/RemoteManager.java 27 Feb 2002 04:52:22 -0000 @@ -26,7 +26,7 @@ * @author Federico Barbieri * @author Peter Donald */ -public class RemoteManager +public class RemoteManager extends AbstractService { protected ConnectionHandlerFactory createFactory() @@ -39,21 +39,23 @@ m_port = configuration.getChild( "port" ).getValueAsInteger( 4554 ); - try - { + try + { final String bindAddress = configuration.getChild( "bind" ).getValue( null ); if( null != bindAddress ) { - m_bindTo = InetAddress.getByName( bindAddress ); + m_bindTo = InetAddress.getByName( bindAddress ); } } - catch( final UnknownHostException unhe ) + catch( final UnknownHostException unhe ) { throw new ConfigurationException( "Malformed bind parameter", unhe ); } - final String useTLS = configuration.getChild( "useTLS" ).getValue( "" ); - if( useTLS.equals( "TRUE" ) ) m_serverSocketType = "ssl"; + final boolean useTLS = configuration.getChild( "useTLS" ).getValueAsBoolean( false ); + if( useTLS ) { + m_serverSocketType = "ssl"; + } super.configure( configuration.getChild( "handler" ) ); } Index: src/java/org/apache/james/smtpserver/SMTPServer.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SMTPServer.java,v retrieving revision 1.2 diff -u -r1.2 SMTPServer.java --- src/java/org/apache/james/smtpserver/SMTPServer.java 18 Jan 2002 02:48:37 -0000 1.2 +++ src/java/org/apache/james/smtpserver/SMTPServer.java 27 Feb 2002 04:52:22 -0000 @@ -23,7 +23,7 @@ * @author Matthew Pangaro * @author Peter Donald */ -public class SMTPServer +public class SMTPServer extends AbstractService { protected ConnectionHandlerFactory createFactory() @@ -36,22 +36,24 @@ m_port = configuration.getChild( "port" ).getValueAsInteger( 25 ); - try - { + try + { final String bindAddress = configuration.getChild( "bind" ).getValue( null ); if( null != bindAddress ) { - m_bindTo = InetAddress.getByName( bindAddress ); + m_bindTo = InetAddress.getByName( bindAddress ); } } - catch( final UnknownHostException unhe ) + catch( final UnknownHostException unhe ) { throw new ConfigurationException( "Malformed bind parameter", unhe ); } - final String useTLS = configuration.getChild("useTLS").getValue( "" ); - if( useTLS.equals( "TRUE" ) ) m_serverSocketType = "ssl"; - + final boolean useTLS = configuration.getChild("useTLS").getValueAsBoolean( false ); + if( useTLS ) { + m_serverSocketType = "ssl"; + } + super.configure( configuration.getChild( "handler" ) ); } @@ -62,4 +64,4 @@ System.out.println("Started SMTP Server "+m_connectionName); } } - + Index: src/java/org/apache/james/userrepository/UsersLDAPRepository.java =================================================================== RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java,v retrieving revision 1.5 diff -u -r1.5 UsersLDAPRepository.java --- src/java/org/apache/james/userrepository/UsersLDAPRepository.java 18 Jan 2002 02:48:39 -0000 1.5 +++ src/java/org/apache/james/userrepository/UsersLDAPRepository.java 27 Feb 2002 04:52:24 -0000 @@ -86,9 +86,9 @@ membersAttr = conf.getChild("MembersAttribute").getValue(); manageGroupAttr - = conf.getChild("ManageGroupAttribute").getValue().equals("TRUE"); + = conf.getChild("ManageGroupAttribute").getValueAsBoolean( false ); groupAttr = conf.getChild("GroupAttribute").getValue(); - managePasswordAttr = conf.getChild("ManagePasswordAttribute").getValue().equals("TRUE"); + managePasswordAttr = conf.getChild("ManagePasswordAttribute").getValueAsBoolean( false ); passwordAttr = conf.getChild("PasswordAttribute").getValue(); } @@ -96,7 +96,7 @@ this.comp = comp; } - public void contextualize(Context context) + public void contextualize(Context context) throws ContextException { Collection serverNames = (Collection)context.get(Constants.SERVER_NAMES);