X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=blobdiff_plain;f=localconfig%2Fiotruntime%2FIoTMaster.config;h=de7069f8b15ef1f2408ac96965cb1e8328333a62;hp=da858ccb6acedf6ab4150311744e68b60fdeda4c;hb=505fd50e1876f51a8632f1b4c59c67e8dae72fa7;hpb=47a251f41e05f47b4bc19c236ab9441cef5ed42c

diff --git a/localconfig/iotruntime/IoTMaster.config b/localconfig/iotruntime/IoTMaster.config
index da858cc..de7069f 100644
--- a/localconfig/iotruntime/IoTMaster.config
+++ b/localconfig/iotruntime/IoTMaster.config
@@ -4,6 +4,7 @@ MAC_ADDRESS=74:da:38:68:72:8a
 IOT_CODE_PATH=./../iotcode/
 CONTROLLERS_CODE_PATH=../
 RUNTIME_DIR=~/iot2/iotjava/iotruntime;
+SLAVE_DIR=~/iot2/iotjava/iotruntime/slave;
 #CLASS_PATH=-cp .:/usr/share/java/*:./../../iotjava/:./../../iotjava/iotruntime/:./../../iotjava/iotinstaller/:./../../iotjava/iotrmi/
 CLASS_PATH=-cp .:/usr/share/java/*:./../:./../iotruntime/:./../iotinstaller/:./../../iotjava/iotrmi/
 
@@ -13,20 +14,36 @@ CLASS_PATH=-cp .:/usr/share/java/*:./../:./../iotruntime/:./../iotinstaller/:./.
 RMI_PATH=-Djava.rmi.server.codebase=file:.:/usr/share/java/*
 RMI_HOSTNAME=-Djava.rmi.server.hostname=
 LOG_FILE_PATH=log/
-SSH_USERNAME=ssh iotuser@
+USERNAME=iotuser@
 ROUTER_ADD=192.168.2.1
 
 #The only host that SSH is allowed from to the router
 MONITORING_HOST=74:da:38:68:72:8a
 
 #Zigbee gateway information
-ZIGBEE_GATEWAY_ADDRESS=c0:4a:00:10:9c:b3
+#ZIGBEE_GATEWAY_ADDRESS=c0:4a:00:10:9c:b3
+ZIGBEE_GATEWAY_ADDRESS=74:da:38:0d:05:56
 ZIGBEE_GATEWAY_PORT=5005
 ZIGBEE_IOTMASTER_PORT=12345
 
 #Verboseness of runtime messages
 VERBOSE=Yes
 
-#Number of callback ports
-NUMBER_CALLBACK_PORTS=4
+#Language: C++ or Java
+LANGUAGE=Java
+
+#JVM heap size - can go out of memory if a IoTSlave needs to handle a lot of objects
+#E.g. JVM_INIT_HEAP_SIZE=-Xms64m, JVM_MAX_HEAP_SIZE=-Xmx64m (64 MB of heap)
+#Made empty for now as it needs fine-tuning
+JVM_INIT_HEAP_SIZE=
+JVM_MAX_HEAP_SIZE=
+
+# Skeleton suffix, e.g. _Skeleton for Camera_Skeleton.class
+SKEL_CLASS_SUFFIX=_Skeleton
+
+# Skeleton suffix, e.g. _Stub for CameraSpecial_Stub.class
+STUB_CLASS_SUFFIX=_Stub
+
+# Sandboxing
+ACTIVATE_SANDBOXING=Yes