[ctakes] branch main updated: Artemis should never need a javahome override.

[seanfinan]

This is an automated email from the ASF dual-hosted git repository.

seanfinan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ctakes.git


The following commit(s) were added to refs/heads/main by this push:
     new 0a16807  Artemis should never need a javahome override.
0a16807 is described below

commit 0a168074a784cd57defb80657af9f618d7e19c2a
Author: Sean Finan <sean.fi...@childrens.harvard.edu>
AuthorDate: Fri Jan 27 10:08:28 2023 -0500

    Artemis should never need a javahome override.
---
 .../main/java/org/apache/ctakes/pbj/ae/ArtemisStarter.java |  4 +---
 .../main/java/org/apache/ctakes/pbj/ae/ArtemisStopper.java |  4 +---
 .../java/org/apache/ctakes/pbj/util/ArtemisController.java | 14 --------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git 
a/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/ae/ArtemisStarter.java 
b/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/ae/ArtemisStarter.java
index bf35ed5..f8da0c5 100644
--- a/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/ae/ArtemisStarter.java
+++ b/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/ae/ArtemisStarter.java
@@ -61,9 +61,7 @@ public class ArtemisStarter extends ArtemisController {
       if ( _wait.equalsIgnoreCase( "yes" ) || _wait.equalsIgnoreCase( "true" ) 
) {
          runner.wait( true );
       }
-      if ( !setJavaHome() ) {
-         runner.setSetJavaHome( false );
-      }
+      runner.setSetJavaHome( false );
       LOGGER.info( "Starting Apache Artemis ..." );
       SystemUtil.run( runner );
       pause();
diff --git 
a/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/ae/ArtemisStopper.java 
b/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/ae/ArtemisStopper.java
index e9e7c7d..8327610 100644
--- a/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/ae/ArtemisStopper.java
+++ b/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/ae/ArtemisStopper.java
@@ -75,9 +75,7 @@ public class ArtemisStopper extends ArtemisController {
         if ( _wait.equalsIgnoreCase( "yes" ) || _wait.equalsIgnoreCase( "true" 
) ) {
             runner.wait( true );
         }
-        if ( !setJavaHome() ) {
-            runner.setSetJavaHome( false );
-        }
+        runner.setSetJavaHome( false );
         LOGGER.info( "Stopping Apache Artemis ..." );
         SystemUtil.run( runner );
     }
diff --git 
a/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/util/ArtemisController.java 
b/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/util/ArtemisController.java
index c6aefc1..793421e 100644
--- a/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/util/ArtemisController.java
+++ b/ctakes-pbj/src/main/java/org/apache/ctakes/pbj/util/ArtemisController.java
@@ -45,16 +45,6 @@ abstract public class ArtemisController extends 
PausableFileLoggerAE {
     )
     protected String _wait;
 
-    static public final String SET_JAVAHOME_PARAM = "SetJavaHome";
-    static public final String SET_JAVAHOME_DESC = "Set JAVA_HOME to the Java 
running cTAKES.  Default is yes.";
-    @ConfigurationParameter(
-          name = SET_JAVAHOME_PARAM,
-          description = SET_JAVAHOME_DESC,
-          defaultValue = "yes",
-          mandatory = false
-    )
-    private String _setJavaHome;
-
     /**
      *
      * @return a suffix for the default log file.
@@ -70,10 +60,6 @@ abstract public class ArtemisController extends 
PausableFileLoggerAE {
         return false;
     }
 
-    protected boolean setJavaHome() {
-        return _setJavaHome.equalsIgnoreCase( "yes" ) || 
_setJavaHome.equalsIgnoreCase( "true" );
-    }
-
     /**
      *
      * {@inheritDoc}