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 hb...@apache.org on 2001/04/29 09:48:48 UTC
cvs commit: jakarta-james/src/org/apache/james Constants.java James.java
hbedi 01/04/29 00:48:47
Modified: src/org/apache/james Constants.java James.java
Log:
The Hello Name(greeting) is obtained from the configuration file.
james/BaseConnectionHandler handles the hello name and other
ConnectionHandlers derive from it.
Revision Changes Path
1.6 +1 -3 jakarta-james/src/org/apache/james/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/Constants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Constants.java 2001/04/29 07:42:32 1.5
+++ Constants.java 2001/04/29 07:48:47 1.6
@@ -13,7 +13,7 @@
*/
public class Constants {
- public static final String SOFTWARE_VERSION = "1.2.2alpha";
+ public static final String SOFTWARE_VERSION = "@@version@@";
public static final String SOFTWARE_NAME = "JAMES Mail Server";
@@ -24,8 +24,6 @@
public static final String LOCAL_USERS = "LOCAL_USERS";
public static final String POSTMASTER = "POSTMASTER";
-
- public static final String HELO_NAME = "HELO_NAME";
public static final int HEADERLIMIT = 2048;
1.38 +1 -15 jakarta-james/src/org/apache/james/James.java
Index: James.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/org/apache/james/James.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- James.java 2001/04/28 12:43:12 1.37
+++ James.java 2001/04/29 07:48:47 1.38
@@ -77,8 +77,6 @@
// thread safe. Changed to int. 'int' should be ok, because id generation
// is based on System time and count
private static int count;
- private String helloName;
- private String hostName;
private MailAddress postmaster;
private Map mailboxes; //Not to be shared!
private Hashtable attributes = new Hashtable();
@@ -129,25 +127,13 @@
getLogger().debug("Using UsersStore: " + usersStore.toString());
context = new DefaultContext();
+ String hostName = null;
try {
hostName = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException ue) {
hostName = "localhost";
}
getLogger().info("Local host is: " + hostName);
-
-
- helloName = null;
- Configuration helloConf = conf.getChild("helloName");
- if (helloConf.getAttribute("autodetect").equals("TRUE")) {
- helloName = hostName;
- } else {
- helloName = helloConf.getValue();
- if (helloName == null || helloName.trim().equals("") )
- helloName = "localhost";
- }
- getLogger().info("Hello Name is: " + helloName);
- context.put(Constants.HELO_NAME, helloName);
// Get the domains and hosts served by this instance
serverNames = new Vector();
---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org