Changeset 34113

Timestamp:

2020-05-19T11:34:40+12:00 (4 years ago)

Author:

ak19

Message:

1. tomcat.port no longer exists in build.properties after https also supported. GLI now goes through ProtocolPortProperties.java (which supports legacy tomcat.port) to work out the port number and the protocol, just like GS3 runtime code has been doing for a while now. The greenstone3 context is also not to be hardcoded to greenstone3, but to be read in from the build.properties file. 2. Have to add a copy of GS3 runtime src's ProtocolPortProperties.java into GLI. Anything better than such code duplication? GLI also has what is largely a copy of SafeProcess.java, although there may be minor diffs there with the GS3 runtime code version. 3. Removed unused imports from FedoraLogin.java.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (4 diffs)
• greenstone3/ProtocolPortProperties.java (added)
• gui/FedoraLogin.java (modified) (1 diff)

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

@@ -51 +51 @@
 import org.greenstone.gatherer.greenstone.LocalLibraryServer;
 import org.greenstone.gatherer.greenstone.Plugins;
+import org.greenstone.gatherer.greenstone3.ProtocolPortProperties;
 import org.greenstone.gatherer.greenstone3.ServletConfiguration;
 import org.greenstone.gatherer.gui.GUIManager;
@@ -1252 +1253 @@
         // specified in the build.properties located in the gsdl3_src_path 
         if (GS3) {
+            // defaults
             String host = "localhost";
             String port = "8383";
+            String context = "greenstone3";
+            String protocol = "http";
             
             File buildPropsFile = new File(Configuration.gsdl3_src_path + File.separator + "build.properties");
@@ -1260 +1264 @@
                 try{
                     props.load(new FileInputStream(buildPropsFile));
-                    host = props.getProperty("tomcat.server", host); 
-                    port = props.getProperty("tomcat.port", port);
+                    host = props.getProperty("tomcat.server", host);
+                    context = props.getProperty("greenstone.context", context);
+                    ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(props); // can throw Exception
+                    // Use ProtocolPortProperties to get the tomcat port and protocol used
+                    protocol = protocolPortProps.getProtocol();
+                    port = protocolPortProps.getPort();
                 }catch(Exception e){
                     DebugStream.println("Could not load build.properties file");
@@ -1268 +1276 @@
                 props = null;
             }
-            String defaultURL = "http://"+host+":"+port+"/"+"greenstone3";
+            String defaultURL = protocol+"://"+host+":"+port+"/"+context;
             field.setText(defaultURL);
             field.selectAll();

main/trunk/gli/src/org/greenstone/gatherer/gui/FedoraLogin.java

@@ -37 +37 @@
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;