inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
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
This commit is contained in:
Will Abson
2014-09-03 16:46:01 +00:00
parent 5bb3de7195
commit 72f0e836a4
16 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
View File

@@ -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;

6
source/test-java/org/alfresco/repo/web/scripts/solr/facet/FacetRestApiTest.java → source/test-java/org/alfresco/repo/web/scripts/facet/FacetRestApiTest.java
View File

@@ -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;