Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 45521 invoked from network); 3 Jun 2009 15:14:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Jun 2009 15:14:03 -0000 Received: (qmail 40013 invoked by uid 500); 3 Jun 2009 15:14:15 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 39953 invoked by uid 500); 3 Jun 2009 15:14:15 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 39944 invoked by uid 99); 3 Jun 2009 15:14:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jun 2009 15:14:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jun 2009 15:14:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 68CDD238888D; Wed, 3 Jun 2009 15:13:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r781423 - in /jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons: nodetype/compact/CompactNodeTypeDefTest.java query/sql2/ParserTest.java Date: Wed, 03 Jun 2009 15:13:53 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090603151353.68CDD238888D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Wed Jun 3 15:13:52 2009 New Revision: 781423 URL: http://svn.apache.org/viewvc?rev=781423&view=rev Log: JCR-2003: JCR2SPI / SPI: Add support for JCR 2.0 - use valuefactory that supports 283 features Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/sql2/ParserTest.java Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java?rev=781423&r1=781422&r2=781423&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefTest.java Wed Jun 3 15:13:52 2009 @@ -30,7 +30,10 @@ import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.commons.namespace.NamespaceMapping; import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeDefDiff; -import org.apache.jackrabbit.value.ValueFactoryImpl; +import org.apache.jackrabbit.spi.commons.value.ValueFactoryQImpl; +import org.apache.jackrabbit.spi.commons.value.QValueFactoryImpl; + +import javax.jcr.ValueFactory; public class CompactNodeTypeDefTest extends TestCase { @@ -49,7 +52,8 @@ // Put imported node type def back into CND form with CND writer StringWriter sw = new StringWriter(); - CompactNodeTypeDefWriter.write(ntdList1, nsm, resolver, ValueFactoryImpl.getInstance(), sw); + ValueFactory vf = new ValueFactoryQImpl(QValueFactoryImpl.getInstance(), resolver); + CompactNodeTypeDefWriter.write(ntdList1, nsm, resolver, vf, sw); // Rerun the reader on the product of the writer cndReader = new CompactNodeTypeDefReader(new StringReader(sw.toString()), TEST_FILE, Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/sql2/ParserTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/sql2/ParserTest.java?rev=781423&r1=781422&r2=781423&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/sql2/ParserTest.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/sql2/ParserTest.java Wed Jun 3 15:13:52 2009 @@ -31,7 +31,8 @@ import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver; import org.apache.jackrabbit.spi.commons.query.qom.QueryObjectModelFactoryImpl; import org.apache.jackrabbit.spi.commons.query.qom.QueryObjectModelTree; -import org.apache.jackrabbit.value.ValueFactoryImpl; +import org.apache.jackrabbit.spi.commons.value.ValueFactoryQImpl; +import org.apache.jackrabbit.spi.commons.value.QValueFactoryImpl; /** * This class runs function tests on the JCR-SQL2 parser. @@ -57,9 +58,8 @@ protected void setUp() throws Exception { super.setUp(); - ValueFactory vf = ValueFactoryImpl.getInstance(); - NamePathResolver resolver = new DefaultNamePathResolver( - new DummyNamespaceResolver()); + NamePathResolver resolver = new DefaultNamePathResolver(new DummyNamespaceResolver()); + ValueFactory vf = new ValueFactoryQImpl(QValueFactoryImpl.getInstance(), resolver); QueryObjectModelFactoryImpl factory = new QOMF(resolver, vf); parser = new Parser(factory, vf); }