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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/opencmis/CMISServletDispatcher.java

@@ -1,393 +1,393 @@
-package org.alfresco.opencmis;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletResponse;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
-import org.alfresco.opencmis.CMISDispatcherRegistry.Endpoint;
-import org.alfresco.repo.tenant.TenantAdminService;
-import org.alfresco.service.descriptor.Descriptor;
-import org.alfresco.service.descriptor.DescriptorService;
-import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
-import org.apache.chemistry.opencmis.commons.server.CmisServiceFactory;
-import org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener;
-import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
-import org.springframework.extensions.webscripts.WebScriptRequest;
-import org.springframework.extensions.webscripts.WebScriptResponse;
-import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
-
-/**
- * Dispatches OpenCMIS requests to a servlet e.g. the OpenCMIS AtomPub servlet.
- * 
- * @author steveglover
- *
- */
-public abstract class CMISServletDispatcher implements CMISDispatcher
-{
-	private DescriptorService descriptorService;
-    private Descriptor currentDescriptor;
-    protected CmisServiceFactory cmisServiceFactory;
-    protected HttpServlet servlet;
-	protected CMISDispatcherRegistry registry;
-	protected String serviceName;
-	protected BaseUrlGenerator baseUrlGenerator;
-	protected String version;
-	protected CmisVersion cmisVersion;
-	protected TenantAdminService tenantAdminService;
-
-	public void setTenantAdminService(TenantAdminService tenantAdminService)
-	{
-        this.tenantAdminService = tenantAdminService;
-    }
-
-    public void setDescriptorService(DescriptorService descriptorService)
-	{
-		this.descriptorService = descriptorService;
-	}
-
-	public void setVersion(String version)
-	{
-		this.version = version;
-	}
-
-	public void setBaseUrlGenerator(BaseUrlGenerator baseUrlGenerator)
-	{
-		this.baseUrlGenerator = baseUrlGenerator;
-	}
-
-	public void setRegistry(CMISDispatcherRegistry registry)
-	{
-		this.registry = registry;
-	}
-
-	public void setCmisServiceFactory(CmisServiceFactory cmisServiceFactory)
-    {
-        this.cmisServiceFactory = cmisServiceFactory;
-    }
-	
-	public void setServiceName(String serviceName)
-	{
-		this.serviceName = serviceName;
-	}
-
-	public String getServiceName()
-	{
-		return serviceName;
-	}
-	
-	public void setCmisVersion(String cmisVersion)
-    {
-        this.cmisVersion = CmisVersion.fromValue(cmisVersion);
-    }
-
-    protected synchronized Descriptor getCurrentDescriptor()
-	{
-		if(this.currentDescriptor == null)
-		{
-			this.currentDescriptor = descriptorService.getCurrentRepositoryDescriptor();
-		}
-
-		return this.currentDescriptor;
-	}
-	
-	public void init()
-	{
-		Endpoint endpoint = new Endpoint(getBinding(), version);
-		registry.registerDispatcher(endpoint, this);
-
-		try
-		{
-			// fake the CMIS servlet
-			ServletConfig config = getServletConfig();
-	    	this.servlet = getServlet();
-	    	servlet.init(config);
-		}
-		catch(ServletException e)
-		{
-			throw new AlfrescoRuntimeException("Failed to initialise CMIS servlet dispatcher", e);
-		}
-	}
-
-	/*
-	 *  Implement getBinding to provide the appropriate CMIS binding.
-	 */
-    protected abstract Binding getBinding();
-    
-	/*
-	 *  Implement getServlet to provide the appropriate servlet implementation.
-	 */
-	protected abstract HttpServlet getServlet();
-
-	protected Object getServletAttribute(String attrName)
-	{
-		if(attrName.equals(CmisRepositoryContextListener.SERVICES_FACTORY))
-		{
-			return cmisServiceFactory;
-		}
-
-		return null;
-	}
-	
-    protected ServletConfig getServletConfig()
-    {
-    	ServletConfig config = new CMISServletConfig();
-    	return config;
-    }
-
-    protected CMISHttpServletRequest getHttpRequest(WebScriptRequest req)
-	{
-		String serviceName = getServiceName();
-		CMISHttpServletRequest httpReqWrapper = new CMISHttpServletRequest(req, serviceName, baseUrlGenerator,
-		        getBinding(), currentDescriptor, tenantAdminService);
-    	return httpReqWrapper;
-	}
-
-	public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
-	{
-		try
-		{
-	        HttpServletResponse httpResp = WebScriptServletRuntime.getHttpServletResponse(res);
-
-			// fake a servlet request.
-	    	CMISHttpServletRequest httpReqWrapper = getHttpRequest(req);
-
-	    	servlet.service(httpReqWrapper, httpResp);
-		}
-		catch(ServletException e)
-		{
-			throw new AlfrescoRuntimeException("", e);
-		}
-	}
-
-    /**
-     * Fake a CMIS servlet config.
-     * 
-     * @author steveglover
-     *
-     */
-	@SuppressWarnings("rawtypes")
-    private class CMISServletConfig implements ServletConfig
-    {
-		private List parameterNames = new ArrayList();
-
-    	@SuppressWarnings("unchecked")
-		CMISServletConfig()
-    	{
-    		parameterNames.add(CmisAtomPubServlet.PARAM_CALL_CONTEXT_HANDLER);
-            parameterNames.add(CmisAtomPubServlet.PARAM_CMIS_VERSION);
-		}
-
-		@Override
-		public String getInitParameter(String arg0)
-		{
-			if(arg0.equals(CmisAtomPubServlet.PARAM_CALL_CONTEXT_HANDLER))
-			{
-				return "org.alfresco.opencmis.PublicApiCallContextHandler";
-			}
-			else if(arg0.equals(CmisAtomPubServlet.PARAM_CMIS_VERSION))
-			{
-				return (cmisVersion != null ? cmisVersion.value() : CmisVersion.CMIS_1_0.value());
-			}
-			return null;
-		}
-
-		@Override
-		public Enumeration getInitParameterNames()
-		{
-			final Iterator it = parameterNames.iterator();
-
-			Enumeration e = new Enumeration()
-			{
-				@Override
-				public boolean hasMoreElements()
-				{
-					return it.hasNext();
-				}
-
-				@Override
-				public Object nextElement()
-				{
-					return it.next();
-				}
-			};
-			return e;
-		}
-
-		// fake a servlet context. Note that getAttribute is the only method that the servlet uses,
-		// hence the other methods are not implemented.
-		@Override
-		public ServletContext getServletContext()
-		{
-			return new ServletContext()
-			{
-
-				@Override
-				public Object getAttribute(String arg0)
-				{
-					return getServletAttribute(arg0);
-				}
-
-				@Override
-				public Enumeration getAttributeNames()
-				{
-					return null;
-				}
-
-				@Override
-				public String getContextPath()
-				{
-					return null;
-				}
-
-				@Override
-				public ServletContext getContext(String arg0)
-				{
-					return null;
-				}
-
-				@Override
-				public String getInitParameter(String arg0)
-				{
-					return null;
-				}
-
-				@Override
-				public Enumeration getInitParameterNames()
-				{
-					return null;
-				}
-
-				@Override
-				public int getMajorVersion()
-				{
-					return 0;
-				}
-
-				@Override
-				public String getMimeType(String arg0)
-				{
-					return null;
-				}
-
-				@Override
-				public int getMinorVersion()
-				{
-					return 0;
-				}
-
-				@Override
-				public RequestDispatcher getNamedDispatcher(String arg0)
-				{
-					return null;
-				}
-
-				@Override
-				public String getRealPath(String arg0)
-				{
-					return null;
-				}
-
-				@Override
-				public RequestDispatcher getRequestDispatcher(String arg0)
-				{
-					return null;
-				}
-
-				@Override
-				public URL getResource(String arg0) throws MalformedURLException
-				{
-					return null;
-				}
-
-				@Override
-				public InputStream getResourceAsStream(String arg0)
-				{
-					return null;
-				}
-
-				@Override
-				public Set getResourcePaths(String arg0)
-				{
-					return null;
-				}
-
-				@Override
-				public String getServerInfo()
-				{
-					return null;
-				}
-
-				@Override
-				public Servlet getServlet(String arg0) throws ServletException
-				{
-					return null;
-				}
-
-				@Override
-				public String getServletContextName()
-				{
-					return null;
-				}
-
-				@Override
-				public Enumeration getServletNames()
-				{
-					return null;
-				}
-
-				@Override
-				public Enumeration getServlets()
-				{
-					return null;
-				}
-
-				@Override
-				public void log(String arg0)
-				{
-				}
-
-				@Override
-				public void log(Exception arg0, String arg1)
-				{
-				}
-
-				@Override
-				public void log(String arg0, Throwable arg1)
-				{
-				}
-
-				@Override
-				public void removeAttribute(String arg0)
-				{
-				}
-
-				@Override
-				public void setAttribute(String arg0, Object arg1)
-				{
-				}
-			};
-		}
-
-		@Override
-		public String getServletName()
-		{
-			return "OpenCMIS";
-		}
-    }
-}
+package org.alfresco.opencmis;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
+import org.alfresco.opencmis.CMISDispatcherRegistry.Endpoint;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.service.descriptor.Descriptor;
+import org.alfresco.service.descriptor.DescriptorService;
+import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
+import org.apache.chemistry.opencmis.commons.server.CmisServiceFactory;
+import org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener;
+import org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WebScriptResponse;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRuntime;
+
+/**
+ * Dispatches OpenCMIS requests to a servlet e.g. the OpenCMIS AtomPub servlet.
+ * 
+ * @author steveglover
+ *
+ */
+public abstract class CMISServletDispatcher implements CMISDispatcher
+{
+	private DescriptorService descriptorService;
+    private Descriptor currentDescriptor;
+    protected CmisServiceFactory cmisServiceFactory;
+    protected HttpServlet servlet;
+	protected CMISDispatcherRegistry registry;
+	protected String serviceName;
+	protected BaseUrlGenerator baseUrlGenerator;
+	protected String version;
+	protected CmisVersion cmisVersion;
+	protected TenantAdminService tenantAdminService;
+
+	public void setTenantAdminService(TenantAdminService tenantAdminService)
+	{
+        this.tenantAdminService = tenantAdminService;
+    }
+
+    public void setDescriptorService(DescriptorService descriptorService)
+	{
+		this.descriptorService = descriptorService;
+	}
+
+	public void setVersion(String version)
+	{
+		this.version = version;
+	}
+
+	public void setBaseUrlGenerator(BaseUrlGenerator baseUrlGenerator)
+	{
+		this.baseUrlGenerator = baseUrlGenerator;
+	}
+
+	public void setRegistry(CMISDispatcherRegistry registry)
+	{
+		this.registry = registry;
+	}
+
+	public void setCmisServiceFactory(CmisServiceFactory cmisServiceFactory)
+    {
+        this.cmisServiceFactory = cmisServiceFactory;
+    }
+	
+	public void setServiceName(String serviceName)
+	{
+		this.serviceName = serviceName;
+	}
+
+	public String getServiceName()
+	{
+		return serviceName;
+	}
+	
+	public void setCmisVersion(String cmisVersion)
+    {
+        this.cmisVersion = CmisVersion.fromValue(cmisVersion);
+    }
+
+    protected synchronized Descriptor getCurrentDescriptor()
+	{
+		if(this.currentDescriptor == null)
+		{
+			this.currentDescriptor = descriptorService.getCurrentRepositoryDescriptor();
+		}
+
+		return this.currentDescriptor;
+	}
+	
+	public void init()
+	{
+		Endpoint endpoint = new Endpoint(getBinding(), version);
+		registry.registerDispatcher(endpoint, this);
+
+		try
+		{
+			// fake the CMIS servlet
+			ServletConfig config = getServletConfig();
+	    	this.servlet = getServlet();
+	    	servlet.init(config);
+		}
+		catch(ServletException e)
+		{
+			throw new AlfrescoRuntimeException("Failed to initialise CMIS servlet dispatcher", e);
+		}
+	}
+
+	/*
+	 *  Implement getBinding to provide the appropriate CMIS binding.
+	 */
+    protected abstract Binding getBinding();
+    
+	/*
+	 *  Implement getServlet to provide the appropriate servlet implementation.
+	 */
+	protected abstract HttpServlet getServlet();
+
+	protected Object getServletAttribute(String attrName)
+	{
+		if(attrName.equals(CmisRepositoryContextListener.SERVICES_FACTORY))
+		{
+			return cmisServiceFactory;
+		}
+
+		return null;
+	}
+	
+    protected ServletConfig getServletConfig()
+    {
+    	ServletConfig config = new CMISServletConfig();
+    	return config;
+    }
+
+    protected CMISHttpServletRequest getHttpRequest(WebScriptRequest req)
+	{
+		String serviceName = getServiceName();
+		CMISHttpServletRequest httpReqWrapper = new CMISHttpServletRequest(req, serviceName, baseUrlGenerator,
+		        getBinding(), currentDescriptor, tenantAdminService);
+    	return httpReqWrapper;
+	}
+
+	public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
+	{
+		try
+		{
+	        HttpServletResponse httpResp = WebScriptServletRuntime.getHttpServletResponse(res);
+
+			// fake a servlet request.
+	    	CMISHttpServletRequest httpReqWrapper = getHttpRequest(req);
+
+	    	servlet.service(httpReqWrapper, httpResp);
+		}
+		catch(ServletException e)
+		{
+			throw new AlfrescoRuntimeException("", e);
+		}
+	}
+
+    /**
+     * Fake a CMIS servlet config.
+     * 
+     * @author steveglover
+     *
+     */
+	@SuppressWarnings("rawtypes")
+    private class CMISServletConfig implements ServletConfig
+    {
+		private List parameterNames = new ArrayList();
+
+    	@SuppressWarnings("unchecked")
+		CMISServletConfig()
+    	{
+    		parameterNames.add(CmisAtomPubServlet.PARAM_CALL_CONTEXT_HANDLER);
+            parameterNames.add(CmisAtomPubServlet.PARAM_CMIS_VERSION);
+		}
+
+		@Override
+		public String getInitParameter(String arg0)
+		{
+			if(arg0.equals(CmisAtomPubServlet.PARAM_CALL_CONTEXT_HANDLER))
+			{
+				return "org.alfresco.opencmis.PublicApiCallContextHandler";
+			}
+			else if(arg0.equals(CmisAtomPubServlet.PARAM_CMIS_VERSION))
+			{
+				return (cmisVersion != null ? cmisVersion.value() : CmisVersion.CMIS_1_0.value());
+			}
+			return null;
+		}
+
+		@Override
+		public Enumeration getInitParameterNames()
+		{
+			final Iterator it = parameterNames.iterator();
+
+			Enumeration e = new Enumeration()
+			{
+				@Override
+				public boolean hasMoreElements()
+				{
+					return it.hasNext();
+				}
+
+				@Override
+				public Object nextElement()
+				{
+					return it.next();
+				}
+			};
+			return e;
+		}
+
+		// fake a servlet context. Note that getAttribute is the only method that the servlet uses,
+		// hence the other methods are not implemented.
+		@Override
+		public ServletContext getServletContext()
+		{
+			return new ServletContext()
+			{
+
+				@Override
+				public Object getAttribute(String arg0)
+				{
+					return getServletAttribute(arg0);
+				}
+
+				@Override
+				public Enumeration getAttributeNames()
+				{
+					return null;
+				}
+
+				@Override
+				public String getContextPath()
+				{
+					return null;
+				}
+
+				@Override
+				public ServletContext getContext(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public String getInitParameter(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public Enumeration getInitParameterNames()
+				{
+					return null;
+				}
+
+				@Override
+				public int getMajorVersion()
+				{
+					return 0;
+				}
+
+				@Override
+				public String getMimeType(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public int getMinorVersion()
+				{
+					return 0;
+				}
+
+				@Override
+				public RequestDispatcher getNamedDispatcher(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public String getRealPath(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public RequestDispatcher getRequestDispatcher(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public URL getResource(String arg0) throws MalformedURLException
+				{
+					return null;
+				}
+
+				@Override
+				public InputStream getResourceAsStream(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public Set getResourcePaths(String arg0)
+				{
+					return null;
+				}
+
+				@Override
+				public String getServerInfo()
+				{
+					return null;
+				}
+
+				@Override
+				public Servlet getServlet(String arg0) throws ServletException
+				{
+					return null;
+				}
+
+				@Override
+				public String getServletContextName()
+				{
+					return null;
+				}
+
+				@Override
+				public Enumeration getServletNames()
+				{
+					return null;
+				}
+
+				@Override
+				public Enumeration getServlets()
+				{
+					return null;
+				}
+
+				@Override
+				public void log(String arg0)
+				{
+				}
+
+				@Override
+				public void log(Exception arg0, String arg1)
+				{
+				}
+
+				@Override
+				public void log(String arg0, Throwable arg1)
+				{
+				}
+
+				@Override
+				public void removeAttribute(String arg0)
+				{
+				}
+
+				@Override
+				public void setAttribute(String arg0, Object arg1)
+				{
+				}
+			};
+		}
+
+		@Override
+		public String getServletName()
+		{
+			return "OpenCMIS";
+		}
+    }
+}