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 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 9a889c69ea
commit 386a4aca06
327 changed files with 55062 additions and 55062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
source/test-java/org/alfresco/rest/api/tests/PublicApiJettyComponent.java
View File

@@ -1,85 +1,85 @@
package org.alfresco.rest.api.tests;
import org.alfresco.repo.web.util.AbstractJettyComponent;
import org.alfresco.rest.api.PublicApiWebScriptServlet;
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
* authenticated, tenant-based access through the tenant servlet.
*
* @author steveglover
*
*/
public class PublicApiJettyComponent extends AbstractJettyComponent
{
public PublicApiJettyComponent(int port, String contextPath, String[] configLocations, String[] classLocations)
{
super(port, contextPath, configLocations, classLocations);
}
@Override
protected void configureWebAppContext(WebAppContext webAppContext)
{
// ServletContext servletContext = webAppContext.getServletContext();
// the tenant servlet with alfresco managed authentication
ServletHolder servletHolder = new ServletHolder(PublicApiWebScriptServlet.class);
servletHolder.setInitParameter("authenticator", "publicapi.authenticator");
webAppContext.addServlet(servletHolder, "/" + publicApiServletName + "/*");
// DependencyInjectedFilter apiFilter = (DependencyInjectedFilter)getApplicationContext().getBean("publicAPICMISFilter");
// BeanProxyFilter filter = new BeanProxyFilter(servletContext, apiFilter);
// FilterHolder filterHolder = new FilterHolder(filter);
// webAppContext.addFilter(filterHolder, "/" + publicApiServletName + "/*", null);
// the tenant servlet with alfresco managed authentication
servletHolder = new ServletHolder(CmisAtomPubServlet.class);
servletHolder.setInitParameter("callContextHandler", "org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler");
webAppContext.addServlet(servletHolder, "/cmisatom/*");
}
// private static class BeanProxyFilter implements Filter
// {
// private DependencyInjectedFilter filter;
// private ServletContext context;
//
// private BeanProxyFilter(ServletContext context, DependencyInjectedFilter filter)
// {
// this.context = context;
// this.filter = filter;
// }
//
// /**
// * Initialize the filter.
// *
// * @param args
// * FilterConfig
// * @throws ServletException
// * the servlet exception
// * @exception ServletException
// */
// public void init(FilterConfig args) throws ServletException
// {
// }
//
// /* (non-Javadoc)
// * @see javax.servlet.Filter#destroy()
// */
// public void destroy()
// {
// this.filter = null;
// }
//
// /* (non-Javadoc)
// * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
// */
// public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
// ServletException
// {
// this.filter.doFilter(this.context, request, response, chain);
// }
// }
}
package org.alfresco.rest.api.tests;
import org.alfresco.repo.web.util.AbstractJettyComponent;
import org.alfresco.rest.api.PublicApiWebScriptServlet;
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
* authenticated, tenant-based access through the tenant servlet.
*
* @author steveglover
*
*/
public class PublicApiJettyComponent extends AbstractJettyComponent
{
public PublicApiJettyComponent(int port, String contextPath, String[] configLocations, String[] classLocations)
{
super(port, contextPath, configLocations, classLocations);
}
@Override
protected void configureWebAppContext(WebAppContext webAppContext)
{
// ServletContext servletContext = webAppContext.getServletContext();
// the tenant servlet with alfresco managed authentication
ServletHolder servletHolder = new ServletHolder(PublicApiWebScriptServlet.class);
servletHolder.setInitParameter("authenticator", "publicapi.authenticator");
webAppContext.addServlet(servletHolder, "/" + publicApiServletName + "/*");
// DependencyInjectedFilter apiFilter = (DependencyInjectedFilter)getApplicationContext().getBean("publicAPICMISFilter");
// BeanProxyFilter filter = new BeanProxyFilter(servletContext, apiFilter);
// FilterHolder filterHolder = new FilterHolder(filter);
// webAppContext.addFilter(filterHolder, "/" + publicApiServletName + "/*", null);
// the tenant servlet with alfresco managed authentication
servletHolder = new ServletHolder(CmisAtomPubServlet.class);
servletHolder.setInitParameter("callContextHandler", "org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler");
webAppContext.addServlet(servletHolder, "/cmisatom/*");
}
// private static class BeanProxyFilter implements Filter
// {
// private DependencyInjectedFilter filter;
// private ServletContext context;
//
// private BeanProxyFilter(ServletContext context, DependencyInjectedFilter filter)
// {
// this.context = context;
// this.filter = filter;
// }
//
// /**
// * Initialize the filter.
// *
// * @param args
// * FilterConfig
// * @throws ServletException
// * the servlet exception
// * @exception ServletException
// */
// public void init(FilterConfig args) throws ServletException
// {
// }
//
// /* (non-Javadoc)
// * @see javax.servlet.Filter#destroy()
// */
// public void destroy()
// {
// this.filter = null;
// }
//
// /* (non-Javadoc)
// * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
// */
// public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
// ServletException
// {
// this.filter.doFilter(this.context, request, response, chain);
// }
// }
}