From 72f0e836a4b8465be5b8bb900bf1c2a5053fb186 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 3 Sep 2014 16:46:01 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    80736:
 Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       78923: ACE-2370:
 Changed facet config web-scripts URL from /api/solr/facet-config TO
 /api/facet/facet-config to fix the facets retrieval when Solr SSL is enabled.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../solr-facet-config-admin.delete.desc.xml      |  4 ++--
 .../solr-facet-config-admin.delete.json.ftl      |  0
 .../facet/solr-facet-config-admin.get.desc.xml   |  8 ++++----
 .../facet/solr-facet-config-admin.get.json.ftl   |  0
 .../facet/solr-facet-config-admin.post.desc.xml  |  4 ++--
 .../facet/solr-facet-config-admin.post.json.ftl  |  0
 .../facet/solr-facet-config-admin.put.desc.xml   |  6 +++---
 .../facet/solr-facet-config-admin.put.json.ftl   |  0
 .../alfresco/web-scripts-application-context.xml | 16 ++++++++--------
 .../AbstractSolrFacetConfigAdminWebScript.java   |  2 +-
 .../facet/SolrFacetConfigAdminDelete.java        |  2 +-
 .../facet/SolrFacetConfigAdminGet.java           |  2 +-
 .../facet/SolrFacetConfigAdminPost.java          |  2 +-
 .../facet/SolrFacetConfigAdminPut.java           |  2 +-
 .../repo/web/scripts/WebScriptTestSuite.java     |  2 +-
 .../{solr => }/facet/FacetRestApiTest.java       |  6 +++---
 16 files changed, 28 insertions(+), 28 deletions(-)
 rename config/alfresco/templates/webscripts/org/alfresco/repository/{solr => }/facet/solr-facet-config-admin.delete.desc.xml (81%)
 rename config/alfresco/templates/webscripts/org/alfresco/repository/{solr => }/facet/solr-facet-config-admin.delete.json.ftl (100%)
 rename config/alfresco/templates/webscripts/org/alfresco/repository/{solr => }/facet/solr-facet-config-admin.get.desc.xml (85%)
 rename config/alfresco/templates/webscripts/org/alfresco/repository/{solr => }/facet/solr-facet-config-admin.get.json.ftl (100%)
 rename config/alfresco/templates/webscripts/org/alfresco/repository/{solr => }/facet/solr-facet-config-admin.post.desc.xml (91%)
 rename config/alfresco/templates/webscripts/org/alfresco/repository/{solr => }/facet/solr-facet-config-admin.post.json.ftl (100%)
 rename config/alfresco/templates/webscripts/org/alfresco/repository/{solr => }/facet/solr-facet-config-admin.put.desc.xml (89%)
 rename config/alfresco/templates/webscripts/org/alfresco/repository/{solr => }/facet/solr-facet-config-admin.put.json.ftl (100%)
 rename source/java/org/alfresco/repo/web/scripts/{solr => }/facet/AbstractSolrFacetConfigAdminWebScript.java (96%)
 rename source/java/org/alfresco/repo/web/scripts/{solr => }/facet/SolrFacetConfigAdminDelete.java (95%)
 rename source/java/org/alfresco/repo/web/scripts/{solr => }/facet/SolrFacetConfigAdminGet.java (95%)
 rename source/java/org/alfresco/repo/web/scripts/{solr => }/facet/SolrFacetConfigAdminPost.java (96%)
 rename source/java/org/alfresco/repo/web/scripts/{solr => }/facet/SolrFacetConfigAdminPut.java (97%)
 rename source/test-java/org/alfresco/repo/web/scripts/{solr => }/facet/FacetRestApiTest.java (97%)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.delete.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.desc.xml
similarity index 81%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.delete.desc.xml
rename to config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.desc.xml
index 3e7740642d..aafbb76859 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.delete.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.desc.xml
@@ -4,7 +4,7 @@
    <![CDATA[
    Delete faceted-search config, if configured
    
-   http://<host>:<port>/alfresco/api/solr/facet-config
+   http://<host>:<port>/alfresco/api/facet/facet-config
    
    Example response from this web script:
    
@@ -16,7 +16,7 @@
    - user must be an Admin, member of Alfresco_Search_Administrators group or a Network Admin for given network/tenant
    ]]>
    </description>
