JSTL vs Paths (#2814)

fixes #2806

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/web/PageConfig.java

@@ -37,6 +37,7 @@
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1750,4 +1751,13 @@ public boolean isNotModified(HttpServletRequest request, HttpServletResponse res
         response.setHeader(HttpHeaders.ETAG, currentEtag);
         return false;
     }
+
+    /**
+     * @param root root path
+     * @param path path
+     * @return path relative to root
+     */
+    public static String getRelativePath(String root, String path) {
+        return Paths.get(root).relativize(Paths.get(path)).toString();
+    }
 }

opengrok-web/src/main/webapp/WEB-INF/tags/repository.tag

@@ -19,7 +19,6 @@ CDDL HEADER END
 Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright (c) 2019, Krystof Tulinger <[email protected]>.
 --%>
-<%@ tag import="java.nio.file.Paths" %>
 <%@ tag import="org.apache.commons.lang3.ObjectUtils" %>
 <%@ tag import="org.opengrok.indexer.web.Prefix" %>
 <%@ tag import="org.opengrok.indexer.web.Util" %>
@@ -42,7 +41,7 @@ Portions Copyright (c) 2019, Krystof Tulinger <[email protected]>.
 
 <c:if test="${isSubrepository}">
     <c:set var="name"
-           value="${Paths.get(pageConfig.sourceRootPath).relativize(Paths.get(repositoryInfo.directoryName))}"/>
+           value="${pageConfig.getRelativePath(pageConfig.sourceRootPath, repositoryInfo.directoryName)}"/>
 </c:if>
 
 <c:if test="${isSubrepository && isFirst}">