diff --git a/config/alfresco/bootstrap/customMessagesSpace.xml b/config/alfresco/bootstrap/customMessagesSpace.xml index 7dd99c34e2..c5099f4c11 100644 --- a/config/alfresco/bootstrap/customMessagesSpace.xml +++ b/config/alfresco/bootstrap/customMessagesSpace.xml @@ -1,6 +1,6 @@ - @@ -12,4 +12,4 @@ ${spaces.messages.name} - \ No newline at end of file + diff --git a/config/alfresco/bootstrap/customWebClientExtensionSpace.xml b/config/alfresco/bootstrap/customWebClientExtensionSpace.xml index b1f71c5103..18df478072 100644 --- a/config/alfresco/bootstrap/customWebClientExtensionSpace.xml +++ b/config/alfresco/bootstrap/customWebClientExtensionSpace.xml @@ -1,6 +1,6 @@ - @@ -12,4 +12,4 @@ ${spaces.web.client.extension.name} - \ No newline at end of file + diff --git a/config/alfresco/bootstrap/webScripts.xml b/config/alfresco/bootstrap/webScripts.xml index 5aafe6cd19..064480500f 100644 --- a/config/alfresco/bootstrap/webScripts.xml +++ b/config/alfresco/bootstrap/webScripts.xml @@ -1,6 +1,6 @@ - + @@ -383,4 +383,4 @@ - \ No newline at end of file + diff --git a/config/alfresco/bootstrap/webScriptsExtensions.xml b/config/alfresco/bootstrap/webScriptsExtensions.xml index d2901442d2..7e9884ff62 100644 --- a/config/alfresco/bootstrap/webScriptsExtensions.xml +++ b/config/alfresco/bootstrap/webScriptsExtensions.xml @@ -1,6 +1,6 @@ - + @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/config/alfresco/bootstrap/webScriptsReadme.xml b/config/alfresco/bootstrap/webScriptsReadme.xml index 6100fd7e08..d63feeddfd 100644 --- a/config/alfresco/bootstrap/webScriptsReadme.xml +++ b/config/alfresco/bootstrap/webScriptsReadme.xml @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ /app:company_home/app:dictionary/app:content_templates/cm:readme.ftl - + @@ -16,4 +16,4 @@ /app:company_home/app:dictionary/app:content_templates/cm:readme.ftl - \ No newline at end of file + diff --git a/config/alfresco/model/jcrModel.xml b/config/alfresco/model/jcrModel.xml deleted file mode 100644 index 599428b582..0000000000 --- a/config/alfresco/model/jcrModel.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - JCR Model Definitions - 1.0 - - - - - - - - - - - - - - - - - - sys:base - - - d:qname - true - true - - - d:qname - true - true - - - - - - nt:base - - - d:date - true - false - false - - - - - - nt:hierarchyNode - - - - false - true - - - nt:base - true - false - - jcr:content - false - - - - - - nt:hierarchyNode - - - - false - true - - - nt:hierarchyNode - false - true - - false - - - - - - nt:base - - - d:text - false - false - false - - - d:text - false - true - false - - - d:content - false - true - false - - true - false - true - - - - d:date - false - true - false - - - - mix:referenceable - - - - - - - - - - - d:text - true - true - - - - - - - - d:text - - - d:boolean - - - - - - - \ No newline at end of file diff --git a/config/alfresco/templates/following-email-templates.xml b/config/alfresco/templates/following-email-templates.xml index c53262e5f8..9e45893dca 100644 --- a/config/alfresco/templates/following-email-templates.xml +++ b/config/alfresco/templates/following-email-templates.xml @@ -1,7 +1,7 @@ - + ${spaces.templates.email.following.name} ${spaces.templates.email.following.name} diff --git a/config/alfresco/templates/invite-email-templates.xml b/config/alfresco/templates/invite-email-templates.xml index 858eac4e30..9a6bab3b15 100644 --- a/config/alfresco/templates/invite-email-templates.xml +++ b/config/alfresco/templates/invite-email-templates.xml @@ -3,7 +3,7 @@ /app:company_home/app:dictionary/app:email_templates/cm:invite - + @@ -19,7 +19,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/config/alfresco/templates/new-user-templates.xml b/config/alfresco/templates/new-user-templates.xml index dd93518b1c..b7804721ef 100644 --- a/config/alfresco/templates/new-user-templates.xml +++ b/config/alfresco/templates/new-user-templates.xml @@ -3,7 +3,7 @@ /app:company_home/app:dictionary/app:email_templates/cm:invite - + @@ -19,7 +19,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/config/alfresco/templates/notify_email_templates.xml b/config/alfresco/templates/notify_email_templates.xml index 1f2153f071..edd1983940 100644 --- a/config/alfresco/templates/notify_email_templates.xml +++ b/config/alfresco/templates/notify_email_templates.xml @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -104,4 +104,4 @@ - \ No newline at end of file + diff --git a/config/alfresco/templates/readme_template.xml b/config/alfresco/templates/readme_template.xml index 0aa97605e3..402cd146d1 100644 --- a/config/alfresco/templates/readme_template.xml +++ b/config/alfresco/templates/readme_template.xml @@ -1,6 +1,6 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/config/org/alfresco/repo/workflow/jbpm/jbpm.varmapping.xml b/config/org/alfresco/repo/workflow/jbpm/jbpm.varmapping.xml index eba185c2ad..4f1b74ad5e 100644 --- a/config/org/alfresco/repo/workflow/jbpm/jbpm.varmapping.xml +++ b/config/org/alfresco/repo/workflow/jbpm/jbpm.varmapping.xml @@ -184,14 +184,6 @@ - - - - - - - - diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java index d278f1edae..19593b7242 100644 --- a/source/java/org/alfresco/repo/jscript/Search.java +++ b/source/java/org/alfresco/repo/jscript/Search.java @@ -511,7 +511,7 @@ public class Search extends BaseScopableProcessorExtension implements Initializi * { * query: string, mandatory, in appropriate format and encoded for the given language * store: string, optional, defaults to 'workspace://SpacesStore' - * language: string, optional, one of: lucene, xpath, jcr-xpath, fts-alfresco - defaults to 'lucene' + * language: string, optional, one of: lucene, xpath, fts-alfresco - defaults to 'lucene' * templates: [], optional, Array of query language template objects (see below) - if supported by the language * sort: [], optional, Array of sort column objects (see below) - if supported by the language * page: object, optional, paging information object (see below) - if supported by the language diff --git a/source/java/org/alfresco/repo/search/DocumentNavigator.java b/source/java/org/alfresco/repo/search/DocumentNavigator.java index 5768a3be7b..76cea7b737 100644 --- a/source/java/org/alfresco/repo/search/DocumentNavigator.java +++ b/source/java/org/alfresco/repo/search/DocumentNavigator.java @@ -60,12 +60,6 @@ import org.jaxen.XPath; */ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNavigator { - private static QName JCR_ROOT = QName.createQName("http://www.jcp.org/jcr/1.0", "root"); - - private static QName JCR_PRIMARY_TYPE = QName.createQName("http://www.jcp.org/jcr/1.0", "primaryType"); - - private static QName JCR_MIXIN_TYPES = QName.createQName("http://www.jcp.org/jcr/1.0", "mixinTypes"); - private static final long serialVersionUID = 3618984485740165427L; private DictionaryService dictionaryService; @@ -108,30 +102,17 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa } } - public class JCRRootNodeChildAssociationRef extends ChildAssociationRef - { - - /** - * Comment for serialVersionUID - */ - private static final long serialVersionUID = -3890194577752476675L; - - public JCRRootNodeChildAssociationRef(QName assocTypeQName, NodeRef parentRef, QName childQName, NodeRef childRef) - { - super(assocTypeQName, parentRef, childQName, childRef); - } - - public JCRRootNodeChildAssociationRef(QName assocTypeQName, NodeRef parentRef, QName childQName, NodeRef childRef, boolean isPrimary, int nthSibling) - { - super(assocTypeQName, parentRef, childQName, childRef, isPrimary, nthSibling); - } - - } - private boolean followAllParentLinks; - private boolean useJCRRootNode; - + /** + * @deprecated useJCRRootNode parameter is now obsolete. + */ + public DocumentNavigator(DictionaryService dictionaryService, NodeService nodeService, SearchService searchService, + NamespacePrefixResolver nspr, boolean followAllParentLinks, boolean useJCRRootNode) + { + this(dictionaryService, nodeService, searchService, nspr, followAllParentLinks); + } + /** * @param dictionaryService * used to resolve the subtypeOf function and other @@ -149,7 +130,7 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa * parent-child association should be traversed */ public DocumentNavigator(DictionaryService dictionaryService, NodeService nodeService, SearchService searchService, - NamespacePrefixResolver nspr, boolean followAllParentLinks, boolean useJCRRootNode) + NamespacePrefixResolver nspr, boolean followAllParentLinks) { super(); this.dictionaryService = dictionaryService; @@ -157,7 +138,6 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa this.searchService = searchService; this.nspr = nspr; this.followAllParentLinks = followAllParentLinks; - this.useJCRRootNode = useJCRRootNode; } @@ -379,14 +359,6 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa properties.add(property); } } - if(useJCRRootNode) - { - properties.add(new Property(JCR_PRIMARY_TYPE, nodeService.getType(nodeRef), nodeRef)); - for(QName mixin : nodeService.getAspects(nodeRef)) - { - properties.add(new Property(JCR_MIXIN_TYPES, mixin, nodeRef)); - } - } return properties.iterator(); } @@ -400,18 +372,7 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa NodeRef childRef = assocRef.getChildRef(); QName qName = QName.createQName(namespaceURI, localName); List list = null; - // Add compatability for JCR 170 by including the root node. - if(isDocument(contextNode) && useJCRRootNode) - { - list = new ArrayList(1); - list = Collections.singletonList( - new JCRRootNodeChildAssociationRef( - ContentModel.ASSOC_CHILDREN, childRef, JCR_ROOT, childRef, true, 0)); - } - else - { - list = nodeService.getChildAssocs(childRef, RegexQNamePattern.MATCH_ALL, qName); - } + list = nodeService.getChildAssocs(childRef, RegexQNamePattern.MATCH_ALL, qName); // done return list.iterator(); } @@ -422,16 +383,7 @@ public class DocumentNavigator extends DefaultNavigator implements NamedAccessNa ChildAssociationRef assocRef = (ChildAssociationRef) o; NodeRef childRef = assocRef.getChildRef(); List list; - // Add compatability for JCR 170 by including the root node. - if(isDocument(o) && useJCRRootNode) - { - list = new ArrayList(1); - list.add(new JCRRootNodeChildAssociationRef(ContentModel.ASSOC_CHILDREN, childRef, JCR_ROOT, childRef, true, 0)); - } - else - { - list = nodeService.getChildAssocs(childRef); - } + list = nodeService.getChildAssocs(childRef); return list.iterator(); } diff --git a/source/java/org/alfresco/repo/search/NodeServiceXPath.java b/source/java/org/alfresco/repo/search/NodeServiceXPath.java index 312cb14a99..c0cceccf6d 100644 --- a/source/java/org/alfresco/repo/search/NodeServiceXPath.java +++ b/source/java/org/alfresco/repo/search/NodeServiceXPath.java @@ -88,8 +88,6 @@ public class NodeServiceXPath extends BaseXPath { private static final long serialVersionUID = 3834032441789592882L; - private static String JCR_URI = "http://www.jcp.org/jcr/1.0"; - private static Log logger = LogFactory.getLog(NodeServiceXPath.class); /** @@ -469,67 +467,6 @@ public class NodeServiceXPath extends BaseXPath } } - static class JCRContains implements Function - { - - public Object call(Context context, List args) throws FunctionCallException - { - if (args.size() == 2) - { - if (context.getNavigator().isAttribute(context.getNodeSet().get(0))) - { - throw new FunctionCallException("jcr:contains() does not apply to an attribute context."); - } - return evaluate(context.getNodeSet(), args.get(0), args.get(1), context.getNavigator()); - } - - throw new FunctionCallException("contains() requires two argument."); - } - - public Object evaluate(List nodes, Object identifier, Object pattern, Navigator nav) - { - if (nodes.size() != 1) - { - return false; - } - - QName qname = null; - NodeRef nodeRef = null; - - Object target = identifier; - - if (identifier instanceof List) - { - List list = (List) identifier; - if (list.isEmpty()) - { - return false; - } - // do not recurse: only first list should unwrap - target = list.get(0); - } - - if (nav.isElement(target)) - { - qname = null; // should use all attributes and full text index - nodeRef = ((ChildAssociationRef) target).getChildRef(); - } - else if (nav.isAttribute(target)) - { - qname = QName.createQName( - nav.getAttributeNamespaceUri(target), - ISO9075.decode(nav.getAttributeName(target))); - nodeRef = ((DocumentNavigator.Property) target).parent; - } - - String patternValue = StringFunction.evaluate(pattern, nav); - DocumentNavigator dNav = (DocumentNavigator) nav; - - return dNav.contains(nodeRef, qname, patternValue, SearchParameters.AND); - - } - } - static class Score implements Function { private Double one = new Double(1); @@ -694,14 +631,6 @@ public class NodeServiceXPath extends BaseXPath registerFunction("", "contains", new Contains()); registerFunction("", "first", new FirstFunction()); - - // 170 functions - - registerFunction(JCR_URI, "like", new Like()); - registerFunction(JCR_URI, "score", new Score()); - registerFunction(JCR_URI, "contains", new JCRContains()); - registerFunction(JCR_URI, "deref", new Deref()); - } } diff --git a/source/java/org/alfresco/repo/search/impl/JCR170Searcher.java b/source/java/org/alfresco/repo/search/impl/JCR170Searcher.java deleted file mode 100644 index 759af8be35..0000000000 --- a/source/java/org/alfresco/repo/search/impl/JCR170Searcher.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2005-2010 Alfresco Software Limited. - * - * This file is part of Alfresco - * - * 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 . - */ -package org.alfresco.repo.search.impl; - -import org.alfresco.repo.search.AbstractSearcherComponent; -import org.alfresco.service.cmr.repository.Path; -import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.service.cmr.search.QueryParameter; -import org.alfresco.service.cmr.search.QueryParameterDefinition; -import org.alfresco.service.cmr.search.ResultSet; -import org.alfresco.service.cmr.search.SearchParameters; -import org.alfresco.service.namespace.QName; - -/** - * Simple searcher against another store using the JSR 170 API. - *

