mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,55 +1,55 @@
|
||||
package org.alfresco.rest.api.tests;
|
||||
|
||||
import org.alfresco.repo.web.util.JettyComponent;
|
||||
|
||||
public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
|
||||
{
|
||||
public final static String[] CONFIG_LOCATIONS = new String[]
|
||||
{
|
||||
"classpath:alfresco/application-context.xml",
|
||||
"classpath:alfresco/web-scripts-application-context.xml",
|
||||
"classpath:alfresco/web-scripts-application-context-test.xml",
|
||||
"rest-api-test-context.xml",
|
||||
"testcmis-model-context.xml"
|
||||
};
|
||||
|
||||
public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"};
|
||||
|
||||
private static EnterprisePublicApiTestFixture instance;
|
||||
|
||||
/*
|
||||
* Note: synchronized for multi-threaded test access
|
||||
*/
|
||||
public synchronized static EnterprisePublicApiTestFixture getInstance(boolean createTestData) throws Exception
|
||||
{
|
||||
if(instance == null)
|
||||
{
|
||||
instance = new EnterprisePublicApiTestFixture();
|
||||
instance.setup(createTestData);
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
public static EnterprisePublicApiTestFixture getInstance() throws Exception
|
||||
{
|
||||
return getInstance(true);
|
||||
}
|
||||
|
||||
private EnterprisePublicApiTestFixture()
|
||||
{
|
||||
super(CONFIG_LOCATIONS, CLASS_LOCATIONS, PORT, CONTEXT_PATH, PUBLIC_API_SERVLET_NAME, DEFAULT_NUM_MEMBERS_PER_SITE, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JettyComponent makeJettyComponent()
|
||||
{
|
||||
JettyComponent jettyComponent = new EnterpriseJettyComponent(port, contextPath, configLocations, classLocations);
|
||||
return jettyComponent;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RepoService makeRepoService() throws Exception
|
||||
{
|
||||
return new RepoService(applicationContext);
|
||||
}
|
||||
}
|
||||
package org.alfresco.rest.api.tests;
|
||||
|
||||
import org.alfresco.repo.web.util.JettyComponent;
|
||||
|
||||
public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
|
||||
{
|
||||
public final static String[] CONFIG_LOCATIONS = new String[]
|
||||
{
|
||||
"classpath:alfresco/application-context.xml",
|
||||
"classpath:alfresco/web-scripts-application-context.xml",
|
||||
"classpath:alfresco/web-scripts-application-context-test.xml",
|
||||
"rest-api-test-context.xml",
|
||||
"testcmis-model-context.xml"
|
||||
};
|
||||
|
||||
public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"};
|
||||
|
||||
private static EnterprisePublicApiTestFixture instance;
|
||||
|
||||
/*
|
||||
* Note: synchronized for multi-threaded test access
|
||||
*/
|
||||
public synchronized static EnterprisePublicApiTestFixture getInstance(boolean createTestData) throws Exception
|
||||
{
|
||||
if(instance == null)
|
||||
{
|
||||
instance = new EnterprisePublicApiTestFixture();
|
||||
instance.setup(createTestData);
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
public static EnterprisePublicApiTestFixture getInstance() throws Exception
|
||||
{
|
||||
return getInstance(true);
|
||||
}
|
||||
|
||||
private EnterprisePublicApiTestFixture()
|
||||
{
|
||||
super(CONFIG_LOCATIONS, CLASS_LOCATIONS, PORT, CONTEXT_PATH, PUBLIC_API_SERVLET_NAME, DEFAULT_NUM_MEMBERS_PER_SITE, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JettyComponent makeJettyComponent()
|
||||
{
|
||||
JettyComponent jettyComponent = new EnterpriseJettyComponent(port, contextPath, configLocations, classLocations);
|
||||
return jettyComponent;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RepoService makeRepoService() throws Exception
|
||||
{
|
||||
return new RepoService(applicationContext);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user