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,65 +1,65 @@
package org.alfresco.opencmis;
import javax.servlet.http.HttpServletRequest;
import org.alfresco.repo.admin.SysAdminParams;
/**
* Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port
* are overridden by sys admin parameters.
*
* @author steveglover
*
*/
public class SysAdminParamsBaseUrlGenerator extends AbstractBaseUrlGenerator
{
private SysAdminParams sysAdminParams;
protected String getServerPath(HttpServletRequest request)
{
StringBuilder sb = new StringBuilder();
sb.append(getServerScheme(request));
sb.append("://");
sb.append(getServerName(request));
sb.append(":");
sb.append(getServerPort(request));
return sb.toString();
}
protected String getServerScheme(HttpServletRequest request)
{
String scheme = sysAdminParams.getAlfrescoProtocol();
if (scheme == null)
{
scheme = request.getScheme();
}
scheme = request.getScheme();
return scheme;
}
protected String getServerName(HttpServletRequest request)
{
String hostname = sysAdminParams.getAlfrescoHost();
if (hostname == null)
{
hostname = request.getScheme();
}
hostname = request.getServerName();
return hostname;
}
protected int getServerPort(HttpServletRequest request)
{
Integer port = sysAdminParams.getAlfrescoPort();
if (port == null)
{
port = request.getServerPort();
}
if (port == null)
{
port = request.getServerPort();
}
return port;
}
}
package org.alfresco.opencmis;
import javax.servlet.http.HttpServletRequest;
import org.alfresco.repo.admin.SysAdminParams;
/**
* Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port
* are overridden by sys admin parameters.
*
* @author steveglover
*
*/
public class SysAdminParamsBaseUrlGenerator extends AbstractBaseUrlGenerator
{
private SysAdminParams sysAdminParams;
protected String getServerPath(HttpServletRequest request)
{
StringBuilder sb = new StringBuilder();
sb.append(getServerScheme(request));
sb.append("://");
sb.append(getServerName(request));
sb.append(":");
sb.append(getServerPort(request));
return sb.toString();
}
protected String getServerScheme(HttpServletRequest request)
{
String scheme = sysAdminParams.getAlfrescoProtocol();
if (scheme == null)
{
scheme = request.getScheme();
}
scheme = request.getScheme();
return scheme;
}
protected String getServerName(HttpServletRequest request)
{
String hostname = sysAdminParams.getAlfrescoHost();
if (hostname == null)
{
hostname = request.getScheme();
}
hostname = request.getServerName();
return hostname;
}
protected int getServerPort(HttpServletRequest request)
{
Integer port = sysAdminParams.getAlfrescoPort();
if (port == null)
{
port = request.getServerPort();
}
if (port == null)
{
port = request.getServerPort();
}
return port;
}
}