Merge pull request #1 from Gebbi8/master

include SBGN support into BiVeS webapp
SemsProject · Mar 20, 2017 · 30bd94d · 30bd94d
2 parents 8842393 + 7cdfa5f
commit 30bd94d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>de.unirostock.sems</groupId>
     <artifactId>BiVeS-WebApp</artifactId>
     <packaging>war</packaging>
-    <version>1.6.6</version>
+    <version>1.7.0</version>
     <name>BiVeS-WebApp</name>
     <url>http://sems.uni-rostock.de/projects/bives/</url>
     <developers>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>de.unirostock.sems</groupId>
             <artifactId>BiVeS</artifactId>
-            <version>1.9.2</version>
+            <version>1.10.0</version>
         </dependency>
         <dependency>
             <groupId>de.binfalse</groupId>

diff --git a/src/main/java/de/unirostock/sems/bives/webservice/WebQueryExecuter.java b/src/main/java/de/unirostock/sems/bives/webservice/WebQueryExecuter.java
@@ -61,6 +61,7 @@ public WebQueryExecuter ()
 		// we don't want to use local files.
 		FileRetriever.FIND_LOCAL = false;
 		exe = new Executer ();
+		LOGGER.setLevel(LOGGER.INFO);
 	}
 
 
@@ -213,6 +214,7 @@ else if (
 				o.getLongOpt ().equals (Executer.REQ_WANT_REACTIONS_DOT2) ||
 				o.getLongOpt ().equals (Executer.REQ_WANT_REACTIONS_GRAPHML2) ||
 				o.getLongOpt ().equals (Executer.REQ_WANT_REACTIONS_JSON2) ||
+				o.getLongOpt ().equals (Executer.REQ_WANT_REACTIONS_SBGN_JSON) ||
 				o.getLongOpt ().equals (Executer.REQ_WANT_COMP_HIERARCHY_DOT) ||
 				o.getLongOpt ().equals (Executer.REQ_WANT_COMP_HIERARCHY_GRAPHML) ||
 				o.getLongOpt ().equals (Executer.REQ_WANT_COMP_HIERARCHY_JSON) ||