Merge branch 'master' of src.galois.com:/srv/git/FiveUI

22 files changed, 79 insertions, 225 deletions

diff --git a/Config.mk.sample b/Config.mk.sample
index 8685ab9..fc50f53 100644
--- a/Config.mk.sample
+++ b/Config.mk.sample
@@ -3,3 +3,4 @@ phantomjs-cmd     ?= $(call find-cmd,phantomjs)
 maven-cmd         ?= $(call find-cmd,mvn)
 pandoc-cmd        ?= $(call find-cmd,pandoc)
 addon-sdk-version ?= 1.14
+firefox_bin_path  ?= $(call find-cmd,firefox)
\ No newline at end of file
diff --git a/src/batchtools/.gitignore b/src/batchtools/.gitignore
index 24318ea..439ea6e 100644
--- a/src/batchtools/.gitignore
+++ b/src/batchtools/.gitignore
@@ -1 +1,2 @@
 .settings/
+.project
diff --git a/src/batchtools/build.mk b/src/batchtools/build.mk
index d772607..1b71531 100644
--- a/src/batchtools/build.mk
+++ b/src/batchtools/build.mk
@@ -12,7 +12,7 @@ test-batchtools:            \
   $(build-dir)/fiveui.xpi   \
   $(topdir)/profiles/firefox
 	$(call label,BATCHTEST)(cd $(batchtools-dir) \
-	  && xvfb-run -a $(maven-cmd) test)
+	  && xvfb-run -a $(maven-cmd) test -DFIREFOX_BIN_PATH=$(firefox_bin_path))
 
 clean::
 	(cd $(batchtools-dir) && $(maven-cmd) clean)
diff --git a/src/batchtools/headless/.classpath b/src/batchtools/headless/.classpath
deleted file mode 100644
index beba987..0000000
--- a/src/batchtools/headless/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/src/batchtools/headless/.gitignore b/src/batchtools/headless/.gitignore
index 24c4165..ac34e0e 100644
--- a/src/batchtools/headless/.gitignore
+++ b/src/batchtools/headless/.gitignore
@@ -1,2 +1,5 @@
 target
 programs.properties
+.classpath
+.settings
+.project
diff --git a/src/batchtools/headless/.settings/org.eclipse.core.resources.prefs b/src/batchtools/headless/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cdfe4f1..0000000
--- a/src/batchtools/headless/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/src/batchtools/headless/.settings/org.eclipse.jdt.core.prefs b/src/batchtools/headless/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca..0000000
--- a/src/batchtools/headless/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/src/batchtools/headless/.settings/org.eclipse.m2e.core.prefs b/src/batchtools/headless/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/src/batchtools/headless/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/src/batchtools/headless/pom.xml b/src/batchtools/headless/pom.xml
index da5b348..1b84aaa 100644
--- a/src/batchtools/headless/pom.xml
+++ b/src/batchtools/headless/pom.xml
@@ -2,12 +2,16 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.galois.fiveui</groupId>
+  <parent>
+    <groupId>com.galois.fiveui</groupId>
+	  <artifactId>BatchTools</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+
   <artifactId>HeadlessRunner</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -63,16 +67,6 @@
 
   <dependencies>
     <dependency>
-    	<groupId>org.seleniumhq.selenium</groupId>
-    	<artifactId>selenium-java</artifactId>
-    	<version>2.26.0</version>
-    </dependency>
-    <dependency>
-    	<groupId>com.google.guava</groupId>
-    	<artifactId>guava</artifactId>
-    	<version>13.0.1</version>
-    </dependency>
-    <dependency>
     	<groupId>com.google.code.gson</groupId>
     	<artifactId>gson</artifactId>
     	<version>2.2.2</version>
@@ -80,17 +74,12 @@
     <dependency>
     	<groupId>com.galois.fiveui</groupId>
     	<artifactId>webdrivers</artifactId>
-    	<version>0.0.1-SNAPSHOT</version>
+    	<version>${project.version}</version>
     </dependency>
     <dependency>
     	<groupId>com.galois.fiveui</groupId>
     	<artifactId>RuleSetTester</artifactId>
-    	<version>1.0</version>
-    </dependency>
-    <dependency>
-    	<groupId>junit</groupId>
-    	<artifactId>junit</artifactId>
-    	<version>4.9</version>
+    	<version>${project.version}</version>
     </dependency>
     <dependency>
     	<groupId>edu.uci.ics</groupId>
diff --git a/src/batchtools/pom.xml b/src/batchtools/pom.xml
index 548cc0f..a572219 100644
--- a/src/batchtools/pom.xml
+++ b/src/batchtools/pom.xml
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.galois.fiveui</groupId>
 	<artifactId>BatchTools</artifactId>
-	<version>1.0</version>
+	<version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
@@ -33,4 +33,39 @@
     <module>headless</module>
   </modules>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+    	<groupId>org.seleniumhq.selenium</groupId>
