antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Updated version string

Browse source 
* Improved startup message which now includes info about Java version
* Default Helma log is now log file, not console
* added getDbProperties() method to retrieve server-wide db sources.
This commit is contained in:
hns 2002-08-02 18:33:12 +00:00
parent 096541e347
commit 1b29302939
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helma/main/Server.java
View file

@ -26,7 +26,7 @@ import org.mortbay.util.*;
public class Server implements IPathElement, Runnable { public class Server implements IPathElement, Runnable {
public static final String version = "1.2pre3+ 2002/07/25"; public static final String version = "1.2pre3+ 2002/08/01";
public long starttime; public long starttime;
// if true we only accept RMI and XML-RPC connections from // if true we only accept RMI and XML-RPC connections from
@ -165,7 +165,11 @@ import org.mortbay.util.*;
// from now on it's safe to call getLogger() // from now on it's safe to call getLogger()
getLogger().log ("Starting Helma "+version); String startMessage = "Starting Helma "+version+
" on Java "+System.getProperty ("java.version");
getLogger().log (startMessage);
// also print a msg to System.out
System.out.println (startMessage);
getLogger().log ("propfile = "+propfile); getLogger().log ("propfile = "+propfile);
getLogger().log ("hopHome = "+hopHome); getLogger().log ("hopHome = "+hopHome);
@ -256,6 +260,7 @@ import org.mortbay.util.*;
// create new Jetty server and bind it to the web server port // create new Jetty server and bind it to the web server port
http = new HttpServer (); http = new HttpServer ();
http.addListener (new InetAddrPort (websrvPort)); http.addListener (new InetAddrPort (websrvPort));
// http.setRequestLogSink (new OutputStreamLogSink ());
} }
String xmlparser = sysProps.getProperty ("xmlparser"); String xmlparser = sysProps.getProperty ("xmlparser");
@ -350,11 +355,11 @@ import org.mortbay.util.*;
*/ */
public static Logger getLogger () { public static Logger getLogger () {
if (logger == null) { if (logger == null) {
String logDir = sysProps.getProperty ("logdir"); String logDir = sysProps.getProperty ("logdir", "log");
if (logDir == null || "console".equalsIgnoreCase (logDir)) { if ("console".equalsIgnoreCase (logDir)) {
logger = new Logger (System.out); logger = new Logger (System.out);
} else { } else {
File helper = new File (logDir); File helper = new File (logDir);
if (hopHome != null && !helper.isAbsolute ()) if (hopHome != null && !helper.isAbsolute ())
helper = new File (hopHome, logDir); helper = new File (hopHome, logDir);
logDir = helper.getAbsolutePath (); logDir = helper.getAbsolutePath ();
@ -406,6 +411,10 @@ import org.mortbay.util.*;
return sysProps; return sysProps;
} }
public SystemProperties getDbProperties() {
return dbProps;
}
public File getAppsHome() { public File getAppsHome() {
String appHome = sysProps.getProperty ("appHome"); String appHome = sysProps.getProperty ("appHome");
if (appHome != null && !"".equals (appHome.trim())) if (appHome != null && !"".equals (appHome.trim()))