- * This class is not fully implemented and hence still abstract. - */ -public abstract class JCR170Searcher extends AbstractSearcherComponent -{ - public ResultSet query(StoreRef store, String language, String query, Path[] queryOptions, - QueryParameter[] queryParameters) - { - // TODO Auto-generated method stub - throw new UnsupportedOperationException(); - } - - public ResultSet query(StoreRef store, String language, String query, Path[] attributePaths, QueryParameterDefinition[] queryParameterDefinitions) - { - // TODO Auto-generated method stub - throw new UnsupportedOperationException(); - } - - public ResultSet query(StoreRef store, QName queryId, QueryParameter[] queryParameters) - { - // TODO Auto-generated method stub - throw new UnsupportedOperationException(); - } - - public ResultSet query(SearchParameters searchParameters) - { - // TODO Auto-generated method stub - throw new UnsupportedOperationException(); - } -} diff --git a/source/java/org/alfresco/repo/search/impl/NodeSearcher.java b/source/java/org/alfresco/repo/search/impl/NodeSearcher.java index e51b2c4de2..81c7d538ab 100644 --- a/source/java/org/alfresco/repo/search/impl/NodeSearcher.java +++ b/source/java/org/alfresco/repo/search/impl/NodeSearcher.java @@ -75,53 +75,11 @@ public class NodeSearcher try { String xpath = xpathIn; - boolean useJCRXPath = language.equalsIgnoreCase(SearchService.LANGUAGE_JCR_XPATH); List order = null; - // replace element - if (useJCRXPath) - { - order = new ArrayList(); - // We do not allow variable substitution with this pattern - xpath = xpath.replaceAll("element\\(\\s*(\\*|\\w*:\\w*)\\s*,\\s*(\\*|\\w*:\\w*)\\s*\\)", - "$1[subtypeOf(\"$2\")]"); - String split[] = xpath.split("order\\s*by\\s*", 2); - xpath = split[0]; - - if (split.length > 1 && split[1].length() > 0) - { - String clauses[] = split[1].split("\\s,\\s"); - - for (String clause : clauses) - { - if (clause.startsWith("@")) - { - String attribute = clause.replaceFirst("@(\\p{Alpha}[\\w:]*)(?:\\s+(.*))?", "$1"); - String sort = clause.replaceFirst("@(\\p{Alpha}[\\w:]*)(?:\\s+(.*))?", "$2"); - - if (sort.length() == 0) - { - sort = "ascending"; - } - - QName attributeQName = QName.createQName(attribute, namespacePrefixResolver); - order.add(new AttributeOrder(attributeQName, sort.equalsIgnoreCase("ascending"))); - } - else if (clause.startsWith("jcr:score")) - { - // ignore jcr:score ordering - } - else - { - throw new IllegalArgumentException("Malformed order by expression " + split[1]); - } - } - } - } - DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searchService, - namespacePrefixResolver, followAllParentLinks, useJCRXPath); + namespacePrefixResolver, followAllParentLinks); NodeServiceXPath nsXPath = new NodeServiceXPath(xpath, documentNavigator, paramDefs); for (String prefix : namespacePrefixResolver.getPrefixes()) { @@ -236,10 +194,8 @@ public class NodeSearcher { try { - boolean useJCRXPath = language.equalsIgnoreCase(SearchService.LANGUAGE_JCR_XPATH); - DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searchService, - namespacePrefixResolver, followAllParentLinks, useJCRXPath); + namespacePrefixResolver, followAllParentLinks); NodeServiceXPath nsXPath = new NodeServiceXPath(xpath, documentNavigator, paramDefs); for (String prefix : namespacePrefixResolver.getPrefixes()) { diff --git a/source/test-java/org/alfresco/repo/search/SearcherComponentTest.java b/source/test-java/org/alfresco/repo/search/SearcherComponentTest.java index c7f8a6c065..102905ab0b 100644 --- a/source/test-java/org/alfresco/repo/search/SearcherComponentTest.java +++ b/source/test-java/org/alfresco/repo/search/SearcherComponentTest.java @@ -465,503 +465,6 @@ public class SearcherComponentTest extends TestCase assertTrue("Incorrect result: incorrect node retrieved", answer.contains(n3Ref)); } - public void testJCRRoot() throws Exception - { - - BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef); - // commit the node graph - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - - NodeServiceXPath xpath; - List list; - - DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null); - namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0"); - // create the document navigator - DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searcher, - namespacePrefixResolver, false, true); - - xpath = new NodeServiceXPath("/jcr:root", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - xpath = new NodeServiceXPath("/jcr:root/*", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(2, list.size()); - - xpath = new NodeServiceXPath("/*/*", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(2, list.size()); - } - - public void testBooleanFunctions() throws Exception - { - BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef); - // commit the node graph - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - - NodeServiceXPath xpath; - List list; - - DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null); - namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0"); - // create the document navigator - DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searcher, - namespacePrefixResolver, false, true); - - xpath = new NodeServiceXPath("/jcr:root[true()]", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - xpath = new NodeServiceXPath("/jcr:root[false()]", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root[not(true())]", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root[not(false())]", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - } - - public void testMutiValueProperties() throws Exception - { - BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef); - // commit the node graph - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - - NodeServiceXPath xpath; - List list; - - DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null); - namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0"); - namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE); - // create the document navigator - DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searcher, - namespacePrefixResolver, false, true); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp = 'first']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp = 'second']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp = 'third']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp != 'third']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp < 'e']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp > 'e']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp < 'first']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp <= 'first']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp > 'third']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvp >= 'third']", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvi < 1]", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvi <= 1]", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvi > 3]", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(0, list.size()); - - xpath = new NodeServiceXPath("/jcr:root//*[@test:mvi >= 3]", documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - } - - public void testElementNodeTest() throws Exception - { - BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef); - // commit the node graph - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - - NodeServiceXPath xpath; - List list; - - DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null); - namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0"); - namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE); - // create the document navigator - DocumentNavigator documentNavigator = new DocumentNavigator(dictionaryService, nodeService, searcher, - namespacePrefixResolver, false, true); - - xpath = new NodeServiceXPath("//element(*, *)".replaceAll( - "element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"), - documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(13, list.size()); - - xpath = new NodeServiceXPath("//element(jcr:root, *)".replaceAll( - "element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"), - documentNavigator, null); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - QueryParameterDefImpl paramDef; - - paramDef = new QueryParameterDefImpl(QName.createQName("test:type", namespacePrefixResolver), dictionaryService - .getDataType(DataTypeDefinition.QNAME), true, BaseNodeServiceTest.TYPE_QNAME_TEST_CONTENT - .toPrefixString(namespacePrefixResolver)); - xpath = new NodeServiceXPath("//element(*, test:content)".replaceAll( - "element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"), - documentNavigator, new QueryParameterDefinition[] { paramDef }); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(3, list.size()); - - paramDef = new QueryParameterDefImpl(QName.createQName("test:type", namespacePrefixResolver), dictionaryService - .getDataType(DataTypeDefinition.QNAME), true, BaseNodeServiceTest.TYPE_QNAME_TEST_CONTENT - .toPrefixString(namespacePrefixResolver)); - xpath = new NodeServiceXPath("//element(test:n6_p_n8, test:content)".replaceAll( - "element\\(\\s*(\\*|\\$?\\w*:\\w*)\\s*,\\s*(\\*|\\$?\\w*:\\w*)\\s*\\)", "$1[subtypeOf(\"$2\")]"), - documentNavigator, new QueryParameterDefinition[] { paramDef }); - list = xpath.selectNodes(new ChildAssociationRef(null, null, null, rootNodeRef)); - assertEquals(1, list.size()); - - } - - public void testJCRLike() throws Exception - { - BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef); - // commit the node graph - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - - DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null); - namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0"); - namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE); - // create the document navigator - // DocumentNavigator documentNavigator = new DocumentNavigator( - // dictionaryService, - // nodeService, - // searcher, - // namespacePrefixResolver, - // false, true); - - List answer = searcher.selectNodes(rootNodeRef, "//*[jcr:like(@test:animal, 'm__k%')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - } - - public void testJCRScore() throws Exception - { - BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef); - // commit the node graph - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - - DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null); - namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0"); - namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE); - // create the document navigator - // DocumentNavigator documentNavigator = new DocumentNavigator( - // dictionaryService, - // nodeService, - // searcher, - // namespacePrefixResolver, - // false, true); - - List answer; - - answer = searcher.selectNodes(rootNodeRef, "//.", null, namespacePrefixResolver, false); - assertEquals(9, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//.[jcr:score() = 1.0]", null, namespacePrefixResolver, false); - assertEquals(9, answer.size()); - } - - public void testJCRContains() throws Exception - { - BaseNodeServiceTest.buildNodeGraph(nodeService, rootNodeRef); - // commit the node graph - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - - DynamicNamespacePrefixResolver namespacePrefixResolver = new DynamicNamespacePrefixResolver(null); - namespacePrefixResolver.registerNamespace("jcr", "http://www.jcp.org/jcr/1.0"); - namespacePrefixResolver.registerNamespace(BaseNodeServiceTest.TEST_PREFIX, BaseNodeServiceTest.NAMESPACE); - // create the document navigator - // DocumentNavigator documentNavigator = new DocumentNavigator( - // dictionaryService, - // nodeService, - // searcher, - // namespacePrefixResolver, - // false, true); - - List answer; - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'bun')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'cake')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'bun cake')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'bun biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text1, 'bun cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'cake')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun cake')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'bun')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'cake')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'bun cake')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text3, 'cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text2, 'bun cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'bun')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'cake')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'bun cake')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'bun biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text12, 'bun cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'bun')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'cake')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'bun cake')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'bun biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text13, 'bun cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'bun')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'cake')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'bun cake')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'bun biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text23, 'bun cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(0, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'bun')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'cake')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'bun cake')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'bun biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(@test:text123, 'bun cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'bun')]", null, namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher - .selectNodes(rootNodeRef, "//*[jcr:contains(., 'cake')]", null, namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'biscuit')]", null, namespacePrefixResolver, - false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'bun cake')]", null, namespacePrefixResolver, - false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'bun biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - answer = searcher.selectNodes(rootNodeRef, "//*[jcr:contains(., 'bun cake biscuit')]", null, - namespacePrefixResolver, false); - assertEquals(1, answer.size()); - - } - public static void main(String[] args) { String escape = "\\\t\n\""; diff --git a/source/test-resources/org/alfresco/jcr/tck/testExcludeList.txt b/source/test-resources/org/alfresco/jcr/tck/testExcludeList.txt deleted file mode 100644 index 5d1efcc81c..0000000000 --- a/source/test-resources/org/alfresco/jcr/tck/testExcludeList.txt +++ /dev/null @@ -1,2 +0,0 @@ -version=0.6.0 -list=org.apache.jackrabbit.test.api.AddNodeTest,org.apache.jackrabbit.test.api.CheckPermissionTest,org.apache.jackrabbit.test.api.DocumentViewImportTest,org.apache.jackrabbit.test.api.ImpersonateTest,org.apache.jackrabbit.test.api.lock.SetValueLockExceptionTest,org.apache.jackrabbit.test.api.NamespaceRegistryTest,org.apache.jackrabbit.test.api.NodeAddMixinTest,org.apache.jackrabbit.test.api.NodeCanAddMixinTest,org.apache.jackrabbit.test.api.NodeItemIsModifiedTest,org.apache.jackrabbit.test.api.NodeItemIsNewTest,org.apache.jackrabbit.test.api.NodeOrderableChildNodesTest,org.apache.jackrabbit.test.api.NodeRemoveMixinTest,org.apache.jackrabbit.test.api.NodeTest,org.apache.jackrabbit.test.api.NodeUUIDTest,org.apache.jackrabbit.test.api.PropertyItemIsModifiedTest,org.apache.jackrabbit.test.api.PropertyItemIsNewTest,org.apache.jackrabbit.test.api.PropertyTest,org.apache.jackrabbit.test.api.query.ElementTest,org.apache.jackrabbit.test.api.query.GetPersistentQueryPathTest,org.apache.jackrabbit.test.api.query.OrderByDateTest,org.apache.jackrabbit.test.api.query.OrderByDoubleTest,org.apache.jackrabbit.test.api.query.OrderByLongTest,org.apache.jackrabbit.test.api.query.OrderByMultiTypeTest,org.apache.jackrabbit.test.api.query.OrderByStringTest,org.apache.jackrabbit.test.api.query.SaveTest,org.apache.jackrabbit.test.api.query.SQLQueryLevel2Test,org.apache.jackrabbit.test.api.query.XPathQueryLevel2Test,org.apache.jackrabbit.test.api.ReferencesTest,org.apache.jackrabbit.test.api.SerializationTest,org.apache.jackrabbit.test.api.SessionTest,org.apache.jackrabbit.test.api.SetPropertyAssumeTypeTest,org.apache.jackrabbit.test.api.SetPropertyBooleanTest,org.apache.jackrabbit.test.api.SetPropertyCalendarTest,org.apache.jackrabbit.test.api.SetPropertyConstraintViolationExceptionTest,org.apache.jackrabbit.test.api.SetPropertyDoubleTest,org.apache.jackrabbit.test.api.SetPropertyInputStreamTest,org.apache.jackrabbit.test.api.SetPropertyLongTest,org.apache.jackrabbit.test.api.SetPropertyNodeTest,org.apache.jackrabbit.test.api.SetPropertyStringTest,org.apache.jackrabbit.test.api.SetPropertyValueTest,org.apache.jackrabbit.test.api.SetValueBinaryTest,org.apache.jackrabbit.test.api.SetValueBooleanTest,org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest,org.apache.jackrabbit.test.api.SetValueDateTest,org.apache.jackrabbit.test.api.SetValueDoubleTest,org.apache.jackrabbit.test.api.SetValueLongTest,org.apache.jackrabbit.test.api.SetValueReferenceTest,org.apache.jackrabbit.test.api.SetValueStringTest,org.apache.jackrabbit.test.api.SetValueValueFormatExceptionTest,org.apache.jackrabbit.test.api.SetValueVersionExceptionTest,org.apache.jackrabbit.test.api.ValueFactoryTest,org.apache.jackrabbit.test.api.WorkspaceCloneReferenceableTest,org.apache.jackrabbit.test.api.WorkspaceCloneSameNameSibsTest,org.apache.jackrabbit.test.api.WorkspaceCloneTest,org.apache.jackrabbit.test.api.WorkspaceCloneVersionableTest,org.apache.jackrabbit.test.api.WorkspaceCopyBetweenWorkspacesReferenceableTest,org.apache.jackrabbit.test.api.WorkspaceCopyBetweenWorkspacesSameNameSibsTest,org.apache.jackrabbit.test.api.WorkspaceCopyBetweenWorkspacesTest,org.apache.jackrabbit.test.api.WorkspaceCopyBetweenWorkspacesVersionableTest,org.apache.jackrabbit.test.api.WorkspaceCopyReferenceableTest,org.apache.jackrabbit.test.api.WorkspaceCopySameNameSibsTest,org.apache.jackrabbit.test.api.WorkspaceCopyTest,org.apache.jackrabbit.test.api.WorkspaceCopyVersionableTest,org.apache.jackrabbit.test.api.WorkspaceMoveReferenceableTest,org.apache.jackrabbit.test.api.WorkspaceMoveSameNameSibsTest,org.apache.jackrabbit.test.api.WorkspaceMoveTest,org.apache.jackrabbit.test.api.WorkspaceMoveVersionableTest,org.apache.jackrabbit.test.api.version.CheckinTest,org.apache.jackrabbit.test.api.version.CheckoutTest,org.apache.jackrabbit.test.api.version.GetContainingHistoryTest,org.apache.jackrabbit.test.api.version.GetCreatedTest,org.apache.jackrabbit.test.api.version.GetPredecessorsTest,org.apache.jackrabbit.test.api.version.GetReferencesNodeTest,org.apache.jackrabbit.test.api.version.GetVersionableUUIDTest,org.apache.jackrabbit.test.api.version.MergeCancelMergeTest,org.apache.jackrabbit.test.api.version.MergeCheckedoutSubNodeTest,org.apache.jackrabbit.test.api.version.MergeDoneMergeTest,org.apache.jackrabbit.test.api.version.MergeNodeIteratorTest,org.apache.jackrabbit.test.api.version.MergeNodeTest,org.apache.jackrabbit.test.api.version.MergeNonVersionableSubNodeTest,org.apache.jackrabbit.test.api.version.MergeSubNodeTest,org.apache.jackrabbit.test.api.version.OnParentVersionAbortTest,org.apache.jackrabbit.test.api.version.OnParentVersionComputeTest,org.apache.jackrabbit.test.api.version.OnParentVersionCopyTest,org.apache.jackrabbit.test.api.version.OnParentVersionIgnoreTest,org.apache.jackrabbit.test.api.version.OnParentVersionInitializeTest,org.apache.jackrabbit.test.api.version.RemoveVersionTest,org.apache.jackrabbit.test.api.version.RestoreTest,org.apache.jackrabbit.test.api.version.SessionMoveVersionExceptionTest,org.apache.jackrabbit.test.api.version.VersionGraphTest,org.apache.jackrabbit.test.api.version.VersionHistoryTest,org.apache.jackrabbit.test.api.version.VersionLabelTest,org.apache.jackrabbit.test.api.version.VersionStorageTest,org.apache.jackrabbit.test.api.version.VersionTest,org.apache.jackrabbit.test.api.version.WorkspaceMoveVersionExceptionTest,org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest,org.apache.jackrabbit.test.api.lock.LockTest,org.apache.jackrabbit.test.api.query.SQLJcrPathTest,org.apache.jackrabbit.test.api.query.SQLJoinTest,org.apache.jackrabbit.test.api.query.SQLOrderByTest,org.apache.jackrabbit.test.api.query.SQLPathTest,org.apache.jackrabbit.test.api.observation.AddEventListenerTest,org.apache.jackrabbit.test.api.observation.EventIteratorTest,org.apache.jackrabbit.test.api.observation.EventTest,org.apache.jackrabbit.test.api.observation.GetRegisteredEventListenersTest,org.apache.jackrabbit.test.api.observation.LockingTest,org.apache.jackrabbit.test.api.observation.NodeAddedTest,org.apache.jackrabbit.test.api.observation.NodeMovedTest,org.apache.jackrabbit.test.api.observation.NodeRemovedTest,org.apache.jackrabbit.test.api.observation.NodeReorderTest,org.apache.jackrabbit.test.api.observation.PropertyAddedTest,org.apache.jackrabbit.test.api.observation.PropertyChangedTest,org.apache.jackrabbit.test.api.observation.PropertyRemovedTest,org.apache.jackrabbit.test.api.observation.WorkspaceOperationTest,org.apache.jackrabbit.test.api.query.TextNodeTest,org.apache.jackrabbit.test.api.SessionUUIDTest \ No newline at end of file diff --git a/source/test-resources/org/alfresco/jcr/test/docview.xml b/source/test-resources/org/alfresco/jcr/test/docview.xml deleted file mode 100644 index 25fd8d1296..0000000000 --- a/source/test-resources/org/alfresco/jcr/test/docview.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/test-resources/org/alfresco/jcr/test/myModel.xml b/source/test-resources/org/alfresco/jcr/test/myModel.xml deleted file mode 100644 index f142e93f43..0000000000 --- a/source/test-resources/org/alfresco/jcr/test/myModel.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - My test model - 1.0 - - - - - - - - - - - - - - A - cm:folder - - - - my:b - false - false - - - - - my:baseAspect - - - - - B - cm:folder - - my:baseAspect - - - - - C - cm:folder - - - - false - true - - - sys:base - false - true - - false - - - - - - - - - - Base Aspect - - - - - \ No newline at end of file diff --git a/source/test-resources/org/alfresco/jcr/test/sysview.xml b/source/test-resources/org/alfresco/jcr/test/sysview.xml deleted file mode 100644 index ab7025b359..0000000000 --- a/source/test-resources/org/alfresco/jcr/test/sysview.xml +++ /dev/null @@ -1,682 +0,0 @@ - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 36110c2e-68bf-11da-98b9-375bcb5cbca6 - - - true - - - 3.141592653589793 - - - 36110c2e-68bf-11da-98b9-375bcb5cbca6 - - - 2005-09-16T19:20:05.034+01:00 - - - 90834953485278298 - - - jcrtest:test - - - workspace - - - 36110c2e-68bf-11da-98b9-375bcb5cbca6 - - - 2005-09-16T20:20:05.555+01:00 - - - test - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 36137d2f-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - 36137d2f-68bf-11da-98b9-375bcb5cbca6 - - - 36137d2f-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 36137d30-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - 36137d30-68bf-11da-98b9-375bcb5cbca6 - - - 36137d30-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 3615c721-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - 3615c721-68bf-11da-98b9-375bcb5cbca6 - - - 3615c721-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 3615c722-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - 3615c722-68bf-11da-98b9-375bcb5cbca6 - - - 3615c722-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 36183823-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - 36183823-68bf-11da-98b9-375bcb5cbca6 - - - value one - value two - value three - - - 36183823-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - cm:content - - - cm:auditable - sys:referenceable - mix:referenceable - - - 36183824-68bf-11da-98b9-375bcb5cbca6 - - - System - - - 2005-12-09T14:22:21.676Z - - - 36183824-68bf-11da-98b9-375bcb5cbca6 - - - System - - - workspace - - - dHJ1ZQ== - - - Test Content - - - test - - - 2005-12-09T14:22:21.660Z - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 361f6416-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - 361f6416-68bf-11da-98b9-375bcb5cbca6 - - - 361f6416-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 3621ae07-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - a - - - 3621ae07-68bf-11da-98b9-375bcb5cbca6 - - - 3621ae07-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 3621ae08-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - c - - - 3621ae08-68bf-11da-98b9-375bcb5cbca6 - - - 3621ae08-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 3621ae09-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - e - - - 3621ae09-68bf-11da-98b9-375bcb5cbca6 - - - 3621ae09-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 36241f0a-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - g - - - 36241f0a-68bf-11da-98b9-375bcb5cbca6 - - - 36241f0a-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 36241f0b-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - b - - - 36241f0b-68bf-11da-98b9-375bcb5cbca6 - - - 36241f0b-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 3626900c-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - d - - - 3626900c-68bf-11da-98b9-375bcb5cbca6 - - - 3626900c-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 3628d9fd-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - f - - - 3628d9fd-68bf-11da-98b9-375bcb5cbca6 - - - 3628d9fd-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testtype - - - sys:referenceable - mix:referenceable - - - 3628d9fe-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - h - - - 3628d9fe-68bf-11da-98b9-375bcb5cbca6 - - - 3628d9fe-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - - jcrtest:testdoc - - - sys:referenceable - mix:referenceable - - - 362b4aff-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - Doc 1 - - - 362b4aff-68bf-11da-98b9-375bcb5cbca6 - - - 362b4aff-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - jcrtest:testpara - - - sys:referenceable - mix:referenceable - - - 362d94f0-68bf-11da-98b9-375bcb5cbca6 - - - P 1 1 - - - workspace - - - 362d94f0-68bf-11da-98b9-375bcb5cbca6 - - - 362d94f0-68bf-11da-98b9-375bcb5cbca6 - - - A bit of wiffle - - - test - - - - - jcrtest:testpara - - - sys:referenceable - mix:referenceable - - - 362d94f1-68bf-11da-98b9-375bcb5cbca6 - - - P 1 2 - - - workspace - - - 362d94f1-68bf-11da-98b9-375bcb5cbca6 - - - 362d94f1-68bf-11da-98b9-375bcb5cbca6 - - - More whitterings - - - test - - - - - jcrtest:testpara - - - sys:referenceable - mix:referenceable - - - 362d94f2-68bf-11da-98b9-375bcb5cbca6 - - - P 1 3 - - - workspace - - - 362d94f2-68bf-11da-98b9-375bcb5cbca6 - - - 362d94f2-68bf-11da-98b9-375bcb5cbca6 - - - Carrot, spud, turnip and leek. - - - test - - - - - - jcrtest:testdoc - - - sys:referenceable - mix:referenceable - - - 363005f3-68bf-11da-98b9-375bcb5cbca6 - - - workspace - - - Doc 2 - - - 363005f3-68bf-11da-98b9-375bcb5cbca6 - - - 363005f3-68bf-11da-98b9-375bcb5cbca6 - - - test - - - - jcrtest:testpara - - - sys:referenceable - mix:referenceable - - - 363005f4-68bf-11da-98b9-375bcb5cbca6 - - - P 2 1 - - - workspace - - - 363005f4-68bf-11da-98b9-375bcb5cbca6 - - - 363005f4-68bf-11da-98b9-375bcb5cbca6 - - - tiger, lion - - - test - - - - - jcrtest:testpara - - - sys:referenceable - mix:referenceable - - - 363276f5-68bf-11da-98b9-375bcb5cbca6 - - - P 2 2 - - - workspace - - - 363276f5-68bf-11da-98b9-375bcb5cbca6 - - - 363276f5-68bf-11da-98b9-375bcb5cbca6 - - - biscuit, bun, cake - - - test - - - - - jcrtest:testpara - - - sys:referenceable - mix:referenceable - - - 363276f6-68bf-11da-98b9-375bcb5cbca6 - - - P 2 3 - - - workspace - - - 363276f6-68bf-11da-98b9-375bcb5cbca6 - - - 363276f6-68bf-11da-98b9-375bcb5cbca6 - - - penguin, hawk, dove - - - test - - - - - \ No newline at end of file diff --git a/source/test-resources/org/alfresco/jcr/test/test-context.xml b/source/test-resources/org/alfresco/jcr/test/test-context.xml deleted file mode 100644 index 00037c113f..0000000000 --- a/source/test-resources/org/alfresco/jcr/test/test-context.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - org/alfresco/jcr/test/testModel.xml - org/alfresco/jcr/test/myModel.xml - - - - - diff --git a/source/test-resources/org/alfresco/jcr/test/testContent.txt b/source/test-resources/org/alfresco/jcr/test/testContent.txt deleted file mode 100644 index f32a5804e2..0000000000 --- a/source/test-resources/org/alfresco/jcr/test/testContent.txt +++ /dev/null @@ -1 +0,0 @@ -true \ No newline at end of file diff --git a/source/test-resources/org/alfresco/jcr/test/testData.xml b/source/test-resources/org/alfresco/jcr/test/testData.xml deleted file mode 100644 index 49c8bf88e0..0000000000 --- a/source/test-resources/org/alfresco/jcr/test/testData.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - true - 2005-09-16T18:20:05.034Z - 3.141592653589793 - 90834953485278298 - {http://www.alfresco.org/test/jcr/1.0}test - 2005-09-16T20:20:05.555+01:00 - - - - - - - - - - - - - - - - value one - value two - value three - - - - - - Test Content - contentUrl=org/alfresco/jcr/test/testContent.txt|mimetype=text/plain|size=|encoding=UTF-8 - - - - - - - - a - - - c - - - e - - - g - - - b - - - d - - - f - - - h - - - Doc 1 - - - P 1 1 - A bit of wiffle - - - P 1 2 - More whitterings - - - P 1 3 - Carrot, spud, turnip and leek. - - - - - Doc 2 - - - P 2 1 - tiger, lion - - - P 2 2 - biscuit, bun, cake - - - P 2 3 - penguin, hawk, dove - - - - - - - - - - diff --git a/source/test-resources/org/alfresco/jcr/test/testModel.xml b/source/test-resources/org/alfresco/jcr/test/testModel.xml deleted file mode 100644 index 75a8f640c7..0000000000 --- a/source/test-resources/org/alfresco/jcr/test/testModel.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - JCR Test Model Definitions - 1.0 - - - - - - - - - - - - - - Base Test Type - sys:base - - - - sys:base - - - - - - - Test Type - jcrtest:basetesttype - - - d:boolean - - - d:date - - - d:double - - - d:long - - - d:qname - - - d:text - - - d:text - true - - - d:text - - - - - - Test Doc Type - jcrtest:basetesttype - - - d:text - - - - - - Test Doc Type - sys:base - - - d:text - - - d:text - - - - - - Test Set Properties - jcrtest:basetesttype - - - d:boolean - - - d:boolean - true - - - d:date - - - d:date - true - - - d:double - - - d:double - true - - - d:long - - - d:long - true - - - d:qname - - - d:qname - true - - - d:text - - - d:text - true - - - d:content - - - d:noderef - - - d:noderef - true - - - d:any - - - d:any - true - - - - - - - \ No newline at end of file diff --git a/source/test-resources/org/alfresco/jcr/test/testQuick.jpg b/source/test-resources/org/alfresco/jcr/test/testQuick.jpg deleted file mode 100644 index 08473b8e8b..0000000000 Binary files a/source/test-resources/org/alfresco/jcr/test/testQuick.jpg and /dev/null differ