Merge remote-tracking branch 'upstream/master' into mavenize

# Conflicts:
#	jrcs/pom.xml
#	opengrok-indexer/pom.xml
#	opengrok-web/pom.xml
#	plugins/pom.xml
#	pom.xml

Author: ahornace

distribution/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opengrok</groupId>
     <artifactId>opengrok-top</artifactId>
-    <version>1.1-rc29</version>
+    <version>1.1-rc30</version>
   </parent>
 
   <artifactId>opengrok-dist</artifactId>
@@ -24,13 +24,13 @@
     <dependency>
       <groupId>org.opengrok</groupId>
       <artifactId>opengrok</artifactId>
-      <version>1.1-rc29</version>
+      <version>1.1-rc30</version>
     </dependency>
 
     <dependency>
       <groupId>org.opengrok</groupId>
       <artifactId>opengrok-web</artifactId>
-      <version>1.1-rc29</version>
+      <version>1.1-rc30</version>
       <type>war</type>
     </dependency>
   </dependencies>

jrcs/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opengrok</groupId>
         <artifactId>opengrok-top</artifactId>
-        <version>1.1-rc29</version>
+        <version>1.1-rc30</version>
     </parent>
 
     <artifactId>jrcs</artifactId>
     <packaging>jar</packaging>
-    <version>1.1-rc29</version>
+    <version>1.1-rc30</version>
 
     <name>Java RCS</name>
 

opengrok-indexer/pom.xml

@@ -28,11 +28,11 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
     <parent>
         <groupId>org.opengrok</groupId>
         <artifactId>opengrok-top</artifactId>
-        <version>1.1-rc29</version>
+        <version>1.1-rc30</version>
     </parent>
 
     <artifactId>opengrok</artifactId>
-    <version>1.1-rc29</version>
+    <version>1.1-rc30</version>
     <packaging>jar</packaging>
 
     <name>OpenGrok Indexer</name>

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/Configuration.java

