Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5151/src/edu/harvard/syrah/pyxida
Modified Files:
Pyxida.java
Log Message:
Added missing libraries for xmlrpc support
Fixed handing of config file; parameters should be read now
Fixed indentation of a bunch of source files because someone (cough, cough, jonathan, cough...) can't convince his emacs version to use tabs instead of spaces
Index: Pyxida.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/Pyxida.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Pyxida.java 28 Nov 2006 21:13:13 -0000 1.14
--- Pyxida.java 29 Nov 2006 11:08:20 -0000 1.15
***************
*** 21,24 ****
--- 21,31 ----
private static final String VERSION = "0.1";
+ static {
+ /*
+ * All config properties in the file must start with 'pyxida.'
+ */
+ Config.read("pyxida", System.getProperty("pyxida.config", "config/pyxida.cfg"));
+ }
+
private static final String CONFIG_FILE = System.getProperty("pyxida.config",
"config/pyxida.cfg");
***************
*** 28,32 ****
public static final boolean USE_ICMP = Boolean.parseBoolean(Config.getConfigProps().getProperty("pyxida.use_icmp", "false"));
-
private static Pyxida pyxida = null;
--- 35,38 ----
***************
*** 64,68 ****
case OK: {
// Initialise the external APIs
! /*
apiManager = new APIManager(ncManager);
apiManager.init(new CB0() {
--- 70,74 ----
case OK: {
// Initialise the external APIs
!
apiManager = new APIManager(ncManager);
apiManager.init(new CB0() {
***************
*** 79,87 ****
}
}
! }
!
});
- */
break;
}
--- 85,91 ----
}
}
! }
});
break;
}
***************
*** 124,135 ****
args = newArgs;
}
!
! // Read the config file
! String configFileName = CONFIG_FILE;
! if (args.length == 1) {
! configFileName = args[0];
! }
! Config.read(configFileName);
!
// Turn on assertions
boolean assertsEnabled = false;
--- 128,132 ----
args = newArgs;
}
!
// Turn on assertions
boolean assertsEnabled = false;
|
