Properties extended as ObjectProperties, which can return any Object,

and wrap int and boolean parsing. Gateway.getProperties() returns the
new ObjectProperty instance. Old Gateway property methods still present
but deprecated. Refs #149

4 files changed, 21 insertions, 14 deletions

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index 5f23261..4f64adf 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/com/c2kernel/process/Bootstrap.java
@@ -178,7 +178,7 @@ public class Bootstrap
         }

         

         CompositeActivity ca = new CompositeActivity();

-        if (ns!=null && Gateway.getProperty("Module.debug", "false").equals("true")) {

+        if (ns!=null && Gateway.getProperties().getBoolean("Module.debug", false)) {

         	String wf;

         	if (itemType.equals("CA")) wf = "ManageCompositeActDef"; 

         	else if (itemType.equals("EA")) wf = "ManageElementaryActDef";

@@ -272,7 +272,7 @@ public class Bootstrap
      */

     public static void checkAdminAgents() throws Exception {

         // check for administrative user

-    	String adminPassword = Gateway.getProperty("AdminPassword", "admin12345");

+    	String adminPassword = Gateway.getProperties().getProperty("AdminPassword", "admin12345");

 

         checkAgent("admin", adminPassword, "Admin", false);

 

@@ -284,7 +284,7 @@ public class Bootstrap
     }

 

     public static void createServerItem() throws Exception {

-        String serverName = Gateway.getProperty("ItemServer.name");

+        String serverName = Gateway.getProperties().getProperty("ItemServer.name");

         thisServerPath = new DomainPath("/servers/"+serverName);

         EntityPath serverEntity;

         try {

@@ -300,12 +300,12 @@ public class Bootstrap
         Gateway.getStorage().put(serverEntity.getSysKey(), new Property("Name", serverName, false), null);

         Gateway.getStorage().put(serverEntity.getSysKey(), new Property("Type", "Server", false), null);

         Gateway.getStorage().put(serverEntity.getSysKey(), new Property("KernelVersion", Gateway.getKernelVersion(), true), null);

-        if (Gateway.getProperty("ItemServer.Proxy.port") != null)

+        if (Gateway.getProperties().getProperty("ItemServer.Proxy.port") != null)

             Gateway.getStorage().put(serverEntity.getSysKey(),

-                    new Property("ProxyPort", Gateway.getProperty("ItemServer.Proxy.port"), true), null);

+                    new Property("ProxyPort", Gateway.getProperties().getProperty("ItemServer.Proxy.port"), false), null);

         Gateway.getStorage().put(serverEntity.getSysKey(),

                     new Property("ConsolePort", String.valueOf(Logger.getConsolePort()), true), null);

-        Gateway.getProxyManager().connectToProxyServer(Gateway.getProperty("ItemServer.name"), Integer.parseInt(Gateway.getProperty("ItemServer.Proxy.port")));

+        Gateway.getProxyManager().connectToProxyServer(Gateway.getProperties().getProperty("ItemServer.name"), Gateway.getProperties().getInt("ItemServer.Proxy.port"));

 

     }

 

diff --git a/src/main/java/com/c2kernel/process/ClientShell.java b/src/main/java/com/c2kernel/process/ClientShell.java
index 6ca0970..6a620d8 100644
--- a/src/main/java/com/c2kernel/process/ClientShell.java
+++ b/src/main/java/com/c2kernel/process/ClientShell.java
@@ -38,10 +38,10 @@ public class ClientShell extends StandardClient {
 

 	public static void main(String[] args) throws Exception {

 		Gateway.init(readC2KArgs(args));

-		String authClassName = Gateway.getProperty("cli.auth");

+		String authClassName = Gateway.getProperties().getProperty("cli.auth");

 		Class<?> authClass = Gateway.getResource().getClassForName(authClassName);

 		Authenticator auth = (Authenticator)authClass.newInstance();

-		AgentProxy user = auth.authenticate(Gateway.getProperty("Name"));

+		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 b57e91b..0d9dbe6 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -26,6 +26,7 @@ import com.c2kernel.utils.CastorXMLUtility;
 import com.c2kernel.utils.FileStringUtility;

 import com.c2kernel.utils.Language;

 import com.c2kernel.utils.Logger;

+import com.c2kernel.utils.ObjectProperties;

 

 

 /**************************************************************************

@@ -50,7 +51,7 @@ import com.c2kernel.utils.Logger;
 

 public class Gateway

 {

-    static private Properties  mC2KProps;

+    static private ObjectProperties     mC2KProps;

     static private ModuleManager   		mModules;

     static private org.omg.CORBA.ORB    mORB;

     static private boolean				orbDestroyed = false;

@@ -60,7 +61,7 @@ public class Gateway
     static private CorbaServer          mCorbaServer;

     static private CastorXMLUtility		mMarshaller;

     static private AgentProxy			mCurrentUser = null;

-    static private ResourceLoader				mResource;

+    static private ResourceLoader		mResource;

 

 

 

@@ -91,7 +92,7 @@ public class Gateway
     static public void init(Properties props, ResourceLoader res) throws InvalidDataException {

     	

         // Init properties & resources

-        mC2KProps = new Properties();

+        mC2KProps = new ObjectProperties();

         mResource = res;

         if (mResource == null) mResource = new Resource();

 

@@ -413,15 +414,18 @@ public class Gateway
         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);

@@ -440,6 +444,9 @@ public class Gateway
         }

     }

     

+    static public ObjectProperties getProperties() {

+    	return mC2KProps;

+    }

 

     static public String getKernelVersion() {

     	try {

diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java
index ca2e74b..3cb4904 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleManager.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java
@@ -137,19 +137,19 @@ public class ModuleManager {
 	public void registerModules() throws ModuleException {

 		ItemProxy serverEntity;

 		try {

-			serverEntity = (ItemProxy)Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperty("ItemServer.name")));

+			serverEntity = (ItemProxy)Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getProperty("ItemServer.name")));

 		} catch (ObjectNotFoundException e) {

 			throw new ModuleException("Cannot find local server name.");

 		}

 		Logger.debug(3, "Registering modules");

 

-		boolean reset = Gateway.getProperty("Module.reset", "false").equals("true");

+		boolean reset = Gateway.getProperties().getBoolean("Module.reset", false);

 

 		for (Module thisMod : modules) {

 			

 			Logger.msg("Registering module "+thisMod.getName());

 			try {

-				String nsReset = Gateway.getProperty("Module."+thisMod.ns+".reset");

+				String nsReset = Gateway.getProperties().getProperty("Module."+thisMod.ns+".reset");

 				boolean thisReset = nsReset == null?reset:nsReset.equals("true");

 				thisMod.importAll(serverEntity, modulesXML.get(thisMod.ns), thisReset);

 			} catch (Exception e) {