Switched default processor to BioNLPProcessor rather than the server.…

… The client/server config remains available.

CHANGES.md

@@ -1,6 +1,7 @@
 #Changes
 =======
 
++ **1.4.1** - Switched default processor to BioNLPProcessor rather than the server. The client/server config remains available.
 + **1.4.1** - Update to use released Processors 6.3.0 as new Reach base. Update Scala to 2.11.11.
 + **1.4.1** - Update Wiki pages on configuring and running Reach. Update README and CHANGES files.
 + **1.4.1** - Add argument to restrict NXML input file size.

main/src/main/resources/application.conf

@@ -77,8 +77,8 @@ logging {
 
 # Processor Annotator choice and configuration
 processorAnnotator {
-  // select which processor annotator type to use: "clu", "clubio", or "server"
-  type = "server"
+  // select which processor annotator type to use: "bionlp", "clu", "clubio", or "server"
+  type = "bionlp"
 }
 
 # restart configuration

main/src/main/scala/org/clulab/reach/ProcessorAnnotatorFactory.scala

@@ -6,6 +6,7 @@ import com.typesafe.scalalogging.LazyLogging
 import org.clulab.processors.ProcessorAnnotator
 import org.clulab.processors.client.ProcessorClient
 import org.clulab.processors.clu.{ BioCluProcessor, CluProcessor }
+import org.clulab.processors.bionlp.BioNLPProcessor
 
 /**
   * Factory object which selects and returns a ProcessorAnnotator, configured from
@@ -30,6 +31,7 @@ object ProcessorAnnotatorFactory extends LazyLogging {
   /** Instantiate and return a processor annotator using the given configuration. */
   private def makeProcessorAnnotator (config: Config): ProcessorAnnotator = {
     config.getString("processorAnnotator.type") match {
+      case "bionlp" => new BioNLPProcessor()
       case "clu"    => new CluProcessor()
       case "clubio" => new BioCluProcessor()
       case "server" => ProcessorClient.instance

runAllTests.sh

@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 
+# uncomment the lines below if processorAnnotator.type = "server"
 # start up the Processors Server for tests to run against:
-echo 'Starting Processor Server...'
-sbt 'run-main org.clulab.processors.server.ProcessorServer' &
-sleep 20
+#echo 'Starting Processor Server...'
+#sbt 'run-main org.clulab.processors.server.ProcessorServer' &
+#sleep 20
 
 sbt test
 sbt main/test
 sbt causalAssembly/test
 sbt export/test
 
-echo 'Stopping Processor Server...'
-sbt 'run-main org.clulab.processors.csshare.ShutdownProcessorServer'
+#echo 'Stopping Processor Server...'
+#sbt 'run-main org.clulab.processors.csshare.ShutdownProcessorServer'

runReachCLI.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
-echo 'Starting Processor Server...'
-sbt 'run-main org.clulab.processors.server.ProcessorServer' &
-sleep 20
+# uncomment the lines below if processorAnnotator.type = "server"
+#echo 'Starting Processor Server...'
+#sbt 'run-main org.clulab.processors.server.ProcessorServer' &
+#sleep 20
 
 echo 'Running Reach CLI...'
 sbt 'run-main org.clulab.reach.RunReachCLI'

runReachShell.sh

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 
-echo 'Starting Processor Server...'
-sbt 'run-main org.clulab.processors.server.ProcessorServer' >/dev/null 2>&1 &
-sleep 20
+# uncomment the lines below if processorAnnotator.type = "server"
+#echo 'Starting Processor Server...'
+#sbt 'run-main org.clulab.processors.server.ProcessorServer' >/dev/null 2>&1 &
+#sleep 20
 
 echo 'Starting Reach Shell...'
 sbt 'run-main org.clulab.reach.ReachShell'
 
-echo 'Stopping Processor Server...'
-sbt 'run-main org.clulab.processors.csshare.ShutdownProcessorServer'
+#echo 'Stopping Processor Server...'
+#sbt 'run-main org.clulab.processors.csshare.ShutdownProcessorServer'