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:
Alan Davis
2016-06-03 16:45:04 +00:00
parent da8101a5ba
commit 19fcf2c411
325 changed files with 59952 additions and 59952 deletions

View File

@@ -1,31 +1,31 @@
package org.alfresco.rest.api.tests;
import org.alfresco.repo.web.util.AbstractJettyComponent;
import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.webapp.WebAppContext;
/**
* Manages an embedded jetty server, hooking it up to the repository spring context and providing access to the Chemistry OpenCMIS servlet.
*
* @author steveglover
*
*/
public class CMISTCKJettyComponent extends AbstractJettyComponent
{
public CMISTCKJettyComponent(int port, String contextPath, String servletName, String[] configLocations, String[] classLocations)
{
super(port, contextPath, configLocations, classLocations);
}
@Override
protected void configureWebAppContext(WebAppContext webAppContext)
{
super.configure(webAppContext);
// the Chemistry OpenCMIS servlet
ServletHolder servletHolder = new ServletHolder(CmisAtomPubServlet.class);
servletHolder.setInitParameter("callContextHandler", "org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler");
webAppContext.addServlet(servletHolder, "/cmisatom/*");
}
}
package org.alfresco.rest.api.tests;
import org.alfresco.repo.web.util.AbstractJettyComponent;
import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.webapp.WebAppContext;
/**
* Manages an embedded jetty server, hooking it up to the repository spring context and providing access to the Chemistry OpenCMIS servlet.
*
* @author steveglover
*
*/
public class CMISTCKJettyComponent extends AbstractJettyComponent
{
public CMISTCKJettyComponent(int port, String contextPath, String servletName, String[] configLocations, String[] classLocations)
{
super(port, contextPath, configLocations, classLocations);
}
@Override
protected void configureWebAppContext(WebAppContext webAppContext)
{
super.configure(webAppContext);
// the Chemistry OpenCMIS servlet
ServletHolder servletHolder = new ServletHolder(CmisAtomPubServlet.class);
servletHolder.setInitParameter("callContextHandler", "org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler");
webAppContext.addServlet(servletHolder, "/cmisatom/*");
}
}