From 877cb3f72752408167f474adf46b16724a4c51a9 Mon Sep 17 00:00:00 2001
From: Steven Glover <steven.glover@alfresco.com>
Date: Tue, 20 Dec 2011 17:57:17 +0000
Subject: [PATCH] Change bulk filesystem import urls (so they don't clash with
 those of the community bulk filesystem import) and indicate in the web pages
 that it is unsupported functionality.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repository/bulkfilesystemimport/ajaxspace.get.desc.xml      | 2 +-
 .../repository/bulkfilesystemimport/initiate.post.desc.xml      | 2 +-
 .../repository/bulkfilesystemimport/status.get.desc.xml         | 2 +-
 .../repository/bulkfilesystemimport/status.get.html.ftl         | 1 +
 .../alfresco/repository/bulkfilesystemimport/ui.get.desc.xml    | 2 +-
 .../alfresco/repository/bulkfilesystemimport/ui.get.html.ftl    | 1 +
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.desc.xml
index c7046c98e3..db8473345e 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ajaxspace.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>Bulk Filesystem Import - AJAX Auto Suggest for Space Names</shortname>
   <description>Web Script that returns a list of spaces for the AJAX auto-suggest control in the bulk import initiation form.</description>
-  <url>/bulk/import/filesystem/ajax/suggest/spaces?query={query}</url>
+  <url>/bulkfsimport/ajax/suggest/spaces?query={query}</url>
   <authentication>admin</authentication>
   <format default="json">any</format>
   <family>Bulk Filesystem Import</family>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.desc.xml
index 4f4429fed4..82f20f240f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/initiate.post.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>Bulk Filesystem Import</shortname>
   <description>Web Script that initiates a bulk filesystem import.</description>
-  <url>/bulk/import/filesystem/initiate</url>
+  <url>/bulkfsimport/initiate</url>
   <authentication>admin</authentication>
   <transaction>none</transaction>
   <family>Bulk Filesystem Import</family>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.desc.xml
index 3407c740d6..b5dca9cb28 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>Bulk Filesystem Import Status</shortname>
   <description>Web Script that provides a simple UI for monitoring the status of a bulk filesystem import.</description>
-  <url>/bulk/import/filesystem/status</url>
+  <url>/bulkfsimport/status</url>
   <format default="html"/>
   <authentication>admin</authentication>
   <family>Bulk Filesystem Import</family>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.html.ftl
index 81d0dd74b3..6b93da10d6 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/status.get.html.ftl
@@ -36,6 +36,7 @@
       <td><nobr>Bulk Filesystem Import Tool Status</nobr></td>
     </tr>
     <tr><td><td>Alfresco ${server.edition} v${server.version}
+    <tr><td><td><b>Note: this is unsupported and may be removed from the product in future.</b>
   </table>
   <blockquote>
     <p>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.desc.xml
index b33039114a..e1b44d9cb0 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.desc.xml
@@ -1,7 +1,7 @@
 <webscript>
   <shortname>Bulk Filesystem Import</shortname>
   <description>Web Script that provides a simple UI for initiating a bulk filesystem import.</description>
-  <url>/bulk/import/filesystem</url>
+  <url>/bulkfsimport</url>
   <format default="html"/>
   <authentication>admin</authentication>
   <family>Bulk Filesystem Import</family>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.html.ftl
index 659ef4c20a..7873dfcc97 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/bulkfilesystemimport/ui.get.html.ftl
@@ -61,6 +61,7 @@
         <td><nobr>Bulk Filesystem Import Tool</nobr></td>
       </tr>
       <tr><td><td>Alfresco ${server.edition} v${server.version}
+      <tr><td><td><b>Note: this is unsupported and may be removed from the product in future.</b>
     </table>
     <form action="${url.service}/initiate" method="post" enctype="multipart/form-data" charset="utf-8" onsubmit="return validateForm(this);">
       <table>