Changeset 6890 for ComponentRegistry/branches

Timestamp:

01/08/16 09:12:35 (9 years ago)

Author:

Twan Goosen

Message:

static getApplicationBaseURI method, now called from JSP configuration template. Fixes #844

Location:

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main

Files:

• java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (2 diffs)
• webapp/compRegConfig.jsp (modified) (4 diffs)

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -1615 +1615 @@
 
     /**
-     *
-     * @return The application's base URI as defined by the following context
-     * parameters:
-     *
-     * {@link APPLICATION_URL_BASE_PARAM},
-     *     {@link APPLICATION_URL_PATH_PARAM},
-     *     {@link APPLICATION_URL_PROTOCOL_HEADER_PARAM}, and
-     * {@link APPLICATION_URL_HOST_HEADER_PARAM}
-     *
-     * If correctly configured, it should look something like
-     * "http://catalog.clarin.eu/ds/ComponentRegistry". <em>Be aware that this
-     * can also be null if configured incorrectly!</em>
+     * 
+     * @see ComponentRegistryRestService#getApplicationBaseURI(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest) 
      */
-    private synchronized String getApplicationBaseURI() {
-        //TODO: Move logic to separate class so that it can also be used in the conig.jsp
-        final String path = servletContext.getInitParameter(APPLICATION_URL_PATH_PARAM);
-        if (path != null) {
-            final String protocolHeader = servletContext.getInitParameter(APPLICATION_URL_PROTOCOL_HEADER_PARAM);
-            final String hostHeader = servletContext.getInitParameter(APPLICATION_URL_HOST_HEADER_PARAM);
-            if (protocolHeader != null && hostHeader != null) {
-
-                return String.format("%s://%s%s",
-                        request.getHeader(protocolHeader),
-                        request.getHeader(hostHeader),
-                        request.getHeader(path)
-                );
-            } else {
-                final String base = servletContext.getInitParameter(APPLICATION_URL_BASE_PARAM);
-                return base + path;
-            }
-        }
-        LOG.error("Application URI could not be determined. Information available:\n"
-                + " {}: {}\n {}: {}\n {}: {}\n {}: {}",
-                APPLICATION_URL_PATH_PARAM, servletContext.getInitParameter(APPLICATION_URL_PATH_PARAM),
-                APPLICATION_URL_BASE_PARAM, servletContext.getInitParameter(APPLICATION_URL_BASE_PARAM),
-                APPLICATION_URL_PROTOCOL_HEADER_PARAM, servletContext.getInitParameter(APPLICATION_URL_PROTOCOL_HEADER_PARAM),
-                APPLICATION_URL_HOST_HEADER_PARAM, servletContext.getInitParameter(APPLICATION_URL_HOST_HEADER_PARAM)
-        );
-        throw new RuntimeException("Cannot determine application path");
+    private String getApplicationBaseURI() {
+        return getApplicationBaseURI(servletContext, request);
     }
 
@@ -2025 +1991 @@
     }
 
+    /**
+     *
+     * @return The application's base URI as defined by the following context
+     * parameters:
+     *
+     * {@link APPLICATION_URL_BASE_PARAM},
+     *     {@link APPLICATION_URL_PATH_PARAM},
+     *     {@link APPLICATION_URL_PROTOCOL_HEADER_PARAM}, and
+     * {@link APPLICATION_URL_HOST_HEADER_PARAM}
+     *
+     * If correctly configured, it should look something like
+     * "http://catalog.clarin.eu/ds/ComponentRegistry". <em>Be aware that this
+     * can also be null if configured incorrectly!</em>
+     */
+    public static String getApplicationBaseURI(ServletContext servletContext, HttpServletRequest request) {
+        final String path = servletContext.getInitParameter(APPLICATION_URL_PATH_PARAM);
+        if (path != null) {
+            final String protocolHeader = servletContext.getInitParameter(APPLICATION_URL_PROTOCOL_HEADER_PARAM);
+            final String hostHeader = servletContext.getInitParameter(APPLICATION_URL_HOST_HEADER_PARAM);
+            if (protocolHeader != null && hostHeader != null) {
+
+                return String.format("%s://%s%s",
+                        request.getHeader(protocolHeader),
+                        request.getHeader(hostHeader),
+                        request.getHeader(path)
+                );
+            } else {
+                final String base = servletContext.getInitParameter(APPLICATION_URL_BASE_PARAM);
+                return base + path;
+            }
+        }
+        LOG.error("Application URI could not be determined. Information available:\n"
+                + " {}: {}\n {}: {}\n {}: {}\n {}: {}",
+                APPLICATION_URL_PATH_PARAM, servletContext.getInitParameter(APPLICATION_URL_PATH_PARAM),
+                APPLICATION_URL_BASE_PARAM, servletContext.getInitParameter(APPLICATION_URL_BASE_PARAM),
+                APPLICATION_URL_PROTOCOL_HEADER_PARAM, servletContext.getInitParameter(APPLICATION_URL_PROTOCOL_HEADER_PARAM),
+                APPLICATION_URL_HOST_HEADER_PARAM, servletContext.getInitParameter(APPLICATION_URL_HOST_HEADER_PARAM)
+        );
+        throw new RuntimeException("Cannot determine application path");
+    }
+
 }

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/compRegConfig.jsp

@@ -1 +1 @@
 <%-- Configuration hosted next to the front end index page, from which it is loaded --%>
 <%@ page import="java.net.URI" %>
+<%@ page import="clarin.cmdi.componentregistry.rest.ComponentRegistryRestService" %>
 <%
     final String loglevelParam = request.getParameter("loglevel");
@@ -9 +10 @@
         loglevel = "info" ;
     }
+    
+    final String appUrl = ComponentRegistryRestService.getApplicationBaseURI(getServletContext(), request);
 %>
 {
@@ -14 +17 @@
   "cors": false,
   "REST": {
-    "url": "<%= application.getInitParameter("eu.clarin.cmdi.componentregistry.serviceRootUrl") %>"
+    "url": "<%= appUrl %>"
   },
   "backEndVersion": "${project.version}",
@@ -20 +23 @@
   "deploy": {
     "path": "<%= 
-                URI.create(application.getInitParameter("eu.clarin.cmdi.componentregistry.serviceRootUrl"))
-                        .getPath() //at same URL as app, so simply take path
+                URI.create(appUrl).getPath() //at same URL as app, so simply take path
             %>"
   }