diff options
Diffstat (limited to 'src/main/java/com/c2kernel/process')
5 files changed, 21 insertions, 45 deletions
diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java index 3b61ad3..0f06616 100644 --- a/src/main/java/com/c2kernel/process/Bootstrap.java +++ b/src/main/java/com/c2kernel/process/Bootstrap.java @@ -224,21 +224,17 @@ public class Bootstrap private static ResourceImportHandler getHandler(String resType) throws Exception {
if (resHandlerCache.containsKey(resType))
return resHandlerCache.get(resType);
- ResourceImportHandler handler;
- Object handlerProp = Gateway.getProperties().get("ResourceImportHandler."+resType);
- if (handlerProp instanceof ResourceImportHandler)
- handler = (ResourceImportHandler)handlerProp;
- else if (handlerProp instanceof String) { //class name
+ ResourceImportHandler handler = null;
+ if (Gateway.getProperties().containsKey("ResourceImportHandler."+resType)) {
try {
- Class<?> handlerClass = Class.forName((String)handlerProp);
- handler = (ResourceImportHandler) handlerClass.newInstance();
- } catch (ClassNotFoundException e) {
- throw new Exception("Handler class "+handlerProp+" for importing "+resType+" resources not found");
- } catch (ClassCastException e) {
- throw new Exception(handlerProp+" for importing "+resType+" was not a ResourceImportHandler");
- }
+ handler = (ResourceImportHandler) Gateway.getProperties().getInstance("ResourceImportHandler."+resType);
+ } catch (Exception ex) {
+ Logger.error(ex);
+ Logger.error("Exception loading ResourceHandler for "+resType+". Using default.");
+ }
}
- else
+
+ if (handler == null)
handler = new DefaultResourceImportHandler(resType);
resHandlerCache.put(resType, handler);
@@ -327,7 +323,7 @@ public class Bootstrap */
public static void checkAdminAgents() throws Exception {
// check for administrative user
- String adminPassword = Gateway.getProperties().getProperty("AdminPassword", "admin12345");
+ String adminPassword = Gateway.getProperties().getString("AdminPassword", "admin12345");
// check for import user
checkAgent("system", adminPassword, "Admin", new UUID(0, 0), false);
@@ -340,7 +336,7 @@ public class Bootstrap public static void createServerItem() throws Exception {
LookupManager lookupManager = Gateway.getLookupManager();
- String serverName = Gateway.getProperties().getProperty("ItemServer.name");
+ String serverName = Gateway.getProperties().getString("ItemServer.name", InetAddress.getLocalHost().getHostName());
thisServerPath = new DomainPath("/servers/"+serverName);
ItemPath serverEntity;
try {
@@ -356,12 +352,12 @@ public class Bootstrap Gateway.getStorage().put(serverEntity, new Property("Name", serverName, false), null);
Gateway.getStorage().put(serverEntity, new Property("Type", "Server", false), null);
Gateway.getStorage().put(serverEntity, new Property("KernelVersion", Gateway.getKernelVersion(), true), null);
- if (Gateway.getProperties().getProperty("ItemServer.Proxy.port") != null)
- Gateway.getStorage().put(serverEntity,
- new Property("ProxyPort", Gateway.getProperties().getProperty("ItemServer.Proxy.port"), false), null);
+ int proxyPort = Gateway.getProperties().getInt("ItemServer.Proxy.port", 1553);
+ Gateway.getStorage().put(serverEntity,
+ new Property("ProxyPort", String.valueOf(proxyPort), false), null);
Gateway.getStorage().put(serverEntity,
new Property("ConsolePort", String.valueOf(Logger.getConsolePort()), true), null);
- Gateway.getProxyManager().connectToProxyServer(Gateway.getProperties().getProperty("ItemServer.name"), Gateway.getProperties().getInt("ItemServer.Proxy.port"));
+ Gateway.getProxyManager().connectToProxyServer(serverName, proxyPort);
}
diff --git a/src/main/java/com/c2kernel/process/ClientShell.java b/src/main/java/com/c2kernel/process/ClientShell.java index eeeb07f..d97a3de 100644 --- a/src/main/java/com/c2kernel/process/ClientShell.java +++ b/src/main/java/com/c2kernel/process/ClientShell.java @@ -41,9 +41,7 @@ public class ClientShell extends StandardClient { public static void main(String[] args) throws Exception {
Gateway.init(readC2KArgs(args));
- String authClassName = Gateway.getProperties().getProperty("cli.auth");
- Class<?> authClass = Gateway.getResource().getClassForName(authClassName);
- ProxyLogin auth = (ProxyLogin)authClass.newInstance();
+ ProxyLogin auth = (ProxyLogin)Gateway.getProperties().getInstance("cli.auth");
AgentProxy user = auth.authenticate(Gateway.getProperties().getProperty("Name"));
ClientShell shell = new ClientShell(user);
shell.run();
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index c2dd646..2de2b99 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -135,7 +135,7 @@ public class Gateway dumpC2KProps(7);
//Initialise language file
- String languageFile = getProperty("language.file");
+ String languageFile = getProperties().getString("language.file");
if (languageFile != null && languageFile.length() > 0) {
Language.isTranlated=true;
Language.mTableOfTranslation = FileStringUtility.loadLanguageFile(languageFile);
@@ -376,24 +376,7 @@ public class Gateway }
static public String getCentreId() {
- return getProperty("LocalCentre");
- }
-
- @Deprecated
- static public String getProperty(String propName) {
- return getProperty(propName, null);
- }
-
- @Deprecated
- static public String getProperty(String propName, String defaultValue) {
- if (mC2KProps == null) return defaultValue;
- return mC2KProps.getProperty(propName, defaultValue);
- }
-
- @Deprecated
- static public void setProperty(String propName, String propValue) {
- if (mC2KProps == null) return;
- mC2KProps.put(propName, propValue);
+ return getProperties().getString("LocalCentre");
}
static public Enumeration<?> propertyNames() {
diff --git a/src/main/java/com/c2kernel/process/UserCodeProcess.java b/src/main/java/com/c2kernel/process/UserCodeProcess.java index 6b34bf5..cb8ca74 100644 --- a/src/main/java/com/c2kernel/process/UserCodeProcess.java +++ b/src/main/java/com/c2kernel/process/UserCodeProcess.java @@ -209,7 +209,7 @@ public class UserCodeProcess extends StandardClient implements ProxyObserver<Job }
public static UserCodeProcess getInstance() throws UnknownHostException {
- return new UserCodeProcess(InetAddress.getLocalHost().getHostName(), "uc", Gateway.getProperties().getProperty("AuthResource", "Cristal"));
+ return new UserCodeProcess(InetAddress.getLocalHost().getHostName(), "uc", Gateway.getProperties().getString("AuthResource", "Cristal"));
}
static public void main(String[] args)
diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java index 4fde044..02e7eaa 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleManager.java +++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java @@ -144,7 +144,7 @@ public class ModuleManager { public void registerModules() throws ModuleException {
ItemProxy serverEntity;
try {
- serverEntity = Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getProperty("ItemServer.name")));
+ serverEntity = Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getString("ItemServer.name")));
} catch (ObjectNotFoundException e) {
throw new ModuleException("Cannot find local server name.");
}
@@ -156,8 +156,7 @@ public class ModuleManager { Logger.msg("Registering module "+thisMod.getName());
try {
- String nsReset = Gateway.getProperties().getProperty("Module."+thisMod.getNamespace()+".reset");
- boolean thisReset = nsReset == null?reset:nsReset.equals("true");
+ boolean thisReset = Gateway.getProperties().getBoolean("Module."+thisMod.getNamespace()+".reset");
thisMod.importAll(serverEntity, user, modulesXML.get(thisMod.getNamespace()), thisReset);
} catch (Exception e) {
Logger.error(e);
|