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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78421: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75797: ACE-2149: EOL AVM / WCM
       - Removal from 'remote-api' project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:11:32 +00:00
parent 4249c9ac4b
commit 4e8556fc9b
18 changed files with 8 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
View File

@@ -63,8 +63,7 @@ import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest
* </pre><p>
* optional request parameters:
* <pre>
* s -> the avm store id
* w -> the wcm web application id
* s -> the store id
* </pre><p>
* Note: path is relative to the root path as configured for this webscript bean
* <p>
@@ -94,10 +93,8 @@ import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest
public abstract class BaseRemoteStore extends AbstractWebScript
{
public static final String TOKEN_STORE = "s";
public static final String TOKEN_WEBAPP = "w";
public static final String REQUEST_PARAM_STORE = "s";
public static final String REQUEST_PARAM_WEBAPP = "w";
private static final Log logger = LogFactory.getLog(BaseRemoteStore.class);
@@ -179,7 +176,6 @@ public abstract class BaseRemoteStore extends AbstractWebScript
// values that we need to determine
String methodName = null;
String store = null;
String webapp = null;
StringBuilder pathBuilder = new StringBuilder(128);
// tokenize the path and figure out tokenized values
@@ -201,15 +197,6 @@ public abstract class BaseRemoteStore extends AbstractWebScript
el = (tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null);
}
if (TOKEN_WEBAPP.equals(el))
{
// if the token is TOKEN_WEBAPP, then the next token is a WCM webapp id
webapp = tokenizer.nextToken();
// reset element
el = (tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null);
}
while (el != null)
{
pathBuilder.append('/');
@@ -241,18 +228,6 @@ public abstract class BaseRemoteStore extends AbstractWebScript
}
}
// if we don't have a webapp, check whether it may have been passed in on a request parameter
if (webapp == null)
{
webapp = req.getParameter(REQUEST_PARAM_WEBAPP);
}
// if we do have a webapp, allow for path prepending
if (webapp != null)
{
pathBuilder.insert(0, "/www/avm_webapps/" + webapp);
}
String path = pathBuilder.toString();
long start = 0;

2
source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryGet.java
View File

@@ -74,7 +74,7 @@ public class DictionaryGet extends DictionaryWebServiceBase
Map<QName, Collection<PropertyDefinition>> propdef = new HashMap<QName, Collection<PropertyDefinition>>();
Map<QName, Collection<AssociationDefinition>> assocdef = new HashMap<QName, Collection<AssociationDefinition>>();
// check configured list of model namespaces to ignore i.e. wcm
// check configured list of model namespaces to ignore
for (String ns : this.namespaceService.getURIs())
{
if (!ignoreNamespaces.contains(ns))

3
source/java/org/alfresco/repo/web/scripts/site/SiteExportGet.java
View File

@@ -57,9 +57,6 @@ import org.springframework.extensions.webscripts.WebScriptResponse;
/**
* Exports a Site as a zip of ACPs.
*
* As of 4.0, the export no longer includes an AVM Dump, as
* the site config is now in the main site ACP.
*
* @author Nick Burch
* @since 3.5
*/