inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
79326: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      79090: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removed references to http://www.jcp.org/jcr (left in web-scripts-application-context.xml
           and multiple versions of opencmis-gnamefilter-context.xml)
      78990: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removing references to "jcr-xpath" - Biggest changes were to: DocumentNavigator, NodeServiceXPath and NodeSearcher
         - SearcherComponentTest has a lot of tests removed that appeared to be JCR specific
         - There are still a lot of namespace references in XML files to http://www.jcp.org/jcr/1.0 etc.
         - Left a few  references to "JSR 170" and JCR in java classes as they looked like they might be common with other bits.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-09-03 15:21:53 +00:00
parent ef18c89175
commit c717551907
27 changed files with 51 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
source/java/org/alfresco/repo/search/DocumentNavigator.java
View File

@@ -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 <code>serialVersionUID</code>
*/
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 <b>subtypeOf</b> 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<? extends ChildAssociationRef> list = null;
// Add compatability for JCR 170 by including the root node.
if(isDocument(contextNode) && useJCRRootNode)
{
list = new ArrayList<ChildAssociationRef>(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<ChildAssociationRef> list;
// Add compatability for JCR 170 by including the root node.
if(isDocument(o) && useJCRRootNode)
{
list = new ArrayList<ChildAssociationRef>(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();
}