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 
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

71
source/java/org/alfresco/repo/search/NodeServiceXPath.java
View File

@@ -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());
}
}