+    	<artifactId>selenium-java</artifactId>
+    	<version>2.33.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>13.0.1</version>
+    </dependency>
+
+
+    <dependency>
+    	<groupId>junit</groupId>
+    	<artifactId>junit</artifactId>
+    	<version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/src/batchtools/rsTester/.classpath b/src/batchtools/rsTester/.classpath
deleted file mode 100644
index 9fc2de7..0000000
--- a/src/batchtools/rsTester/.classpath
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/src/batchtools/rsTester/.gitignore b/src/batchtools/rsTester/.gitignore
index 7e7291c..ac34e0e 100644
--- a/src/batchtools/rsTester/.gitignore
+++ b/src/batchtools/rsTester/.gitignore
@@ -1,2 +1,5 @@
 target
-doc
+programs.properties
+.classpath
+.settings
+.project
diff --git a/src/batchtools/rsTester/.settings/org.ebayopensource.vjet.eclipse.core.prefs b/src/batchtools/rsTester/.settings/org.ebayopensource.vjet.eclipse.core.prefs
deleted file mode 100644
index 6e8a644..0000000
--- a/src/batchtools/rsTester/.settings/org.ebayopensource.vjet.eclipse.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-initialized_project_from_v4classpath=true
diff --git a/src/batchtools/rsTester/.settings/org.eclipse.jdt.core.prefs b/src/batchtools/rsTester/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca..0000000
--- a/src/batchtools/rsTester/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/src/batchtools/rsTester/.settings/org.eclipse.m2e.core.prefs b/src/batchtools/rsTester/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/src/batchtools/rsTester/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/src/batchtools/rsTester/.settings/org.maven.ide.eclipse.prefs b/src/batchtools/rsTester/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 0512605..0000000
--- a/src/batchtools/rsTester/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Jan 10 18:30:41 PST 2012
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/src/batchtools/rsTester/pom.xml b/src/batchtools/rsTester/pom.xml
index b3d637f..95d27e3 100644
--- a/src/batchtools/rsTester/pom.xml
+++ b/src/batchtools/rsTester/pom.xml
@@ -21,9 +21,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.galois.fiveui</groupId>
+
+  <parent>
+    <groupId>com.galois.fiveui</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>BatchTools</artifactId>
+    <relativePath>../</relativePath>
+  </parent>
+
 	<artifactId>RuleSetTester</artifactId>
-	<version>1.0</version>
+  <packaging>jar</packaging>
 
   <pluginRepositories>
     <pluginRepository>
@@ -77,16 +84,6 @@
 	</reporting>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-java</artifactId>
-			<version>2.25.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>10.0.1</version>
-		</dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -95,15 +92,7 @@
 		<dependency>
 		    <groupId>com.galois.fiveui</groupId>
 		    <artifactId>webdrivers</artifactId>
-		    <version>0.0.1-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Test dependencies -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
+		    <version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/src/batchtools/webdrivers/.classpath b/src/batchtools/webdrivers/.classpath
deleted file mode 100644
index 75e85b7..0000000
--- a/src/batchtools/webdrivers/.classpath
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/src/batchtools/webdrivers/.gitignore b/src/batchtools/webdrivers/.gitignore
index eb5a316..ac34e0e 100644
--- a/src/batchtools/webdrivers/.gitignore
+++ b/src/batchtools/webdrivers/.gitignore
@@ -1 +1,5 @@
 target
+programs.properties
+.classpath
+.settings
+.project
diff --git a/src/batchtools/webdrivers/.settings/org.eclipse.jdt.core.prefs b/src/batchtools/webdrivers/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca..0000000
--- a/src/batchtools/webdrivers/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/src/batchtools/webdrivers/.settings/org.eclipse.m2e.core.prefs b/src/batchtools/webdrivers/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/src/batchtools/webdrivers/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/src/batchtools/webdrivers/pom.xml b/src/batchtools/webdrivers/pom.xml
index 4d8847f..f08b04f 100644
--- a/src/batchtools/webdrivers/pom.xml
+++ b/src/batchtools/webdrivers/pom.xml
@@ -1,43 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.galois.fiveui</groupId>
-  <artifactId>webdrivers</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <name>Web Drivers</name>
-  <description>Wrapper around Selenium Web Driver creation to handle configuration details that we wish to be uniform across all FiveUI applications.</description>
 
-  <build>
-    <plugins>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <parent>
+    <groupId>com.galois.fiveui</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>BatchTools</artifactId>
+    <relativePath>../</relativePath>
+  </parent>
 
-  <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.9</version>
-            <scope>test</scope>
-        </dependency>
+  <artifactId>webdrivers</artifactId>
+  <packaging>jar</packaging>
+  <name>Web Drivers</name>
 
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>2.25.0</version>
-        </dependency>
+  <description>Wrapper around Selenium Web Driver creation to handle configuration details that we wish to be uniform across all FiveUI applications.</description>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>10.0.1</version>
-        </dependency>
-  </dependencies>
 </project>