-   <url>/api/solr/facet-config/{filterID}</url>
+   <url>/api/facet/facet-config/{filterID}</url>
    <format default="json">argument</format>
    <authentication>user</authentication>
    <transaction>required</transaction>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.delete.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.json.ftl
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.delete.json.ftl
rename to config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.delete.json.ftl
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.desc.xml
similarity index 85%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.desc.xml
rename to config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.desc.xml
index 0b829ab3eb..5982b08c15 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.desc.xml
@@ -4,9 +4,9 @@
    <![CDATA[
    Get faceted-search config, if configured
    
-   http://<host>:<port>/alfresco/api/solr/facet-config
+   http://<host>:<port>/alfresco/api/facet/facet-config
    Or
-   http://<host>:<port>/alfresco/api/solr/facet-config/{filterId}
+   http://<host>:<port>/alfresco/api/facet/facet-config/{filterId}
    
    Example response from this web script:
    
@@ -45,8 +45,8 @@
    - user must be an Admin, member of Alfresco_Search_Administrators group or a Network Admin for given network/tenant
    ]]>
    </description>
-   <url>/api/solr/facet-config</url>
-   <url>/api/solr/facet-config/{filterID}</url>
+   <url>/api/facet/facet-config</url>
+   <url>/api/facet/facet-config/{filterID}</url>
    <format default="json">argument</format>
    <authentication>user</authentication>
    <transaction>required</transaction>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.json.ftl
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.get.json.ftl
rename to config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.get.json.ftl
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.desc.xml
similarity index 91%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
rename to config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.desc.xml
index 17aab631e8..44a10742ed 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.desc.xml
@@ -4,7 +4,7 @@
    <![CDATA[
    Post faceted-search config
    
-   http://<host>:<port>/alfresco/api/solr/facet-config
+   http://<host>:<port>/alfresco/api/facet/facet-config
    
    Example body to this web script:
    
@@ -36,7 +36,7 @@
    - user must be an Admin, member of Alfresco_Search_Administrators group or a Network Admin for given network/tenant
    ]]>
    </description>
-   <url>/api/solr/facet-config</url>
+   <url>/api/facet/facet-config</url>
    <format default="json">argument</format>
    <authentication>user</authentication>
    <transaction>required</transaction>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.json.ftl
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.json.ftl
rename to config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.post.json.ftl
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.desc.xml
similarity index 89%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
rename to config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.desc.xml
index 676e5d70ff..2e14883a3c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.desc.xml
@@ -5,7 +5,7 @@
    Put (update) faceted-search config<br/>
    This REST endpoint supports two forms of resource updates:<br/>
    <br/>
-   http://<host>:<port>/alfresco/api/solr/facet-config<br/>
+   http://<host>:<port>/alfresco/api/facet/facet-config<br/>
    <br/>
    This will perform an update of the Facet properties. Example body to this web script:<br/>
    <br/>
@@ -43,8 +43,8 @@
    simply move it to the end.
    ]]>
    </description>
-   <url>/api/solr/facet-config</url>
-   <url>/api/solr/facet-config/{filterID}?relativePos={relativePos?}</url>
+   <url>/api/facet/facet-config</url>
+   <url>/api/facet/facet-config/{filterID}?relativePos={relativePos?}</url>
    <format default="json">argument</format>
    <authentication>user</authentication>
    <transaction>required</transaction>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.json.ftl
similarity index 100%
rename from config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.json.ftl
rename to config/alfresco/templates/webscripts/org/alfresco/repository/facet/solr-facet-config-admin.put.json.ftl
diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index f22f959582..a74d64aebd 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -1824,23 +1824,23 @@
       <property name="facetService" ref="solrFacetService"/>
    </bean>
    <bean
-      id="webscript.org.alfresco.repository.solr.facet.solr-facet-config-admin.get"
-      class="org.alfresco.repo.web.scripts.solr.facet.SolrFacetConfigAdminGet"
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.get"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminGet"
       parent="baseSolrFacetConfigAdminWebscript">
    </bean>
    <bean
-      id="webscript.org.alfresco.repository.solr.facet.solr-facet-config-admin.delete"
-      class="org.alfresco.repo.web.scripts.solr.facet.SolrFacetConfigAdminDelete"
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.delete"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminDelete"
       parent="baseSolrFacetConfigAdminWebscript">
    </bean>
    <bean
-      id="webscript.org.alfresco.repository.solr.facet.solr-facet-config-admin.post"
-      class="org.alfresco.repo.web.scripts.solr.facet.SolrFacetConfigAdminPost"
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.post"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminPost"
       parent="baseSolrFacetConfigAdminWebscript">
    </bean>
    <bean
-      id="webscript.org.alfresco.repository.solr.facet.solr-facet-config-admin.put"
-      class="org.alfresco.repo.web.scripts.solr.facet.SolrFacetConfigAdminPut"
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.put"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminPut"
       parent="baseSolrFacetConfigAdminWebscript">
    </bean>
 
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java b/source/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java
similarity index 96%
rename from source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
rename to source/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java
index a6effbd3af..247fc20adb 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/AbstractSolrFacetConfigAdminWebScript.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.web.scripts.solr.facet;
+package org.alfresco.repo.web.scripts.facet;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminDelete.java b/source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminDelete.java
similarity index 95%
rename from source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminDelete.java
rename to source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminDelete.java
index 2f10e31cab..255a842ef2 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminDelete.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminDelete.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.web.scripts.solr.facet;
+package org.alfresco.repo.web.scripts.facet;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminGet.java b/source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminGet.java
similarity index 95%
rename from source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminGet.java
rename to source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminGet.java
index 2d1c1abc35..c23c339549 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminGet.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.web.scripts.solr.facet;
+package org.alfresco.repo.web.scripts.facet;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminPost.java b/source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPost.java
similarity index 96%
rename from source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminPost.java
rename to source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPost.java
index f75ed18363..78dee22bc4 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminPost.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPost.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.web.scripts.solr.facet;
+package org.alfresco.repo.web.scripts.facet;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminPut.java b/source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPut.java
similarity index 97%
rename from source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminPut.java
rename to source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPut.java
index 9e63acea1b..e44eb431b4 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/facet/SolrFacetConfigAdminPut.java
+++ b/source/java/org/alfresco/repo/web/scripts/facet/SolrFacetConfigAdminPut.java
@@ -17,7 +17,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.alfresco.repo.web.scripts.solr.facet;
+package org.alfresco.repo.web.scripts.facet;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java b/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
index 15475d9046..c178a6d6e6 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
@@ -28,6 +28,7 @@ import org.alfresco.repo.web.scripts.audit.AuditWebScriptTest;
 import org.alfresco.repo.web.scripts.blogs.BlogServiceTest;
 import org.alfresco.repo.web.scripts.dictionary.DictionaryRestApiTest;
 import org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest;
+import org.alfresco.repo.web.scripts.facet.FacetRestApiTest;
 import org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test;
 import org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test;
 import org.alfresco.repo.web.scripts.groups.GroupsTest;
@@ -43,7 +44,6 @@ import org.alfresco.repo.web.scripts.rule.RuleServiceTest;
 import org.alfresco.repo.web.scripts.search.PersonSearchTest;
 import org.alfresco.repo.web.scripts.site.SiteServiceTest;
 import org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest;
-import org.alfresco.repo.web.scripts.solr.facet.FacetRestApiTest;
 import org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceRestApiTest;
 import org.alfresco.repo.web.scripts.tagging.TaggingServiceTest;
 import org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest;
diff --git a/source/test-java/org/alfresco/repo/web/scripts/solr/facet/FacetRestApiTest.java b/source/test-java/org/alfresco/repo/web/scripts/facet/FacetRestApiTest.java
similarity index 97%
rename from source/test-java/org/alfresco/repo/web/scripts/solr/facet/FacetRestApiTest.java
rename to source/test-java/org/alfresco/repo/web/scripts/facet/FacetRestApiTest.java
index 1bee16da2e..3592cfe419 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/solr/facet/FacetRestApiTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/facet/FacetRestApiTest.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.repo.web.scripts.solr.facet;
+package org.alfresco.repo.web.scripts.facet;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -58,8 +58,8 @@ public class FacetRestApiTest extends BaseWebScriptTest
 
     private static final String FACETS = "facets";
 
-    private final static String GET_FACETS_URL       = "/api/solr/facet-config";
-    private final static String PUT_FACET_URL_FORMAT = "/api/solr/facet-config/{0}?relativePos={1}";
+    private final static String GET_FACETS_URL       = "/api/facet/facet-config";
+    private final static String PUT_FACET_URL_FORMAT = "/api/facet/facet-config/{0}?relativePos={1}";
     private final static String POST_FACETS_URL      = GET_FACETS_URL;
     private final static String PUT_FACETS_URL       = GET_FACETS_URL;