X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=iotjava%2Fiotruntime%2Fmaster%2FProcessJailConfig.java;h=7b080fdec1bf4ff680967fd83467816377f6d31b;hb=8b9f15dfaa9cf16deb2d5b91bba324739fdd3544;hp=d76d130af065fe1f93e6bc3cccd7ea7930fe97c5;hpb=707e9800c282dbb21c2e093cedcf8f5361b0e8ba;p=iot2.git

diff --git a/iotjava/iotruntime/master/ProcessJailConfig.java b/iotjava/iotruntime/master/ProcessJailConfig.java
index d76d130..7b080fd 100644
--- a/iotjava/iotruntime/master/ProcessJailConfig.java
+++ b/iotjava/iotruntime/master/ProcessJailConfig.java
@@ -38,6 +38,7 @@ public final class ProcessJailConfig {
 
 	private static final String STR_MAC_POLICY_EXT 		= ".tomoyo.pol";
 	private static final String STR_OBJECT_NAME   		= "<object-name>";
+	private static final String STR_OBJECT_CLASS_NAME	= "<object-class-name>";
 	private static final String STR_MASTER_IP_ADDRESS	= "<master-ip-address>";
 	private static final String STR_MASTER_COM_PORT		= "<master-com-port>";
 	private static final String STR_RMI_REG_PORT  		= "<rmi-reg-port>";
@@ -263,6 +264,7 @@ public final class ProcessJailConfig {
 	 *
 	 * @param   strConfigHost 	 		String hostname to be configured
 	 * @param   strObjectName 	 		String object name
+	 * @param   strObjectClassName 		String object class name
 	 * @param   strFileName 			String policy file path and name
 	 * @param   strMasterIPAddress		String master IP address
 	 * @param   iComPort				Integer communication port (controller-driver)
@@ -270,17 +272,22 @@ public final class ProcessJailConfig {
 	 * @param   iRMIStubPort			Integer RMI stub port
 	 * @return  void
 	 */
-	public void configureProcessJailDeviceDriverPolicies(String strConfigHost, String strObjectName, 
+	public void configureProcessJailDeviceDriverPolicies(String strConfigHost, String strObjectName, String strObjectClassName, 
 			String strFileName, String strMasterIPAddress, int iComPort, int iRMIRegPort, int iRMIStubPort) {
 
 		PrintWriter pwConfig = getPrintWriter(strConfigHost);
 		String strPolicyList = readFile(strFileName);
 		// Replace the strings with the actual values
-		String strNewPolicyList = strPolicyList.replace(STR_OBJECT_NAME, strObjectName).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));
+		String strNewPolicyList = strPolicyList.replace(STR_OBJECT_NAME, strObjectName).
+			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);
+		pwConfig.println("network inet stream bind/listen :: " + iRMIStubPort);
 	}
 
 
@@ -324,8 +331,10 @@ public final class ProcessJailConfig {
 		PrintWriter pwConfig = getPrintWriter(strControllerName);
 		String strPolicyList = readFile(strFileName);
 		// Replace the strings with the actual values
-		String strNewPolicyList = strPolicyList.replace(STR_MASTER_IP_ADDRESS,
-			strMasterIPAddress).replace(STR_MASTER_COM_PORT, String.valueOf(iComPort));
+		String strNewPolicyList = strPolicyList.replace(STR_OBJECT_NAME, strControllerName).
+			replace(STR_OBJECT_CLASS_NAME, strControllerName).
+			replace(STR_MASTER_IP_ADDRESS, strMasterIPAddress).
+			replace(STR_MASTER_COM_PORT, String.valueOf(iComPort));
 		pwConfig.println("\n");
 		pwConfig.print(strNewPolicyList);
 	}