Merge pull request #107 from batfish/unstable

prepare for 0.16.0
batfish · Apr 13, 2017 · 4f1f2b3 · 4f1f2b3
2 parents 78c91ac + b11ddea
commit 4f1f2b3
Show file tree

Hide file tree

Showing 70 changed files with 844 additions and 1,680 deletions.
diff --git a/projects/batfish-client/.classpath b/projects/batfish-client/.classpath
@@ -32,7 +32,7 @@
 	<classpathentry kind="lib" path="lib/jaxrs-ri/lib/jersey-media-jaxb-2.16.jar"/>
 	<classpathentry kind="lib" path="lib/jaxrs-ri/lib/jersey-server-2.16.jar"/>
 	<classpathentry kind="lib" path="lib/jersey/jersey-media-json-jettison-2.16.jar"/>
-	<classpathentry kind="lib" path="lib/jettison/jettison-1.3.jar"/>
+	<classpathentry kind="lib" path="lib/jettison/jettison-1.3.jar" sourcepath="lib/jettison/jettison-1.3-sources.jar"/>
 	<classpathentry kind="lib" path="lib/jaxrs-ri/api/javax.ws.rs-api-2.0.1.jar" sourcepath="lib/jaxrs-ri/api/javax.ws.rs-api-2.0.1-sources.jar"/>
 	<classpathentry kind="lib" path="lib/jaxrs-ri/ext/mimepull-1.9.5.jar"/>
 	<classpathentry kind="lib" path="lib/jaxrs-ri/lib/jersey-media-multipart-2.17.jar"/>

diff --git a/projects/batfish-client/src/org/batfish/client/BfCoordWorkHelper.java b/projects/batfish-client/src/org/batfish/client/BfCoordWorkHelper.java
@@ -839,7 +839,7 @@ public boolean uploadEnvironment(String containerName, String testrigName,
    }
 
    public boolean uploadQuestion(String containerName, String testrigName,
-         String qName, String qFileName, String paramsFilename) {
+         String qName, String qFileName) {
       try {
 
          Client client = getClientBuilder().build();
@@ -857,15 +857,12 @@ public boolean uploadQuestion(String containerName, String testrigName,
                testrigName);
          addTextMultiPart(multiPart, CoordConsts.SVC_QUESTION_NAME_KEY, qName);
          addFileMultiPart(multiPart, CoordConsts.SVC_FILE_KEY, qFileName);
-         addFileMultiPart(multiPart, CoordConsts.SVC_FILE2_KEY, paramsFilename);
 
          return postData(webTarget, multiPart) != null;
       }
       catch (Exception e) {
          if (e.getMessage().contains("FileNotFoundException")) {
-            _logger.errorf(
-                  "File not found: %s (question file) or %s (temporary params file) \n",
-                  qFileName, paramsFilename);
+            _logger.errorf("File not found: %s (question file)\n", qFileName);
          }
          else {
             _logger.errorf(