Changeset 35663

Timestamp:

2021-10-21T19:39:04+13:00 (3 years ago)

Author:

davidb

Message:

Some tidy up to print statements, and Vendor test expanded to be inclusive of OpenJDK

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -316 +316 @@
             // check that we are using Sun Java
             String java_vendor = System.getProperty("java.vendor");
+            String java_runtime_name = System.getProperty("java.runtime.name");
+
+            
             if (!java_vendor.equals("Sun Microsystems Inc.")
-                && !java_vendor.equals("Oracle Corporation")) {
-                System.err.println(Dictionary.get("General.NotSunJava", java_vendor));
+                && !java_vendor.equals("Oracle Corporation")
+                && !java_runtime_name.equals("OpenJDK Runtime Environment")) {
+                // OK, so the dictionary key label is a bit apocryphal these days, but it gets the job done
+                System.err.println(Dictionary.get("General.NotSunJava", java_vendor));
             }
 
@@ -421 +426 @@
                         // (tomcat and networked Derby Server) by calling GS3ServerThread.stopServer()
                         if(!GS3ServerThread.wasServerLaunchedOutsideGLI()) {
-                            System.err.println("Attempting to forcibly terminate the GS server...");
+                            System.err.println("Attempting to forcibly terminate the GS server...");
                             GS3ServerThread.stopServer();
                         } else {
-                            System.err.println("@@@ Tomcat was launched outside GLI. Leaving it running...");
+                            System.err.println("Tomcat was launched outside GLI. Leaving it running...");
                         }
                         } else { // issue the call to stop any running GS2 local library server
                         if (LocalLibraryServer.isRunning() == true) {
-                            System.err.println("Attempting to forcibly terminate the GS server...");
+                            System.err.println("Attempting to forcibly terminate the GS server...");
                             LocalLibraryServer.forceStopServer();
                         }
@@ -836 +841 @@
             GS3ServerThread.stopServer();
             } else {
-            System.err.println("@@@ Tomcat was launched outside GLI. Leaving it running...");
+            System.err.println("Tomcat was launched outside GLI. Leaving it running...");
             }
             
@@ -1139 +1144 @@
 
         if (Configuration.library_url == null){
-            System.out.println("Error: you have not provided the Greenstone Library address.");  
+            System.err.println("Error: you have not provided the Greenstone Library address.");  
             return;
 
@@ -1827 +1832 @@
                     cmd_list.add(Configuration.perl_path);
                 } else {
-                    System.err.println("***** ImageMagickTest Warning: Perl_path not set, calling 'perl' instead.");
+                    System.err.println("Warning: ImageMagickTest::found() perl_path not set, calling 'perl' instead.");
                     cmd_list.add("perl");
                 }