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

re-enabled appsPropFile property and did some

Browse source 
code-shifting from static main() to Server()
constructor.
This commit is contained in:
hns 2001-03-11 16:04:45 +00:00
parent 9bb86fff7c
commit 39bdbfd886
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/helma/objectmodel/db/Server.java
View file

@ -36,7 +36,7 @@ import com.sleepycat.db.*;
static String dbFilename = "hop.db"; static String dbFilename = "hop.db";
static String propfile; static String propfile;
static String dbPropfile = "db.properties"; static String dbPropfile = "db.properties";
static String appsPropfile = "apps.properties"; static String appsPropfile;
static SystemProperties appsProps; static SystemProperties appsProps;
static int port = 5055; static int port = 5055;
static int webport = 0; static int webport = 0;
@ -45,12 +45,12 @@ import com.sleepycat.db.*;
public static void main (String args[]) throws IOException { public static void main (String args[]) throws IOException {
String homeDir = null;
boolean usageError = false; boolean usageError = false;
useTransactions = true; useTransactions = true;
String homeDir = null;
for (int i=0; i<args.length; i++) { for (int i=0; i<args.length; i++) {
if (args[i].equals ("-h") && i+1<args.length) if (args[i].equals ("-h") && i+1<args.length)
homeDir = args[++i]; homeDir = args[++i];
@ -74,6 +74,25 @@ import com.sleepycat.db.*;
usageError = true; usageError = true;
} }
if (usageError ) {
System.out.println ("usage: java helma.objectmodel.db.Server [-h dir] [-f file] [-p port] [-w port] [-t]");
System.out.println (" -h dir Specify hop home directory");
System.out.println (" -f file Specify server.properties file");
System.out.println (" -p port Specify TCP port number");
System.out.println (" -w port Start embedded Web server on that port");
System.out.println (" -t Disable Berkeley DB Transactions");
getLogger().log ("Usage Error - exiting");
System.exit (0);
}
new Server (homeDir);
}
public Server (String home) {
String homeDir = home;
// get main property file from home dir or vice versa, depending on what we have. // get main property file from home dir or vice versa, depending on what we have.
// get property file from hopHome // get property file from hopHome
if (propfile == null) { if (propfile == null) {
@ -96,21 +115,15 @@ import com.sleepycat.db.*;
getLogger().log ("propfile = "+propfile); getLogger().log ("propfile = "+propfile);
getLogger().log ("hopHome = "+hopHome); getLogger().log ("hopHome = "+hopHome);
if (usageError ) {
System.out.println ("usage: java helma.objectmodel.db.Server [-h dir] [-f file] [-p port] [-w port] [-t]");
System.out.println (" -h dir Specify hop home directory");
System.out.println (" -f file Specify server.properties file");
System.out.println (" -p port Specify TCP port number");
System.out.println (" -w port Start embedded Web server on that port");
System.out.println (" -t Disable Berkeley DB Transactions");
getLogger().log ("Usage Error - exiting");
System.exit (0);
}
File helper = new File (hopHome, "db.properties"); File helper = new File (hopHome, "db.properties");
dbPropfile = helper.getAbsolutePath (); dbPropfile = helper.getAbsolutePath ();
getLogger().log ("dbPropfile = "+dbPropfile); getLogger().log ("dbPropfile = "+dbPropfile);
appsPropfile = sysProps.getProperty ("appsPropFile");
if (appsPropfile != null && !"".equals (appsPropfile.trim()))
helper = new File (appsPropfile);
else
helper = new File (hopHome, "apps.properties"); helper = new File (hopHome, "apps.properties");
appsPropfile = helper.getAbsolutePath (); appsPropfile = helper.getAbsolutePath ();
getLogger().log ("appsPropfile = "+appsPropfile); getLogger().log ("appsPropfile = "+appsPropfile);
@ -131,12 +144,6 @@ import com.sleepycat.db.*;
dbSources = new Hashtable (); dbSources = new Hashtable ();
new Server ();
}
public Server () {
try { try {
checkRunning (); // check if a server is already running with this db checkRunning (); // check if a server is already running with this db
} catch (Exception running) { } catch (Exception running) {