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
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

View File

@@ -1,49 +1,49 @@
package org.alfresco.opencmis;
import javax.servlet.http.HttpServletRequest;
/**
* Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port
* are overridden by a property from repository.properties or in an override file.
*
* @author steveglover
*
*/
public class DefaultBaseUrlGenerator extends AbstractBaseUrlGenerator
{
private boolean overrideServer;
private String serverOverride;
public DefaultBaseUrlGenerator()
{
}
public void setOverrideServer(boolean overrideServer)
{
this.overrideServer = overrideServer;
}
public void setServerOverride(String serverOverride)
{
this.serverOverride = serverOverride;
}
protected String getServerPath(HttpServletRequest request)
{
if(overrideServer)
{
return serverOverride;
}
else
{
StringBuilder sb = new StringBuilder();
sb.append(request.getScheme());
sb.append("://");
sb.append(request.getServerName());
sb.append(":");
sb.append(request.getServerPort());
return sb.toString();
}
}
}
package org.alfresco.opencmis;
import javax.servlet.http.HttpServletRequest;
/**
* Generates an OpenCMIS base url based on the request, repository id and binding. The url scheme, host and port
* are overridden by a property from repository.properties or in an override file.
*
* @author steveglover
*
*/
public class DefaultBaseUrlGenerator extends AbstractBaseUrlGenerator
{
private boolean overrideServer;
private String serverOverride;
public DefaultBaseUrlGenerator()
{
}
public void setOverrideServer(boolean overrideServer)
{
this.overrideServer = overrideServer;
}
public void setServerOverride(String serverOverride)
{
this.serverOverride = serverOverride;
}
protected String getServerPath(HttpServletRequest request)
{
if(overrideServer)
{
return serverOverride;
}
else
{
StringBuilder sb = new StringBuilder();
sb.append(request.getScheme());
sb.append("://");
sb.append(request.getServerName());
sb.append(":");
sb.append(request.getServerPort());
return sb.toString();
}
}
}