Changeset 37136 for main

Timestamp:

2023-01-15T00:52:24+13:00 (15 months ago)

Author:

davidb

Message:

LibraryServlet.java changed to test for GlobalProperties revproxy.protocol, revproxy_domain etc, and if they exists set servlet_protocol, servlet_domain etc as InterfaceOptions. If they don't exist then the values default back to servlet.protocol (localhost) etc values.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• LibraryServlet.java (modified) (1 diff)
• util/GSConstants.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -222 +222 @@
       }
 
-    String greenstone_context = GlobalProperties.getGSDL3WebAddress();
-    config_params.put(GSConstants.SERVLET_CONTEXT, greenstone_context);
+    // The following is now superceeded by the for-loop below
+    //String greenstone_context = GlobalProperties.getGSDL3WebAddress();
+    //config_params.put(GSConstants.SERVLET_CONTEXT, greenstone_context);
+
+    String[] servlet_url_parts  = { GSConstants.SERVLET_PROTOCOL,  GSConstants.SERVLET_DOMAIN,  GSConstants.SERVLET_OPT_PORT,  GSConstants.SERVLET_CONTEXT };
+    String[] servlet_url_props  = { "server.protocol",   "tomcat.server",   "tomcat.port",       "tomcat.context" };
+    String[] revproxy_url_props = { "revproxy.protocol", "revproxy.domain", "revproxy.opt_port", "revproxy.context" };
+
+    boolean explicit_revproxy_domain = false;
+    
+    for (int i=0; i<servlet_url_parts.length; i++) {
+    String servlet_part_name = servlet_url_parts[i];
+
+    String revproxy_prop_name = revproxy_url_props[i];
+    String servlet_prop_name  = servlet_url_props[i];   
+
+    String revproxy_prop_val = GlobalProperties.getProperty(revproxy_prop_name);    
+    String servlet_prop_val  = GlobalProperties.getProperty(servlet_prop_name);
+
+    String unassigned_prop_val = "${" + revproxy_prop_name + "}";
+    
+    if (revproxy_prop_val.equals(unassigned_prop_val)) {
+        // default to SERVLET version of val
+        // with a special exception if the port
+        if (revproxy_prop_name.equals("revproxy.opt_port")) {
+        if (explicit_revproxy_domain) {
+            // explicitly set revproxy.domain, but provided no revproxy.opt_port
+            // => set to be the empty string
+            config_params.put(servlet_part_name, "");
+        }
+        else {
+            // No explicity revproxy domain => default back to the servlet provied port
+            config_params.put(servlet_part_name, servlet_prop_val);
+        }
+        }
+        else {
+        // Regular case => default back to the value provided for 'servlet'
+        config_params.put(servlet_part_name, servlet_prop_val);
+        }
+    }
+    else {
+        // Have a non-trival revproxy part val => use that (public facing) value to embed into web browser pages
+        config_params.put(servlet_part_name, revproxy_prop_val);
+
+        if (revproxy_prop_name.equals("revproxy.domain")) {
+        explicit_revproxy_domain = true;
+        }
+    }   
+    }
+    
     
     // the receptionist -the servlet will talk to this

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSConstants.java

@@ -24 +24 @@
     public static final String GSDL3_HOME = "gsdl3_home";
     public static final String INTERFACE_NAME = "interface_name";
-    public static final String SITE_NAME = "site_name";
-    public static final String LIBRARY_NAME = "library_name";
-  public static final String SERVLET_CONTEXT = "servlet_context";
+    public static final String SITE_NAME      = "site_name";
+    public static final String LIBRARY_NAME   = "library_name";
+
+        public static final String SERVLET_PROTOCOL  = "servlet_protocol";
+        public static final String SERVLET_DOMAIN    = "servlet_domain";
+        public static final String SERVLET_OPT_PORT  = "servlet_opt_port";
+        public static final String SERVLET_CONTEXT   = "servlet_context";
+
     public static final String BASE_INTERFACES = "base_interfaces";
     public static final String DEFAULT_LANG = "default_lang";