mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.1 to HEAD
6515: Fix for AWC-1362 (system error page when clicking on space that doesn't exist in navigator) 6516: Fix for AR-1688 - Vista 6518: Fix for AWC-1479, AWC-1199 and AWC-426 (javascript insertion into forum posts security related fixes) limit to subset of safe tags for posting 6519: Fix AR-1690 Web Scripts url.args is missing even though it's documented in WIKI 6520: Fix for AWC-1271 (component generator config ignored for associations) 6521: Fix AWC-1492 Some included javascript files in template/webscripts use the wrong app context path i.e. /alfresco when the app is called /alfzip 6522: Build fix 6523: - Fix rendering of tasks with no description in office portlets 6524: Added thread pool for index merging (AR-1633, AR-1579) 6525: One more fix for rendering of tasks with no description in office portlets 6527: Renamed axis jar to reflect version number. 6528: WebServices query cache refactoring git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -150,6 +150,7 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
protected NodeService nodeService;
|
||||
/** populated during setup */
|
||||
protected NodeRef rootNodeRef;
|
||||
private NodeRef cat;
|
||||
|
||||
@Override
|
||||
protected void onSetUpInTransaction() throws Exception
|
||||
@@ -187,6 +188,13 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
"Test_" + System.currentTimeMillis());
|
||||
rootNodeRef = nodeService.getRootNode(storeRef);
|
||||
|
||||
StoreRef catStoreRef = nodeService.createStore(
|
||||
StoreRef.PROTOCOL_WORKSPACE,
|
||||
"Test_cat_" + System.currentTimeMillis());
|
||||
NodeRef catRootNodeRef = nodeService.getRootNode(catStoreRef);
|
||||
|
||||
cat = nodeService.createNode(catRootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}cat"), ContentModel.TYPE_CATEGORY).getChildRef();
|
||||
|
||||
// downgrade integrity checks
|
||||
IntegrityChecker.setWarnInTransaction();
|
||||
}
|
||||
@@ -1142,7 +1150,7 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
properties.put(PROP_QNAME_QNAME_VALUE, TYPE_QNAME_TEST_CONTENT);
|
||||
properties.put(PROP_QNAME_PATH_VALUE, pathProperty);
|
||||
properties.put(PROP_QNAME_CONTENT_VALUE, new ContentData("url", "text/plain", 88L, "UTF-8"));
|
||||
properties.put(PROP_QNAME_CATEGORY_VALUE, rootNodeRef);
|
||||
properties.put(PROP_QNAME_CATEGORY_VALUE, cat);
|
||||
properties.put(PROP_QNAME_LOCALE_VALUE, Locale.CHINESE);
|
||||
properties.put(PROP_QNAME_NULL_VALUE, null);
|
||||
properties.put(PROP_QNAME_MULTI_VALUE, listProperty);
|
||||
@@ -1180,7 +1188,7 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
properties.put(PROP_QNAME_QNAME_VALUE, TYPE_QNAME_TEST_CONTENT);
|
||||
properties.put(PROP_QNAME_PATH_VALUE, pathProperty);
|
||||
properties.put(PROP_QNAME_CONTENT_VALUE, new ContentData("url", "text/plain", 88L, "UTF-8"));
|
||||
properties.put(PROP_QNAME_CATEGORY_VALUE, rootNodeRef);
|
||||
properties.put(PROP_QNAME_CATEGORY_VALUE, cat);
|
||||
properties.put(PROP_QNAME_LOCALE_VALUE, Locale.CHINESE);
|
||||
properties.put(PROP_QNAME_NULL_VALUE, null);
|
||||
properties.put(PROP_QNAME_MULTI_VALUE, listProperty);
|
||||
|
Reference in New Issue
Block a user