Changeset 6890 for ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/compRegConfig.jsp

Timestamp:

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

Author:

Twan Goosen

Message:

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

File:

• ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/webapp/compRegConfig.jsp (modified) (4 diffs)

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
             %>"
   }