Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 78281 invoked from network); 15 Apr 2005 15:22:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Apr 2005 15:22:08 -0000 Received: (qmail 26096 invoked by uid 500); 15 Apr 2005 15:21:42 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 26065 invoked by uid 500); 15 Apr 2005 15:21:42 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 26053 invoked by uid 99); 15 Apr 2005 15:21:42 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 15 Apr 2005 08:21:36 -0700 Received: (qmail 78211 invoked by uid 65534); 15 Apr 2005 15:21:35 -0000 Message-ID: <20050415152135.78210.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 15 Apr 2005 15:21:35 -0000 Subject: svn commit: r161484 - in incubator/jackrabbit/trunk/src: grammar/sql/ java/org/apache/jackrabbit/core/ java/org/apache/jackrabbit/core/query/sql/ java/org/apache/jackrabbit/core/query/xpath/ test/org/apache/jackrabbit/core/query/ test/org/apache/jackrabbit/test/api/query/ To: jackrabbit-cvs@incubator.apache.org From: mreutegg@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mreutegg Date: Fri Apr 15 08:21:32 2005 New Revision: 161484 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161484 Log: Update to spec 0.16.4: - Change prefix for xpath functions. Use jcr (which maps to the jcr namespa= ce) instead of jcrfn. - Contains function now has two required parameters. Implementations must a= t least support: XPath: jcr:contains(., 'text'), SQL: CONTAINS(*, 'text') Modified: incubator/jackrabbit/trunk/src/grammar/sql/JCRSQL.jjt incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SearchMa= nager.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sq= l/QueryFormat.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xp= ath/QueryFormat.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xp= ath/XPathQueryBuilder.java incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/Fu= lltextQueryTest.java incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SQ= LTest.java incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/AbstractQueryTest.java incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/DerefQueryLevel1Test.java incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/SQLQueryLevel2Test.java incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/TextNodeTest.java incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/XPathQueryLevel2Test.java Modified: incubator/jackrabbit/trunk/src/grammar/sql/JCRSQL.jjt URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/grammar/s= ql/JCRSQL.jjt?view=3Ddiff&r1=3D161483&r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/grammar/sql/JCRSQL.jjt (original) +++ incubator/jackrabbit/trunk/src/grammar/sql/JCRSQL.jjt Fri Apr 15 08:21:= 32 2005 @@ -433,8 +433,7 @@ { - // currently optional - ( ( | (name =3D Identifier() { jjtThis.setPropertyName(name);= }) ) "," )? + ( | (name =3D Identifier() { jjtThis.setPropertyName(name); }= ) ) "," t =3D { jjtThis.setQuery(t.image.substring(1, t.im= age.length() - 1).replaceAll("''", "'")); } } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Se= archManager.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/SearchManager.java?view=3Ddiff&r1=3D161483&r2=3D1614= 84 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SearchMa= nager.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/SearchMa= nager.java Fri Apr 15 08:21:32 2005 @@ -69,11 +69,6 @@ private static final String NS_XS_PREFIX =3D "xs"; public static final String NS_XS_URI =3D "http://www.w3.org/2001/XMLSc= hema"; =20 - /** Namespace URI for JCR functions */ - // @todo check if consistent with spec - private static final String NS_JCRFN_PREFIX =3D "jcrfn"; - public static final String NS_JCRFN_URI =3D "http://www.jcp.org/jcr/xp= ath-functions/1.0"; - /** * The shared item state manager instance for the workspace. */ @@ -116,12 +111,6 @@ } catch (RepositoryException e) { // not yet known nsReg.registerNamespace(NS_FN_PREFIX, NS_FN_URI); - } - try { - nsReg.getPrefix(NS_JCRFN_URI); - } catch (RepositoryException e) { - // not yet known - nsReg.registerNamespace(NS_JCRFN_PREFIX, NS_JCRFN_URI); } =20 // initialize query handler Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/sql/QueryFormat.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/sql/QueryFormat.java?view=3Ddiff&r1=3D161483&r= 2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sq= l/QueryFormat.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/sq= l/QueryFormat.java Fri Apr 15 08:21:32 2005 @@ -365,7 +365,7 @@ } =20 public Object visit(DerefQueryNode node, Object data) { - exceptions.add(new InvalidQueryException("jcrfn:deref() function n= ot supported in SQL")); + exceptions.add(new InvalidQueryException("jcr:deref() function not= supported in SQL")); return data; } =20 Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/xpath/QueryFormat.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/xpath/QueryFormat.java?view=3Ddiff&r1=3D161483= &r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xp= ath/QueryFormat.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xp= ath/QueryFormat.java Fri Apr 15 08:21:32 2005 @@ -210,7 +210,7 @@ public Object visit(TextsearchQueryNode node, Object data) { StringBuffer sb =3D (StringBuffer) data; try { - sb.append(XPathQueryBuilder.JCRFN_CONTAINS.toJCRName(resolver)= ); + sb.append(XPathQueryBuilder.JCR_CONTAINS.toJCRName(resolver)); sb.append("("); if (node.getPropertyName() =3D=3D null) { sb.append("."); @@ -274,7 +274,7 @@ public Object visit(DerefQueryNode node, Object data) { StringBuffer sb =3D (StringBuffer) data; try { - sb.append(XPathQueryBuilder.JCRFN_DEREF.toJCRName(resolver)); + sb.append(XPathQueryBuilder.JCR_DEREF.toJCRName(resolver)); sb.append("(@"); sb.append(ISO9075.encode(node.getRefProperty()).toJCRName(reso= lver)); sb.append(", '"); @@ -318,7 +318,7 @@ sb.append(propName).append(" le "); appendValue(node, sb); } else if (node.getOperation() =3D=3D OPERATION_LIKE) { - sb.append(XPathQueryBuilder.JCRFN_LIKE.toJCRName(resolver)= ); + sb.append(XPathQueryBuilder.JCR_LIKE.toJCRName(resolver)); sb.append("(").append(propName).append(", "); appendValue(node, sb); sb.append(")"); Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/xpath/XPathQueryBuilder.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java?view=3Ddiff&r1=3D= 161483&r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xp= ath/XPathQueryBuilder.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/xp= ath/XPathQueryBuilder.java Fri Apr 15 08:21:32 2005 @@ -18,7 +18,6 @@ =20 import org.apache.jackrabbit.core.Constants; import org.apache.jackrabbit.core.IllegalNameException; -import org.apache.jackrabbit.core.NamespaceRegistryImpl; import org.apache.jackrabbit.core.NamespaceResolver; import org.apache.jackrabbit.core.NoPrefixDeclaredException; import org.apache.jackrabbit.core.QName; @@ -90,7 +89,7 @@ /** * QName for jcr:xmltext */ - static final QName JCR_XMLTEXT =3D new QName(NamespaceRegistryImpl.NS_= JCR_URI, "xmltext"); + static final QName JCR_XMLTEXT =3D new QName(Constants.NS_JCR_URI, "xm= ltext"); =20 /** * QName for last function. @@ -108,24 +107,24 @@ static final QName XS_DATETIME =3D new QName(SearchManager.NS_XS_URI, = "dateTime"); =20 /** - * QName for jcrfn:like + * QName for jcr:like */ - static final QName JCRFN_LIKE =3D new QName(SearchManager.NS_JCRFN_URI= , "like"); + static final QName JCR_LIKE =3D new QName(Constants.NS_JCR_URI, "like"= ); =20 /** - * QName for jcrfn:deref + * QName for jcr:deref */ - static final QName JCRFN_DEREF =3D new QName(SearchManager.NS_JCRFN_UR= I, "deref"); + static final QName JCR_DEREF =3D new QName(Constants.NS_JCR_URI, "dere= f"); =20 /** - * QName for jcrfn:contains + * QName for jcr:contains */ - static final QName JCRFN_CONTAINS =3D new QName(SearchManager.NS_JCRFN= _URI, "contains"); + static final QName JCR_CONTAINS =3D new QName(Constants.NS_JCR_URI, "c= ontains"); =20 /** * QName for jcr:root */ - static final QName JCR_ROOT =3D new QName(NamespaceRegistryImpl.NS_JCR= _URI, "root"); + static final QName JCR_ROOT =3D new QName(Constants.NS_JCR_URI, "root"= ); =20 /** * String constant for operator 'eq' @@ -680,7 +679,7 @@ // wrong number of arguments exceptions.add(new InvalidQueryException("Wrong number= of arguments for xs:dateTime")); } - } else if (JCRFN_CONTAINS.toJCRName(resolver).equals(fName)) { + } else if (JCR_CONTAINS.toJCRName(resolver).equals(fName)) { // check number of arguments if (node.jjtGetNumChildren() =3D=3D 3) { if (queryNode instanceof NAryQueryNode) { @@ -700,35 +699,14 @@ path.jjtAccept(this, contains); ((NAryQueryNode) queryNode).addOperand(contain= s); } else { - exceptions.add(new InvalidQueryException("Wron= g argument type for jcrfn:contains")); + exceptions.add(new InvalidQueryException("Wron= g argument type for jcr:contains")); } } - // todo first parameter is currently optional -> remove la= ter - } else if (node.jjtGetNumChildren() =3D=3D 2) { - SimpleNode literal =3D (SimpleNode) node.jjtGetChild(1= )=2EjjtGetChild(0); - if (queryNode instanceof NAryQueryNode) { - if (literal.getId() =3D=3D JJTSTRINGLITERAL) { - String value =3D literal.getValue(); - if (value.charAt(0) =3D=3D '"') { - value =3D value.replaceAll("\"\"", "\""); - } else { - value =3D value.replaceAll("''", "'"); - } - // strip quotes - value =3D value.substring(1, value.length() - = 1); - TextsearchQueryNode contains =3D new Textsearc= hQueryNode(queryNode, value); - ((NAryQueryNode) queryNode).addOperand(contain= s); - } else { - exceptions.add(new InvalidQueryException("Wron= g argument type for jcrfn:contains")); - } - } else { - exceptions.add(new InvalidQueryException("Unsuppor= ted location for function jcrfn:contains")); - } } else { // wrong number of arguments - exceptions.add(new InvalidQueryException("Wrong number= of arguments for jcrfn:contains")); + exceptions.add(new InvalidQueryException("Wrong number= of arguments for jcr:contains")); } - } else if (JCRFN_LIKE.toJCRName(resolver).equals(fName)) { + } else if (JCR_LIKE.toJCRName(resolver).equals(fName)) { // check number of arguments if (node.jjtGetNumChildren() =3D=3D 3) { if (queryNode instanceof NAryQueryNode) { @@ -739,7 +717,7 @@ node.jjtGetChild(1).jjtAccept(this, like); // check property name if (like.getProperty() =3D=3D null) { - exceptions.add(new InvalidQueryException("Wron= g first argument type for jcrfn:like")); + exceptions.add(new InvalidQueryException("Wron= g first argument type for jcr:like")); } =20 SimpleNode literal =3D (SimpleNode) node.jjtGetChi= ld(2).jjtGetChild(0); @@ -749,14 +727,14 @@ value =3D value.substring(1, value.length() - = 1); like.setStringValue(value); } else { - exceptions.add(new InvalidQueryException("Wron= g second argument type for jcrfn:like")); + exceptions.add(new InvalidQueryException("Wron= g second argument type for jcr:like")); } } else { - exceptions.add(new InvalidQueryException("Unsuppor= ted location for function jcrfn:like")); + exceptions.add(new InvalidQueryException("Unsuppor= ted location for function jcr:like")); } } else { // wrong number of arguments - exceptions.add(new InvalidQueryException("Wrong number= of arguments for jcrfn:like")); + exceptions.add(new InvalidQueryException("Wrong number= of arguments for jcr:like")); } } else if (FN_TRUE.toJCRName(resolver).equals(fName)) { if (queryNode.getType() =3D=3D QueryNode.TYPE_RELATION) { @@ -802,7 +780,7 @@ } else { exceptions.add(new InvalidQueryException("Unsupported = location for last()")); } - } else if (JCRFN_DEREF.toJCRName(resolver).equals(fName)) { + } else if (JCR_DEREF.toJCRName(resolver).equals(fName)) { // check number of arguments if (node.jjtGetNumChildren() =3D=3D 3) { if (queryNode.getType() =3D=3D QueryNode.TYPE_PATH) { @@ -813,7 +791,7 @@ node.jjtGetChild(1).jjtAccept(this, derefNode); // check property name if (derefNode.getRefProperty() =3D=3D null) { - exceptions.add(new InvalidQueryException("Wron= g first argument type for jcrfn:deref")); + exceptions.add(new InvalidQueryException("Wron= g first argument type for jcr:deref")); } =20 SimpleNode literal =3D (SimpleNode) node.jjtGetChi= ld(2).jjtGetChild(0); @@ -833,11 +811,11 @@ derefNode.setNameTest(name); } } else { - exceptions.add(new InvalidQueryException("Wron= g second argument type for jcrfn:like")); + exceptions.add(new InvalidQueryException("Wron= g second argument type for jcr:like")); } pathNode.addPathStep(derefNode); } else { - exceptions.add(new InvalidQueryException("Unsuppor= ted location for jcrfn:deref()")); + exceptions.add(new InvalidQueryException("Unsuppor= ted location for jcr:deref()")); } } } else { Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/qu= ery/FulltextQueryTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/core/query/FulltextQueryTest.java?view=3Ddiff&r1=3D161483= &r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/Fu= lltextQueryTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/Fu= lltextQueryTest.java Fri Apr 15 08:21:32 2005 @@ -34,7 +34,7 @@ =20 String sql =3D "SELECT * FROM nt:unstructured" + " WHERE jcr:path LIKE '" + testRoot + "/%" - + "' AND CONTAINS('fox')"; + + "' AND CONTAINS(*, 'fox')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 1); @@ -48,7 +48,7 @@ =20 String sql =3D "SELECT * FROM nt:unstructured" + " WHERE \"jcr:path\" =3D '" + testRoot + "/foo" - + "' AND CONTAINS('fox')"; + + "' AND CONTAINS(*, 'fox')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 1); @@ -67,7 +67,7 @@ =20 String sql =3D "SELECT * FROM nt:unstructured" + " WHERE \"jcr:path\" LIKE '" + testRoot + "/%" - + "' AND CONTAINS('fox test')"; + + "' AND CONTAINS(*, 'fox test')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 1); @@ -86,7 +86,7 @@ =20 String sql =3D "SELECT * FROM nt:unstructured" + " WHERE \"jcr:path\" LIKE '" + testRoot + "/%" - + "' AND CONTAINS('text ''fox jumps''')"; + + "' AND CONTAINS(*, 'text ''fox jumps''')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 1); @@ -105,7 +105,7 @@ =20 String sql =3D "SELECT * FROM nt:unstructured" + " WHERE \"jcr:path\" LIKE '" + testRoot + "/%" - + "' AND CONTAINS('text ''fox jumps'' -other')"; + + "' AND CONTAINS(*, 'text ''fox jumps'' -other')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 1); @@ -124,7 +124,7 @@ =20 String sql =3D "SELECT * FROM nt:unstructured" + " WHERE \"jcr:path\" LIKE '" + testRoot + "/%" - + "' AND CONTAINS('''fox jumps'' test OR other')"; + + "' AND CONTAINS(*, '''fox jumps'' test OR other')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 2); @@ -143,7 +143,7 @@ =20 String sql =3D "SELECT * FROM nt:unstructured" + " WHERE \"jcr:path\" LIKE '" + testRoot + "/%" - + "' AND CONTAINS('''fox juMps'' Test OR otheR')"; + + "' AND CONTAINS(*, '''fox juMps'' Test OR otheR')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 2); @@ -179,7 +179,7 @@ testRootNode.save(); =20 String sql =3D "/jcr:root" + testRoot + "/element(*, nt:unstructur= ed)" - + "[jcrfn:contains(., 'quick fox')]"; + + "[jcr:contains(., 'quick fox')]"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.XPATH); checkResult(q.execute(), 2); } @@ -214,7 +214,7 @@ testRootNode.save(); =20 String sql =3D "/jcr:root" + testRoot + "/element(*, nt:unstructur= ed)" - + "[jcrfn:contains(@title, 'quick fox')]"; + + "[jcr:contains(@title, 'quick fox')]"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.XPATH); checkResult(q.execute(), 1); } Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/qu= ery/SQLTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/core/query/SQLTest.java?view=3Ddiff&r1=3D161483&r2=3D1614= 84 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SQ= LTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/core/query/SQ= LTest.java Fri Apr 15 08:21:32 2005 @@ -43,7 +43,7 @@ =20 testRootNode.save(); =20 - String sql =3D "SELECT * FROM nt:unstructured WHERE contains('fox'= )"; + String sql =3D "SELECT * FROM nt:unstructured WHERE contains(*, 'f= ox')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 1); @@ -55,7 +55,7 @@ =20 testRootNode.save(); =20 - String sql =3D "SELECT foo.mytext, bla.foo FROM nt:unstructured WH= ERE contains('fox') AND NOT contains('bla')"; + String sql =3D "SELECT foo.mytext, bla.foo FROM nt:unstructured WH= ERE contains(*, 'fox') AND NOT contains(*, 'bla')"; Query q =3D superuser.getWorkspace().getQueryManager().createQuery= (sql, Query.SQL); QueryResult result =3D q.execute(); checkResult(result, 1); Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/query/AbstractQueryTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/query/AbstractQueryTest.java?view=3Ddiff&r1=3D16= 1483&r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/AbstractQueryTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/AbstractQueryTest.java Fri Apr 15 08:21:32 2005 @@ -39,11 +39,6 @@ public abstract class AbstractQueryTest extends AbstractJCRTest { =20 /** - * Namespace URI for jcr functions in XPath - */ - protected static final String NS_JCRFN_URI =3D "http://www.jcp.org/jcr= /xpath-functions/1.0"; - - /** * Resolved QName for jcr:score */ protected String jcrScore; @@ -59,14 +54,14 @@ protected String jcrRoot; =20 /** - * Resolved QName for jcrfn:contains + * Resolved QName for jcr:contains */ - protected String jcrfnContains; + protected String jcrContains; =20 /** - * Resolved QName for jcrfn:deref + * Resolved QName for jcr:deref */ - protected String jcrfnDeref; + protected String jcrDeref; =20 /** * Set-up the configuration values used for the test. Per default retr= ieves @@ -78,8 +73,8 @@ jcrScore =3D superuser.getNamespacePrefix(NS_JCR_URI) + ":score"; jcrPath =3D superuser.getNamespacePrefix(NS_JCR_URI) + ":path"; jcrRoot =3D superuser.getNamespacePrefix(NS_JCR_URI) + ":root"; - jcrfnContains =3D superuser.getNamespacePrefix(NS_JCRFN_URI) + ":c= ontains"; - jcrfnDeref =3D superuser.getNamespacePrefix(NS_JCRFN_URI) + ":dere= f"; + jcrContains =3D superuser.getNamespacePrefix(NS_JCR_URI) + ":conta= ins"; + jcrDeref =3D superuser.getNamespacePrefix(NS_JCR_URI) + ":deref"; } =20 /** Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/query/DerefQueryLevel1Test.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/query/DerefQueryLevel1Test.java?view=3Ddiff&r1= =3D161483&r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/DerefQueryLevel1Test.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/DerefQueryLevel1Test.java Fri Apr 15 08:21:32 2005 @@ -29,7 +29,7 @@ import java.util.ArrayList; =20 /** - * Tests the XPath function jcrfn:deref() in a level 1 repository. + * Tests the XPath function jcr:deref() in a level 1 repository. * * @test * @sources DerefQueryLevel1Test.java @@ -160,7 +160,7 @@ throws RepositoryException { StringBuffer stmt =3D new StringBuffer(); stmt.append("/").append(jcrRoot).append(refProperty.getParent().ge= tPath()); - stmt.append("/").append(jcrfnDeref).append("(@"); + stmt.append("/").append(jcrDeref).append("(@"); stmt.append(refProperty.getName()).append(", '"); stmt.append(nameTest).append("')"); return stmt.toString(); Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/query/SQLQueryLevel2Test.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/query/SQLQueryLevel2Test.java?view=3Ddiff&r1=3D1= 61483&r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/SQLQueryLevel2Test.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/SQLQueryLevel2Test.java Fri Apr 15 08:21:32 2005 @@ -139,7 +139,7 @@ tmp.append(jcrScore).append(", "); tmp.append(propertyName1); tmp.append(" FROM ").append(testNodeType); - tmp.append(" WHERE CONTAINS("); + tmp.append(" WHERE CONTAINS(*, "); tmp.append("'''quick brown'' -cat')"); return new Statement(tmp.toString(), Query.SQL); } Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/query/TextNodeTest.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/query/TextNodeTest.java?view=3Ddiff&r1=3D161483&= r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/TextNodeTest.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/TextNodeTest.java Fri Apr 15 08:21:32 2005 @@ -80,7 +80,7 @@ } =20 /** - * Tests if text() node test is equivalent with jcr:xmltext and jcrfn:= contains + * Tests if text() node test is equivalent with jcr:xmltext and jcr:co= ntains * matches content in jcr:xmlcharacters property. */ public void testTextNodeTestContains() throws RepositoryException { @@ -89,7 +89,7 @@ Node text2 =3D testRootNode.addNode(nodeName1, testNodeType).addNo= de(jcrXMLText); text2.setProperty(jcrXMLCharacters, "java content repository"); testRootNode.save(); - String xpath =3D "/" + jcrRoot + testRoot + "//text()[jcrfn:contai= ns('fox')]"; + String xpath =3D "/" + jcrRoot + testRoot + "//text()[" + jcrConta= ins + "(., 'fox')]"; executeXPathQuery(superuser, xpath, new Node[]{text1}); } =20 Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/ap= i/query/XPathQueryLevel2Test.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/= apache/jackrabbit/test/api/query/XPathQueryLevel2Test.java?view=3Ddiff&r1= =3D161483&r2=3D161484 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/XPathQueryLevel2Test.java (original) +++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/quer= y/XPathQueryLevel2Test.java Fri Apr 15 08:21:32 2005 @@ -135,8 +135,8 @@ private Statement getFullTextStatement() { StringBuffer tmp =3D new StringBuffer("/"); tmp.append(jcrRoot).append(testRoot); - tmp.append("/*[").append(jcrfnContains); - tmp.append("(\"'quick brown' -cat\")]"); + tmp.append("/*[").append(jcrContains); + tmp.append("(., \"'quick brown' -cat\")]"); tmp.append("/(@").append(jcrPath).append("|@").append(propertyName= 1); tmp.append("|@").append(jcrScore).append(")"); return new Statement(tmp.toString(), Query.XPATH);