Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 86899813C for ; Tue, 16 Aug 2011 18:01:20 +0000 (UTC) Received: (qmail 25755 invoked by uid 500); 16 Aug 2011 18:01:20 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 25724 invoked by uid 500); 16 Aug 2011 18:01:19 -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 25717 invoked by uid 99); 16 Aug 2011 18:01:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Aug 2011 18:01:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 16 Aug 2011 18:01:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 43EC5238888F; Tue, 16 Aug 2011 18:00:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1158404 - /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Date: Tue, 16 Aug 2011 18:00:58 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110816180058.43EC5238888F@eris.apache.org> Author: mduerig Date: Tue Aug 16 18:00:57 2011 New Revision: 1158404 URL: http://svn.apache.org/viewvc?rev=1158404&view=rev Log: Microkernel based Jackrabbit prototype (WIP) Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1158404&r1=1158403&r2=1158404&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Tue Aug 16 18:00:57 2011 @@ -332,49 +332,28 @@ public class RepositoryServiceImpl exten public Iterator getItemInfos(SessionInfo sessionInfo, ItemId itemId) throws RepositoryException { try { - if (!itemId.denotesNode()) { - PropertyInfo info = getPropertyInfo(sessionInfo, (PropertyId) itemId); - return Iterators.singleton(info); - } - else { - NodeId nodeId = (NodeId) itemId; - String wspName = sessionInfo.getWorkspaceName(); - Path path = getPath(nodeId); - String mkPath = Paths.pathToString(wspName, path); - String rev = microKernel.getHeadRevision(); - - if (microKernel.nodeExists(mkPath, rev)) { - String json = microKernel.getNodes(mkPath, rev); - return buildItemInfos(path, json, readFromDataStore); - } - else { - throw new PathNotFoundException(path.toString()); - } - } - } - catch (MicroKernelException e) { - throw new RepositoryException(e.getMessage(), e); - } - } - - public PropertyInfo getPropertyInfo(SessionInfo sessionInfo, PropertyId propertyId) throws RepositoryException { - try { String wspName = sessionInfo.getWorkspaceName(); - Path path = getPath(propertyId); - String mkPath = Paths.pathToString(wspName, path.getAncestor(1)); + Path path = getPath(itemId); String rev = microKernel.getHeadRevision(); + String mkPath = Paths.pathToString(wspName, itemId.denotesNode() ? path : path.getAncestor(1)); - PropertyInfo info = null; - if (microKernel.nodeExists(mkPath, rev)) { - String json = microKernel.getNodes(mkPath, rev); - info = buildPropertyInfo(path, json, readFromDataStore); + if (!microKernel.nodeExists(mkPath, rev)) { + throw new PathNotFoundException(path.toString()); } - if (info == null) { - throw new PathNotFoundException(path.toString()); + String json = microKernel.getNodes(mkPath, rev); + + if (!itemId.denotesNode()) { + PropertyInfo info = buildPropertyInfo(path, json, readFromDataStore); + if (info == null) { + throw new PathNotFoundException(path.toString()); + } + else { + return Iterators.singleton(info); + } } else { - return info; + return buildItemInfos(path, json, readFromDataStore); } } catch (MicroKernelException e) {