@@ -143,6 +143,10 @@ public final class Configuration {
     private Set<Group> groups;
     private String sourceRoot;
     private String dataRoot;
+    /**
+     * directory with include files for web application (header, footer, etc.)
+     */
+    private String includeRoot;
     private List<RepositoryInfo> repositories;
     /**
      * @deprecated This is kept around so not to break object deserialization
@@ -804,6 +808,18 @@ public void setDataRoot(String dataRoot) {
         this.dataRoot = dataRoot;
     }
 
+    /**
+     * If {@link includeRoot} is not set, {@link dataRoot} will be returned.
+     * @return web include root directory
+     */
+    public String getIncludeRoot() {
+        return includeRoot != null ? includeRoot : dataRoot;
+    }
+    
+    public void setIncludeRoot(String newRoot) {
+        this.includeRoot = newRoot;
+    }
+    
     public List<RepositoryInfo> getRepositories() {
         return repositories;
     }
@@ -1175,13 +1191,14 @@ private static String getFileContent(File file) {
     /**
      * Get the contents of the footer include file.
      *
+     * @param force if true, reload even if already set
      * @return an empty string if it could not be read successfully, the
      * contents of the file otherwise.
      * @see #FOOTER_INCLUDE_FILE
      */
-    public String getFooterIncludeFileContent() {
-        if (footer == null) {
-            footer = getFileContent(new File(getDataRoot(), FOOTER_INCLUDE_FILE));
+    public String getFooterIncludeFileContent(boolean force) {
+        if (footer == null || force) {
+            footer = getFileContent(new File(getIncludeRoot(), FOOTER_INCLUDE_FILE));
         }
         return footer;
     }
@@ -1197,17 +1214,18 @@ public String getFooterIncludeFileContent() {
     /**
      * Get the contents of the header include file.
      *
+     * @param force if true, reload even if already set
      * @return an empty string if it could not be read successfully, the
      * contents of the file otherwise.
      * @see #HEADER_INCLUDE_FILE
      */
-    public String getHeaderIncludeFileContent() {
-        if (header == null) {
-            header = getFileContent(new File(getDataRoot(), HEADER_INCLUDE_FILE));
+    public String getHeaderIncludeFileContent(boolean force) {
+        if (header == null || force) {
+            header = getFileContent(new File(getIncludeRoot(), HEADER_INCLUDE_FILE));
         }
         return header;
     }
-
+    
     /**
      * The name of the file relative to the <var>DATA_ROOT</var>, which should
      * be included into the body of web app's "Home" page.
@@ -1219,13 +1237,14 @@ public String getHeaderIncludeFileContent() {
     /**
      * Get the contents of the body include file.
      *
+     * @param force if true, reload even if already set
      * @return an empty string if it could not be read successfully, the
      * contents of the file otherwise.
      * @see Configuration#BODY_INCLUDE_FILE
      */
-    public String getBodyIncludeFileContent() {
-        if (body == null) {
-            body = getFileContent(new File(getDataRoot(), BODY_INCLUDE_FILE));
+    public String getBodyIncludeFileContent(boolean force) {
+        if (body == null || force) {
+            body = getFileContent(new File(getIncludeRoot(), BODY_INCLUDE_FILE));
         }
         return body;
     }
@@ -1243,13 +1262,14 @@ public String getBodyIncludeFileContent() {
      * Get the contents of the page for forbidden error page (403 Forbidden)
      * include file.
      *
+     * @param force if true, reload even if already set
      * @return an empty string if it could not be read successfully, the
      * contents of the file otherwise.
      * @see Configuration#E_FORBIDDEN_INCLUDE_FILE
      */
-    public String getForbiddenIncludeFileContent() {
-        if (eforbidden_content == null) {
-            eforbidden_content = getFileContent(new File(getDataRoot(), E_FORBIDDEN_INCLUDE_FILE));
+    public String getForbiddenIncludeFileContent(boolean force) {
+        if (eforbidden_content == null || force) {
+            eforbidden_content = getFileContent(new File(getIncludeRoot(), E_FORBIDDEN_INCLUDE_FILE));
         }
         return eforbidden_content;
     }

opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java

@@ -317,6 +317,15 @@ public boolean isLastEditedDisplayMode() {
         return threadConfig.get().isLastEditedDisplayMode();
     }
 
+    /**
+     * Get the path to the where the web application includes are stored
+     *
+     * @return the path to the web application include files
+     */
+    public String getIncludeRootPath() {
+        return threadConfig.get().getIncludeRoot();
+    }
+    
     /**
      * Get the path to the where the index database is stored
      *
@@ -1552,6 +1561,15 @@ public void setConfiguration(Configuration configuration, List<String> subFileLi
         // The invalidation of repositories above might have excluded some
         // repositories in HistoryGuru so the configuration needs to reflect that.
         configuration.setRepositories(new ArrayList<>(histGuru.getRepositories()));
+        
+        reloadIncludeFiles(configuration);
+    }
+
+    private void reloadIncludeFiles(Configuration configuration1) {
+        configuration1.getBodyIncludeFileContent(true);
+        configuration1.getHeaderIncludeFileContent(true);
+        configuration1.getFooterIncludeFileContent(true);
+        configuration1.getForbiddenIncludeFileContent(true);
     }
 
     public Configuration getConfiguration() {

opengrok-indexer/src/test/java/org/opengrok/indexer/configuration/RuntimeEnvironmentTest.java

@@ -17,7 +17,7 @@
  * CDDL HEADER END
  */
 
- /*
+/*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
  */
@@ -119,6 +119,26 @@ public void testDataRoot() throws IOException {
         assertEquals(path, instance.getDataRootFile().getCanonicalPath());
     }
 
+    @Test
+    public void testIncludeRoot() throws IOException {
+        RuntimeEnvironment instance = RuntimeEnvironment.getInstance();
+        assertNull(instance.getIncludeRootPath());
+        
+        // set data root
+        File f = File.createTempFile("dataroot", null);
+        String path = f.getCanonicalPath();
+        instance.setDataRoot(path);
+        
+        // verify they are the same
+        assertEquals(instance.getDataRootPath(), instance.getIncludeRootPath());
+        
+        // set include root
+        f = File.createTempFile("includeroot", null);
+        path = f.getCanonicalPath();
+        instance.getConfiguration().setIncludeRoot(path);
+        assertEquals(path, instance.getIncludeRootPath());
+    }
+    
     @Test
     public void testSourceRoot() throws IOException {
         RuntimeEnvironment instance = RuntimeEnvironment.getInstance();

opengrok-web/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.opengrok</groupId>
         <artifactId>opengrok-top</artifactId>
-        <version>1.1-rc29</version>
+        <version>1.1-rc30</version>
     </parent>
 
     <artifactId>opengrok-web</artifactId>
-    <version>1.1-rc29</version>
+    <version>1.1-rc30</version>
     <packaging>war</packaging>
 
     <name>OpenGrok Web</name>

opengrok-web/src/main/java/org/opengrok/web/AuthorizationFilter.java

@@ -76,7 +76,7 @@ public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc) thr
             config.getEnv().getStatistics().addRequestTime("requests_forbidden",
                     System.currentTimeMillis() - processTime);
 
-            if (!config.getEnv().getConfiguration().getForbiddenIncludeFileContent().isEmpty()) {
+            if (!config.getEnv().getConfiguration().getForbiddenIncludeFileContent(false).isEmpty()) {
                 sr.getRequestDispatcher("/eforbidden").forward(sr, sr1);
                 return;
             }

opengrok-web/src/main/webapp/foot.jspf

@@ -45,7 +45,7 @@ org.opengrok.indexer.web.Prefix"
 <% if(dateForLastIndexRun != null) { %>
 <p>Last Index update <%= dateForLastIndexRun %></p>
 <%}%>
-    <%= cfg.getEnv().getConfiguration().getFooterIncludeFileContent() %>
+    <%= cfg.getEnv().getConfiguration().getFooterIncludeFileContent(false) %>
     <%
     if (needAddDiv.contains(cfg.getPrefix())) {
         %></div><% // #content

opengrok-web/src/main/webapp/index.jsp

@@ -58,7 +58,7 @@ include file="menu.jspf"
             %></div>
         </div>
         <div id="results">
-            <%= PageConfig.get(request).getEnv().getConfiguration().getBodyIncludeFileContent() %>
+            <%= PageConfig.get(request).getEnv().getConfiguration().getBodyIncludeFileContent(false) %>
             <% if (PageConfig.get(request).getEnv().getDisplayRepositories()) { %><%@
 
 include file="repos.jspf"