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

REPO-1394: Discovery: merge back to 5.2.N (from feature branch)

Browse Source 
Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      130980 jkaabimofrad: REPO-224: API for retrieving detailed repository information.
   Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      131056 jkaabimofrad: REPO-224: Removed "transformationServerExpiresAt" attribute from the license JSON response as it is not part of AC.
   Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      131179 jkaabimofrad: REPO-224: Modified the license's entitlement response to always return "isClusterEnabled" and "isCryptodocEnabled".

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Cristian Turlica
2016-10-12 05:14:58 +00:00
parent 4d5b8671fb
commit 3f6a5d9e81
10 changed files with 1135 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/java/org/alfresco/rest/api/PublicApiTenantWebScriptServletRuntime.java
View File

@@ -1,28 +1,28 @@
/*
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
/*
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.api;
import java.io.IOException;
@@ -44,12 +44,12 @@ public class PublicApiTenantWebScriptServletRuntime extends TenantWebScriptServl
private static final Pattern CMIS_URI_PATTERN = Pattern.compile(".*/cmis/versions/[0-9]+\\.[0-9]+/.*");
private ApiAssistant apiAssistant;
public PublicApiTenantWebScriptServletRuntime(RuntimeContainer container, ServletAuthenticatorFactory authFactory, HttpServletRequest req,
HttpServletResponse res, ServerProperties serverProperties, ApiAssistant apiAssistant)
{
super(container, authFactory, req, res, serverProperties);
public PublicApiTenantWebScriptServletRuntime(RuntimeContainer container, ServletAuthenticatorFactory authFactory, HttpServletRequest req,
HttpServletResponse res, ServerProperties serverProperties, ApiAssistant apiAssistant)
{
super(container, authFactory, req, res, serverProperties);
this.apiAssistant = apiAssistant;
}
}
/* (non-Javadoc)
* @see org.alfresco.web.scripts.WebScriptRuntime#getScriptUrl()
@@ -81,27 +81,27 @@ public class PublicApiTenantWebScriptServletRuntime extends TenantWebScriptServl
// NOTE: must contain at least root / and single character for tenant name
if (pathInfo.length() < 2 || pathInfo.equals("/"))
{
// url path has no tenant id -> get networks request
pathInfo = PublicApiTenantWebScriptServletRequest.NETWORKS_PATH;
// url path has no tenant id -> get networks request
pathInfo = PublicApiTenantWebScriptServletRequest.NETWORKS_PATH;
}
else
{
if(!pathInfo.substring(0, 6).toLowerCase().equals("/cmis/"))
{
// remove tenant
int idx = pathInfo.indexOf('/', 1);
pathInfo = pathInfo.substring(idx == -1 ? pathInfo.length() : idx);
if(pathInfo.equals("") || pathInfo.equals("/"))
{
// url path is just a tenant id -> get network request
pathInfo = PublicApiTenantWebScriptServletRequest.NETWORK_PATH;
}
}
if(!pathInfo.substring(0, 6).toLowerCase().equals("/cmis/") && !pathInfo.equals("/discovery"))
{
// remove tenant
int idx = pathInfo.indexOf('/', 1);
pathInfo = pathInfo.substring(idx == -1 ? pathInfo.length() : idx);
if(pathInfo.equals("") || pathInfo.equals("/"))
{
// url path is just a tenant id -> get network request
pathInfo = PublicApiTenantWebScriptServletRequest.NETWORK_PATH;
}
}
}
return pathInfo;
}
/* (non-Javadoc)
* @see org.alfresco.web.scripts.WebScriptRuntime#createRequest(org.alfresco.web.scripts.WebScriptMatch)
*/
@@ -110,13 +110,13 @@ public class PublicApiTenantWebScriptServletRuntime extends TenantWebScriptServl
{
// try
// {
// make the request input stream a BufferedInputStream so that the first x bytes can be reused.
// make the request input stream a BufferedInputStream so that the first x bytes can be reused.
// PublicApiHttpServletRequest wrapped = new PublicApiHttpServletRequest(req);
// TODO: construct org.springframework.extensions.webscripts.servlet.WebScriptServletResponse when
// org.alfresco.web.scripts.WebScriptServletResponse (deprecated) is removed
servletReq = new PublicApiTenantWebScriptServletRequest(this, req, match, serverProperties);
return servletReq;
// TODO: construct org.springframework.extensions.webscripts.servlet.WebScriptServletResponse when
// org.alfresco.web.scripts.WebScriptServletResponse (deprecated) is removed
servletReq = new PublicApiTenantWebScriptServletRequest(this, req, match, serverProperties);
return servletReq;
// }
// catch(IOException e)
// {