Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 24033 invoked from network); 17 Sep 2008 12:44:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Sep 2008 12:44:17 -0000 Received: (qmail 90148 invoked by uid 500); 17 Sep 2008 12:44:14 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 90063 invoked by uid 500); 17 Sep 2008 12:44:13 -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 90054 invoked by uid 99); 17 Sep 2008 12:44:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2008 05:44:13 -0700 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, 17 Sep 2008 12:43:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4C53823889FD; Wed, 17 Sep 2008 05:43:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r696277 - /jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java Date: Wed, 17 Sep 2008 12:43:55 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080917124356.4C53823889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed Sep 17 05:43:53 2008 New Revision: 696277 URL: http://svn.apache.org/viewvc?rev=696277&view=rev Log: 1.4: Resolved compile failure caused by JCR-1687 Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java?rev=696277&r1=696276&r2=696277&view=diff ============================================================================== --- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java (original) +++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java Wed Sep 17 05:43:53 2008 @@ -36,6 +36,7 @@ import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.NodeStateIterator; import org.apache.jackrabbit.core.persistence.PersistenceManager; +import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver; import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException; import org.apache.jackrabbit.spi.Path; import org.slf4j.Logger; @@ -256,7 +257,7 @@ if (excludedNodeId != null) { HierarchyManagerImpl hmgr = new HierarchyManagerImpl( - rootNodeId, itemMgr, nsReg.getPathResolver()); + rootNodeId, itemMgr, new DefaultNamePathResolver(nsReg)); excludePath = hmgr.getPath(excludedNodeId); }