Merge pull request #28 from Comcast/MergeBullkBuild

v2.1

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="com/comcast/oscar/test/|com/comcast/oscar/examples/" kind="src" path="src"/>
+	<classpathentry excluding="com/comcast/oscar/examples/doc/|com/comcast/oscar/examples/testfiles/|com/comcast/oscar/examples/|com/comcast/oscar/test/" kind="src" path="src"/>
 	<classpathentry kind="src" path="res"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-cli-1.2.jar"/>

.gitignore

@@ -1,22 +1,22 @@
-# Files #
-*.class
-.classpath
-DottedTextualNetSNMPMap.*
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-snmp4j-smi.jar
-*.war
-*.ear
-
-# Documentation
-*.pdf
-
-# Directories #
-test/
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-/bin/
+# Files #
+*.class
+.classpath
+DottedTextualNetSNMPMap.*
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+snmp4j-smi.jar
+*.war
+*.ear
+
+# Documentation
+*.pdf
+
+# Directories #
+test/
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/bin/

.project

@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>OSCAR</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.sirius.nature.modelingproject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>OSCAR</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sourceforge.metrics.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.sirius.nature.modelingproject</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sourceforge.metrics.nature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,12 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

ANTLR/bin/ANT.xml

@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="create_run_jar" name="Create Runnable Jar for Project Oscar with Jar-in-Jar Loader">
-    <!--this file was created by Eclipse Runnable JAR Export Wizard-->
-    <!--ANT 1.7 is required                                        -->
-    <target name="create_run_jar">
-        <jar destfile="C:/Users/mgarci00/Downloads/OscarReleases/oscar.jar">
-            <manifest>
-                <attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
-                <attribute name="Rsrc-Main-Class" value="com.comcast.oscar.parserbuilder.Main"/>
-                <attribute name="Class-Path" value="."/>
-                <attribute name="Rsrc-Class-Path" value="./ commons-cli-1.2.jar json-2.1.jar sqlite-jdbc-3.7.15-M1.jar zip4j_1.3.2.jar antlr-4.1-complete.jar snmp4j-2.3.0.jar jackson-core-2.5.0.jar jackson-annotations-2.5.0.jar jackson-databind-2.5.3.jar"/>
-            </manifest>
-            <zipfileset src="jar-in-jar-loader.zip"/>
-            <fileset dir="C:/Users/mgarci00/Documents/EclipseWorkSpace/Oscar/bin"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="commons-cli-1.2.jar"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="json-2.1.jar"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="sqlite-jdbc-3.7.15-M1.jar"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="zip4j_1.3.2.jar"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="antlr-4.1-complete.jar"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="snmp4j-2.3.0.jar"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="jackson-core-2.5.0.jar"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="jackson-annotations-2.5.0.jar"/>
-            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="jackson-databind-2.5.3.jar"/>
-        </jar>
-    </target>
-</project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="create_run_jar" name="Create Runnable Jar for Project Oscar with Jar-in-Jar Loader">
+    <!--this file was created by Eclipse Runnable JAR Export Wizard-->
+    <!--ANT 1.7 is required                                        -->
+    <target name="create_run_jar">
+        <jar destfile="C:/Users/mgarci00/Downloads/OscarReleases/oscar.jar">
+            <manifest>
+                <attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
+                <attribute name="Rsrc-Main-Class" value="com.comcast.oscar.parserbuilder.Main"/>
+                <attribute name="Class-Path" value="."/>
+                <attribute name="Rsrc-Class-Path" value="./ commons-cli-1.2.jar json-2.1.jar sqlite-jdbc-3.7.15-M1.jar zip4j_1.3.2.jar antlr-4.1-complete.jar snmp4j-2.3.0.jar jackson-core-2.5.0.jar jackson-annotations-2.5.0.jar jackson-databind-2.5.3.jar"/>
+            </manifest>
+            <zipfileset src="jar-in-jar-loader.zip"/>
+            <fileset dir="C:/Users/mgarci00/Documents/EclipseWorkSpace/Oscar/bin"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="commons-cli-1.2.jar"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="json-2.1.jar"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="sqlite-jdbc-3.7.15-M1.jar"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="zip4j_1.3.2.jar"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="antlr-4.1-complete.jar"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="snmp4j-2.3.0.jar"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="jackson-core-2.5.0.jar"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="jackson-annotations-2.5.0.jar"/>
+            <zipfileset dir="C:\Users\mgarci00\Documents\EclipseWorkSpace\Oscar\lib" includes="jackson-databind-2.5.3.jar"/>
+        </jar>
+    </target>
+</project>

ANTLR/doc/README

@@ -1 +1 @@
-https://pragprog.com/book/tpantlr2/the-definitive-antlr-4-reference
+https://pragprog.com/book/tpantlr2/the-definitive-antlr-4-reference

CONTRIBUTING

@@ -1,7 +1,7 @@
-If you would like to contribute code to this project you can do so through GitHub by forking the repository and sending a pull request.
-
-Before Comcast accepts your code into the project you must sign the Comcast Contributor License Agreement (CLA).
-
-If you haven�t previously signed a Comcast CLA, we can e-mail you a PDF that you can sign and scan back to us. 
-
+If you would like to contribute code to this project you can do so through GitHub by forking the repository and sending a pull request.
+
+Before Comcast accepts your code into the project you must sign the Comcast Contributor License Agreement (CLA).
+
+If you haven�t previously signed a Comcast CLA, we can e-mail you a PDF that you can sign and scan back to us. 
+
 Please send us an e-mail or create a new GiHhub issue to request a PDF version of the CLA.