Reorganizing code for better readability, moving log files into separate...

Reorganizing code for better readability, moving log files into separate folder so that they will not appear to be updated every time you run the script

src/mohawk/CalculateRplusOnly.java → src/mohawk/math/CalculateRplusOnly.java

 /**
  * 
  */
-package mohawk;
+package mohawk.math;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -9,6 +9,10 @@ import java.util.LinkedList;
 import java.util.Set;
 import java.util.Vector;
 
+import mohawk.pieces.CAEntry;
+import mohawk.pieces.PreCondition;
+import mohawk.rbac.RBACInstance;
+
 /**
  * @author kjayaram
  *

src/mohawk/EstimateDia.java → src/mohawk/math/EstimateDia.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE. 
  */
 
-package mohawk;
+package mohawk.math;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -30,6 +30,9 @@ import java.util.Map;
 import java.util.Vector;
 
 import mohawk.collections.RoleDepTree;
+import mohawk.pieces.CAEntry;
+import mohawk.pieces.PreCondition;
+import mohawk.rbac.RBACInstance;
 
 /**
  * @author kjayaram

src/mohawk/NuSMV.java → src/mohawk/nusmv/NuSMV.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE. 
  */
 
-package mohawk;
+package mohawk.nusmv;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/mohawk/CnvRBACPAT.java → src/mohawk/output/CnvRBACPAT.java

@@ -25,12 +25,14 @@
 /**
  *  This class converts from a plain RBAC spec to RBACPAT format
  */
-package mohawk;
+package mohawk.output;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
+import mohawk.rbac.RBACPAT;
+
 /**
  * @author Karthick Jayaraman
  * 

src/mohawk/WriteNuSMV.java → src/mohawk/output/WriteNuSMV.java

@@ -4,7 +4,7 @@
  *                     
  *                     Author: Karthick Jayaraman
  */
-package mohawk;
+package mohawk.output;
 
 import java.io.BufferedReader;
 import java.io.FileWriter;
@@ -14,6 +14,11 @@ import java.io.InputStreamReader;
 import java.util.Map;
 import java.util.Vector;
 
+import mohawk.pieces.CAEntry;
+import mohawk.pieces.CREntry;
+import mohawk.pieces.PreCondition;
+import mohawk.rbac.RBACInstance;
+
 import org.antlr.stringtemplate.StringTemplate;
 
 /*
@@ -406,7 +411,7 @@ public class WriteNuSMV {
 		done = true;
 	}
 
-	String getNuSMVCode() {
+	public String getNuSMVCode() {
 		return this.smvcode;
 	}
 

src/mohawk/WriteRBACSpec.java → src/mohawk/output/WriteRBACSpec.java

 /**
  *  Tool for generating RBAC policy specification. 
  */
-package mohawk;
+package mohawk.output;
 
 import java.io.BufferedReader;
 import java.io.FileWriter;
@@ -12,6 +12,11 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Vector;
 
+import mohawk.pieces.CAEntry;
+import mohawk.pieces.CREntry;
+import mohawk.pieces.PreCondition;
+import mohawk.rbac.RBACInstance;
+
 import org.antlr.stringtemplate.*;
 
 /**

src/mohawk/CAEntry.java → src/mohawk/pieces/CAEntry.java

@@ -22,7 +22,8 @@
  * THE SOFTWARE. 
  */
 
-package mohawk;
+package mohawk.pieces;
+
 
 /**
  * This class represents a CAEntry. Each CAEntry has three parts: - Roles that

src/mohawk/CREntry.java → src/mohawk/pieces/CREntry.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE. 
  */
 
-package mohawk;
+package mohawk.pieces;
 
 /**
  * Each CREntry represents a rule for revocation. The first entry describes the

src/mohawk/PreCondition.java → src/mohawk/pieces/PreCondition.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE. 
  */
 
-package mohawk;
+package mohawk.pieces;
 
 import java.util.HashMap;
 import java.util.Map;

src/mohawk/RBAC2SMV.java → src/mohawk/rbac/RBAC2SMV.java

@@ -26,7 +26,7 @@
  * 			RBAC2SMV - Tool for converting a RBAC specification
  *                     to NuSMV specification
  */
-package mohawk;
+package mohawk.rbac;
 
 import java.io.File;
 import java.io.FileReader;
@@ -37,6 +37,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Vector;
 
+import mohawk.output.WriteNuSMV;
+import mohawk.pieces.CAEntry;
+import mohawk.pieces.CREntry;
 import antlr.RecognitionException;
 import antlr.TokenStreamException;
 

src/mohawk/RBACInstance.java → src/mohawk/rbac/RBACInstance.java

@@ -4,12 +4,15 @@
  *
  *			@author Karthick Jayaraman
  */
-package mohawk;
+package mohawk.rbac;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Vector;
 
+import mohawk.pieces.CAEntry;
+import mohawk.pieces.CREntry;
+
 /**
  * This class represents an RBAC instance read from an input file. An object of
  * this class is passed to WriteNuSMV to convert it to a NuSMV spec.

src/mohawk/RBACLexer.java → src/mohawk/rbac/RBACLexer.java

 // $ANTLR 2.7.7 (20060906): "rbac.g" -> "RBACLexer.java"$
 
-package mohawk;
+package mohawk.rbac;
 
 import java.io.InputStream;
 import java.io.Reader;

src/mohawk/RBACLexerTokenTypes.java → src/mohawk/rbac/RBACLexerTokenTypes.java

 // $ANTLR 2.7.7 (20060906): "rbac.g" -> "RBACLexer.java"$
 
-package mohawk;
+package mohawk.rbac;
 
 public interface RBACLexerTokenTypes {
 	int EOF = 1;

src/mohawk/RBACPAT.java → src/mohawk/rbac/RBACPAT.java

 /**
  *   RBACPAT - This tool converts an RBAC spec to an encoding used by the RBACPAT tool.
  */
-package mohawk;
+package mohawk.rbac;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -12,6 +12,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
+import mohawk.pieces.CAEntry;
+import mohawk.pieces.CREntry;
+import mohawk.pieces.PreCondition;
+
 import org.antlr.stringtemplate.StringTemplate;
 
 import antlr.RecognitionException;

src/mohawk/RBACParser.java → src/mohawk/rbac/RBACParser.java

 // $ANTLR 2.7.7 (20060906): "rbac.g" -> "RBACParser.java"$
 
-package mohawk;
+package mohawk.rbac;
 
 import java.util.Vector;
 import java.util.Stack;
 import java.util.HashMap;
 import java.util.Map;
+
 import mohawk.collections.PreCondProcessorInt;
 
 
+import mohawk.pieces.CAEntry;
+import mohawk.pieces.CREntry;
+import mohawk.pieces.PreCondition;
 import antlr.TokenBuffer;
 import antlr.TokenStreamException;
 import antlr.Token;