Cleaning up code for runtime, installer, RMI, compiler for the Java side

[iot2.git] / iotjava / iotruntime / master / ProcessJailConfig.java

diff --git a/iotjava/iotruntime/master/ProcessJailConfig.java b/iotjava/iotruntime/master/ProcessJailConfig.java
index fba8cad773436bbf2d57f21f3bf0953b46a6367f..8b64837159e15ce9b84ddeb0332758b33f7c68ee 100644 (file)
--- a/iotjava/iotruntime/master/ProcessJailConfig.java
+++ b/iotjava/iotruntime/master/ProcessJailConfig.java
@@ -31,10 +31,10 @@ public final class ProcessJailConfig {
         */
        private static final String STR_SSH_USERNAME_ROUTER = "root";
        private static final String STR_SSH_USERNAME_HOST   = "iotuser";
-       private static final String STR_TCP_PROTOCOL = "tcp";
-       private static final String STR_UDP_PROTOCOL = "udp";
-       private static final String STR_TCPGW_PROTOCOL = "tcpgw";
-       private static final String STR_NO_PROTOCOL = "nopro";
+       private static final String STR_TCP_PROTOCOL        = "tcp";
+       private static final String STR_UDP_PROTOCOL        = "udp";
+       private static final String STR_TCPGW_PROTOCOL      = "tcpgw";
+       private static final String STR_NO_PROTOCOL         = "nopro";
 
        private static final String STR_ADD_MAC_EXT             = ".tomoyo";
        private static final String STR_MAC_POLICY_EXT          = ".tomoyo.pol";
@@ -218,7 +218,6 @@ public final class ProcessJailConfig {
         */
        public void getAddressList(String strRouterAddress) {
 
-               //HashMap<String,String> hmMACToIPAdd = new HashMap<String,String>();
                try {
                        // We can replace "cat /tmp/dhcp.leases" with "cat /proc/net/arp"
                        String cmd = "ssh " + STR_SSH_USERNAME_ROUTER + "@" + strRouterAddress +
@@ -299,8 +298,6 @@ public final class ProcessJailConfig {
                        replace(STR_OBJECT_CLASS_NAME, strObjectClassName).
                        replace(STR_MASTER_IP_ADDRESS, strMasterIPAddress).
                        replace(STR_MASTER_COM_PORT, String.valueOf(iComPort));
-                       //replace(STR_RMI_REG_PORT, String.valueOf(iRMIRegPort)).
-                       //replace(STR_RMI_STUB_PORT, String.valueOf(iRMIStubPort));
                pwConfig.println("\n");
                pwConfig.print(strNewPolicyList);
                pwConfig.println("network inet stream bind/listen :: " + iRMIRegPort);
@@ -365,7 +362,6 @@ public final class ProcessJailConfig {
        public void configureProcessJailInetAddressPolicies(String strConfigHost, String strRouterAddress, String strAddress) {
 
                PrintWriter pwConfig = getPrintWriter(strConfigHost);
-               //System.out.println("\n\nDEBUG: Writing the config host address setup!!!\n\n");
                pwConfig.println("file read /etc/resolv.conf");
                pwConfig.println("file read /etc/hosts");
                pwConfig.println("file read /etc/host.conf");