ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/core/Core.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/core/Core.java (file contents):
Revision 1.9 by tdb, Thu Nov 16 18:00:36 2000 UTC vs.
Revision 1.12 by ajm, Mon Nov 20 17:11:44 2000 UTC

#	Line 5 | Line 5 | import uk.ac.ukc.iscream.core.*;
5		import org.omg.CORBA.*;
6		import org.omg.CosNaming.*;
7		import org.omg.PortableServer.*;
8	+	import java.util.*;
9	+	import java.io.*;
10
11		/**
12		* The main class for the CORE of the I-Scream system.
#	Line 26 | Line 28 | class Core {
28		*/
29		public static final String REVISION = "$Revision$";
30
31	+	/**
32	+	* The toString() of this class
33	+	* As it won't be instatiated, this is needed.
34	+	*/
35	+	public static final String toString = "CORE(" + REVISION.substring(11, REVISION.length() - 2) + ")";
36	+
37	+	/**
38	+	* The default location of the properties file for the system
39	+	*/
40	+	public static final String DEFAULTPROPERTIES = "default.properties";
41	+
42		//---STATIC METHODS---
43
44		/**
#	Line 36 | Line 49 | class Core {
49		* @param args the command line arguments
50		*/
51		public static void main(String[] args) {
39	–	System.setProperty("org.omg.CORBA.ORBClass","jacorb.orb.ORB");
40	–	System.setProperty("org.omg.CORBA.ORBSingletonClass","jacorb.orb.ORBSingleton");
41	–
52		System.out.println("--- I-Scream ---");
53	<
54	<	// can't have a real toString() :)
55	<	String toString = "CORE(" + REVISION.substring(11, REVISION.length() - 2) + ")";
56	<
57	<	System.out.println(toString + ": coming up");
58	<
53	>
54	>	// get the command line args
55	>	String defaultProperties = DEFAULTPROPERTIES;
56	>	if (args.length > 0) {
57	>	if (args[0].equals("-l")) {
58	>	defaultProperties = args[1];
59	>	} else if (args[0].equals("-h")) {
60	>	usage();
61	>	} else {
62	>	usage();
63	>	}
64	>	}
65	>
66	>	// load the default properties file into the system properties
67	>	System.out.println(toString + ": initialising - using " + defaultProperties);
68		try {
69	+	Properties initProperties = new Properties(System.getProperties());
70	+	initProperties.load(new FileInputStream(new File(defaultProperties)));
71	+	System.setProperties(initProperties);
72	+
73	+
74	+	} catch (Exception e) {
75	+	System.err.println(toString + ": ERROR " + e.getMessage());
76	+	usage();
77	+	}
78	+
79	+	// continue to bring the system up
80	+	System.out.println(toString + ": coming up");
81	+	try {
82		// start the ORB
83		ORB orb = ORB.init(args, null);
84
#	Line 59 | Line 91 | class Core {
91		NamingContextExt ncRef = NamingContextExtHelper.narrow(objRef);
92
93		// start and bind each server in turn
94	<
95	<	// create the logger (either Screen or File)
96	<	ScreenLoggerServant loggerRef = new ScreenLoggerServant(Logger.SYSINIT);
97	<	//FileLoggerServant loggerRef = new FileLoggerServant("core.log");
94	>
95	>	// work out the verbosity setting & which logger to use
96	>	int verbosity = Integer.parseInt(System.getProperty("uk.ac.ukc.iscream.Verbosity", defaultVerbosity));
97	>	String whichLogger = System.getProperty("uk.ac.ukc.iscream.LoggerClass", defaultLogger);
98	>	String loggerParams = System.getProperty("uk.ac.ukc.iscream.LoggerClassParams");
99	>
100	>	Logger logRef = null;
101	>	// create the logger (either Screen or File), and bind it
102	>	if(whichLogger.equals("ScreenLogger")){
103	>	ScreenLoggerServant loggerRef = new ScreenLoggerServant(verbosity);
104	>	objRef = poa.servant_to_reference(loggerRef);
105	>	ncRef.bind(ncRef.to_name("iscream.Logger"), objRef);
106	>	logRef = LoggerHelper.narrow(objRef);
107	>	}
108	>	else if(whichLogger.equals("FileLogger")){
109	>	FileLoggerServant loggerRef = new FileLoggerServant(loggerParams, verbosity);
110	>	objRef = poa.servant_to_reference(loggerRef);
111	>	ncRef.bind(ncRef.to_name("iscream.Logger"), objRef);
112	>	logRef = LoggerHelper.narrow(objRef);
113	>	}
114	>	else {
115	>	//need to deal with this
116	>	}
117	>
118		// and advertise it to the naming context
119	<	objRef = poa.servant_to_reference(loggerRef);
120	<	ncRef.bind(ncRef.to_name("iscream.Logger"), objRef);
119	>	//objRef = poa.servant_to_reference(loggerRef);
120	>	//ncRef.bind(ncRef.to_name("iscream.Logger"), objRef);
121
122		// get a ref to the logger servant as a Logger reference
123	<	Logger logRef = LoggerHelper.narrow(objRef);
123	>	//Logger logRef = LoggerHelper.narrow(objRef);
124
125		// create the Configurator
126	<	ConfiguratorServant configuratorRef = new ConfiguratorServant("../configuration/", poa, logRef);
126	>	String configLocation = System.getProperty("uk.ac.ukc.iscream.ConfigurationLocation", defaultConfigPath);
127	>	ConfigurationManagerServant configManRef = new ConfigurationManagerServant(poa, logRef);
128
129		// and advertise it to the naming context
130	<	objRef = poa.servant_to_reference(configuratorRef);
131	<	ncRef.bind(ncRef.to_name("iscream.Configurator"), objRef);
130	>	objRef = poa.servant_to_reference(configManRef);
131	>	ncRef.bind(ncRef.to_name("iscream.ConfigurationManager"), objRef);
132
133		// start the POA off
134		poa.the_POAManager().activate();
#	Line 101 | Line 154 | class Core {
154		}
155		}
156		}
157	+
158	+	/**
159	+	* A simple method to print the usage of this class.
160	+	* It never returns, but instead exits to the system
161	+	* with a value 1, to indicate the system did not start
162	+	* properly.
163	+	*/
164	+	public static void usage() {
165	+	System.out.println("USAGE: java Core.java <option>");
166	+	System.out.println("WHERE <option>:");
167	+	System.out.println("      -l <filename> - the location of initial system properties");
168	+	System.out.println("      -h            - this help screen");
169	+	System.exit(1);
170	+	}
171
172		//---CONSTRUCTORS---
173
#	Line 111 | Line 178 | class Core {
178		//---ACCESSOR/MUTATOR METHODS---
179
180		//---ATTRIBUTES---
181	<
181	>
182		//---STATIC ATTRIBUTES---
183	+
184	+	/**
185	+	* Default verbosity setting, to be used when one is
186	+	* not provided in the configuration.
187	+	*/
188	+	private static final String defaultVerbosity = "3";
189	+
190	+	/**
191	+	* Default logger, to be used when one is not provided
192	+	* in the configuration.
193	+	*/
194	+	private static final String defaultLogger = "ScreenLogger";
195	+
196	+	/**
197	+	* Default configPath, to be used when one is not provided
198	+	* in the configuration.
199	+	*/
200	+	private static final String defaultConfigPath = ".";
201
202		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines