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

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>

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/facet/facet-config</url>
-   <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>

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>

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/facet/facet-config</url>
-   <url>/api/solr/facet-config/{filterID}?relativePos={relativePos?}</url>
+   <url>/api/facet/facet-config/{filterID}?relativePos={relativePos?}</url>
    <format default="json">argument</format>
    <authentication>user</authentication>
    <transaction>required</transaction>

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"
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.get"
-      class="org.alfresco.repo.web.scripts.solr.facet.SolrFacetConfigAdminGet"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminGet"
       parent="baseSolrFacetConfigAdminWebscript">
    </bean>
    <bean
-      id="webscript.org.alfresco.repository.solr.facet.solr-facet-config-admin.delete"
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.delete"
-      class="org.alfresco.repo.web.scripts.solr.facet.SolrFacetConfigAdminDelete"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminDelete"
       parent="baseSolrFacetConfigAdminWebscript">
    </bean>
    <bean
-      id="webscript.org.alfresco.repository.solr.facet.solr-facet-config-admin.post"
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.post"
-      class="org.alfresco.repo.web.scripts.solr.facet.SolrFacetConfigAdminPost"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminPost"
       parent="baseSolrFacetConfigAdminWebscript">
    </bean>
    <bean
-      id="webscript.org.alfresco.repository.solr.facet.solr-facet-config-admin.put"
+      id="webscript.org.alfresco.repository.facet.solr-facet-config-admin.put"
-      class="org.alfresco.repo.web.scripts.solr.facet.SolrFacetConfigAdminPut"
+      class="org.alfresco.repo.web.scripts.facet.SolrFacetConfigAdminPut"
       parent="baseSolrFacetConfigAdminWebscript">
    </bean>
 

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;

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;

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;

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;

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;

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;

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 GET_FACETS_URL       = "/api/facet/facet-config";
-    private final static String PUT_FACET_URL_FORMAT = "/api/solr/facet-config/{0}?relativePos={1}";
+    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;