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,51 +1,51 @@
package org.alfresco.rest.api;
import javax.servlet.http.HttpServletRequest;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.web.scripts.TenantWebScriptServletRequest;
import org.springframework.extensions.config.ServerProperties;
import org.springframework.extensions.webscripts.Match;
import org.springframework.extensions.webscripts.Runtime;
public class PublicApiTenantWebScriptServletRequest extends TenantWebScriptServletRequest
{
public static final String NETWORKS_PATH = "networks";
public static final String NETWORK_PATH = "network";
public PublicApiTenantWebScriptServletRequest(Runtime container, HttpServletRequest req, Match serviceMatch, ServerProperties serverProperties)
{
super(container, req, serviceMatch, serverProperties);
}
@Override
protected void parse()
{
String realPathInfo = getRealPathInfo();
if(realPathInfo.equals("") || realPathInfo.equals("/"))
{
// no tenant - "index" request
tenant = TenantUtil.DEFAULT_TENANT;
pathInfo = NETWORKS_PATH;
}
else
{
// optimisation - don't need to lowercase the whole path
if(realPathInfo.substring(0, 5).toLowerCase().equals("/cmis"))
{
// cmis service document, pass through as is and set tenant to "-default-".
tenant = TenantUtil.DEFAULT_TENANT;
pathInfo = realPathInfo;
}
else
{
int idx = realPathInfo.indexOf('/', 1);
// remove tenant
tenant = realPathInfo.substring(1, idx == -1 ? realPathInfo.length() : idx);
pathInfo = realPathInfo.substring(tenant.length() + 1);
}
}
}
}
package org.alfresco.rest.api;
import javax.servlet.http.HttpServletRequest;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.web.scripts.TenantWebScriptServletRequest;
import org.springframework.extensions.config.ServerProperties;
import org.springframework.extensions.webscripts.Match;
import org.springframework.extensions.webscripts.Runtime;
public class PublicApiTenantWebScriptServletRequest extends TenantWebScriptServletRequest
{
public static final String NETWORKS_PATH = "networks";
public static final String NETWORK_PATH = "network";
public PublicApiTenantWebScriptServletRequest(Runtime container, HttpServletRequest req, Match serviceMatch, ServerProperties serverProperties)
{
super(container, req, serviceMatch, serverProperties);
}
@Override
protected void parse()
{
String realPathInfo = getRealPathInfo();
if(realPathInfo.equals("") || realPathInfo.equals("/"))
{
// no tenant - "index" request
tenant = TenantUtil.DEFAULT_TENANT;
pathInfo = NETWORKS_PATH;
}
else
{
// optimisation - don't need to lowercase the whole path
if(realPathInfo.substring(0, 5).toLowerCase().equals("/cmis"))
{
// cmis service document, pass through as is and set tenant to "-default-".
tenant = TenantUtil.DEFAULT_TENANT;
pathInfo = realPathInfo;
}
else
{
int idx = realPathInfo.indexOf('/', 1);
// remove tenant
tenant = realPathInfo.substring(1, idx == -1 ? realPathInfo.length() : idx);
pathInfo = realPathInfo.substring(tenant.length() + 1);
}
}
}
}