SF patch [2560974] for SF feature request [2560839] Make sitemap directory configurable

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3471 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java

@@ -186,8 +186,7 @@ public class GenerateSitemaps
         String handleURLStem = ConfigurationManager.getProperty("dspace.url")
                 + "/handle/";
 
-        File outputDir = new File(ConfigurationManager
-                .getProperty("dspace.dir"), "sitemaps");
+        File outputDir = new File(ConfigurationManager.getProperty("sitemap.dir"));
         if (!outputDir.exists()) {
         	outputDir.mkdir();
         }

dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/SitemapServlet.java

@@ -111,8 +111,7 @@ public class SitemapServlet extends DSpaceServlet
             HttpServletResponse response, String file, String mimeType,
             boolean compressed) throws ServletException, IOException
     {
-        File f = new File(ConfigurationManager.getProperty("dspace.dir")
-                + File.separator + "sitemaps", file);
+        File f = new File(ConfigurationManager.getProperty("sitemap.dir"), file);
 
         if (!f.exists())
         {

dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/SitemapReader.java

@@ -158,8 +158,7 @@ public class SitemapReader extends AbstractReader implements Recyclable
     private void sendFile(String file, 
             boolean compressed) throws IOException, ResourceNotFoundException
     {
-        File f = new File(ConfigurationManager.getProperty("dspace.dir")
-                + File.separator + "sitemaps", file);
+        File f = new File(ConfigurationManager.getProperty("sitemap.dir"), file);
 
         HttpServletResponse httpResponse = (HttpServletResponse) objectModel.get(HttpEnvironment.HTTP_RESPONSE_OBJECT);
 

dspace/CHANGES

@@ -17,6 +17,7 @@
  - [2513300] Fix for bug [1774958] Nested folders do not export correctly
  - Fix for SF bug [2086481] xmlui Administrative log in as another eperson
  - Fix for SF bug [2155479] Submission verify page handles dc.identifier.* incorrectly
+ - SF patch [2560974] for SF feature request [2560839] Make sitemap directory configurable
 
 (Stuart Lewis / Chris Yates / Flavio Botelho / Alex Barbieri / Reuben Pasquini / Paulo Matos)
  - [2057378] Hierarchical LDAP support

dspace/config/dspace.cfg

@@ -1044,6 +1044,9 @@ xmlui.content_disposition_threshold = 8388608
 
 
 #### Sitemap settings #####
+# the directory where the generated sitemaps are stored
+sitemap.dir = ${dspace.dir}/sitemaps
+
 #
 # Comma-separated list of search engine URLs to 'ping' when a new Sitemap has
 # been created.  Include everything except the Sitemap URL itself (which will