http://www.alfresco.org/model/dictionary/1.0
- http://www.alfresco.org/model/wcmmodel/1.0
- http://www.alfresco.org/model/wcmappmodel/1.0
- http://www.alfresco.org/model/wcmworkflow/1.0
http://www.alfresco.org/model/rendition/1.0
http://www.alfresco.org/model/versionstore/1.0
http://www.alfresco.org/model/versionstore/2.0
diff --git a/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java b/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
index 27b2416acc..3be495f6d5 100644
--- a/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
+++ b/source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
@@ -63,8 +63,7 @@ import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest
*
* optional request parameters:
*
- * s -> the avm store id
- * w -> the wcm web application id
+ * s -> the store id
*
* Note: path is relative to the root path as configured for this webscript bean
*
@@ -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;
diff --git a/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryGet.java b/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryGet.java
index d05351ebd2..a76867c25c 100644
--- a/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/dictionary/DictionaryGet.java
@@ -74,7 +74,7 @@ public class DictionaryGet extends DictionaryWebServiceBase
Map> propdef = new HashMap>();
Map> assocdef = new HashMap>();
- // 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))
diff --git a/source/java/org/alfresco/repo/web/scripts/site/SiteExportGet.java b/source/java/org/alfresco/repo/web/scripts/site/SiteExportGet.java
index ea39b64568..93cd0f4860 100644
--- a/source/java/org/alfresco/repo/web/scripts/site/SiteExportGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/site/SiteExportGet.java
@@ -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
*/
diff --git a/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java b/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
index dfa7ea8eed..82bad8fa30 100644
--- a/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
+++ b/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
@@ -31,7 +31,6 @@ import java.util.Set;
import javax.servlet.http.HttpServletResponse;
-import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
diff --git a/source/test-java/org/alfresco/repo/web/scripts/groups/GroupsTest.java b/source/test-java/org/alfresco/repo/web/scripts/groups/GroupsTest.java
index dc93a2ca39..e609744066 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/groups/GroupsTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/groups/GroupsTest.java
@@ -786,7 +786,7 @@ public class GroupsTest extends BaseWebScriptTest
// Negative test Search for a group in a wrong zone
{
- Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + AuthorityService.ZONE_APP_WCM), Status.STATUS_OK);
+ Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + "SOME.THING"), Status.STATUS_OK);
JSONObject top = new JSONObject(response.getContentAsString());
logger.debug(response.getContentAsString());
// System.out.println(response.getContentAsString());
diff --git a/source/test-java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java b/source/test-java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
index 3e9f783f29..dc647bae45 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
@@ -823,7 +823,7 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
assertFalse("Found adhoc workflow when it was supposed to be excluded", adhocWorkflowPresent);
// filter with a wildcard and ensure they all get filtered out
- exclude = adhocDefName + ", jbpm$wcmwf:*";
+ exclude = adhocDefName;
response = sendRequest(new GetRequest(URL_WORKFLOW_DEFINITIONS + "?exclude=" + exclude), 200);
assertEquals(Status.STATUS_OK, response.getStatus());
json = new JSONObject(response.getContentAsString());
@@ -831,7 +831,6 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
assertNotNull(results);
adhocWorkflowPresent = false;
- boolean wcmWorkflowsPresent = false;
for (int i = 0; i < results.length(); i++)
{
JSONObject workflowDefinitionJSON = results.getJSONObject(i);
@@ -841,14 +840,9 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
{
adhocWorkflowPresent = true;
}
- if (name.startsWith("jbpm$wcmwf:"))
- {
- wcmWorkflowsPresent = true;
- }
}
assertFalse("Found adhoc workflow when it was supposed to be excluded", adhocWorkflowPresent);
- assertFalse("Found a WCM workflow when they were supposed to be excluded", wcmWorkflowsPresent);
}
public void testWorkflowDefinitionGet() throws Exception
diff --git a/source/test-resources/publicapi/test-model.xml b/source/test-resources/publicapi/test-model.xml
index 013eb4316f..6e951e3b73 100644
--- a/source/test-resources/publicapi/test-model.xml
+++ b/source/test-resources/publicapi/test-model.xml
@@ -7,7 +7,7 @@
0.1
-
+
@@ -17,7 +17,7 @@
Type 1
- wcm:avmcontent
+ cm:savedquery