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 EC84B10805 for ; Fri, 3 May 2013 10:40:07 +0000 (UTC) Received: (qmail 74132 invoked by uid 500); 3 May 2013 10:40:07 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 74088 invoked by uid 500); 3 May 2013 10:40:07 -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 74068 invoked by uid 99); 3 May 2013 10:40:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 May 2013 10:40:07 +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; Fri, 03 May 2013 10:40:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DE3222388994; Fri, 3 May 2013 10:39:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1478719 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core: RepositoryContext.java RepositoryImpl.java Date: Fri, 03 May 2013 10:39:45 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130503103945.DE3222388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Fri May 3 10:39:45 2013 New Revision: 1478719 URL: http://svn.apache.org/r1478719 Log: JCR-3587: RepositoryImpl should expose the collection of PersistenceManager instances in use Make the RepositoryConfig and WorkspaceInfo instances available through RepositoryContext Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java?rev=1478719&r1=1478718&r2=1478719&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java Fri May 3 10:39:45 2013 @@ -20,8 +20,10 @@ import java.io.File; import java.io.IOException; import java.util.concurrent.ScheduledExecutorService; +import javax.jcr.NoSuchWorkspaceException; import javax.jcr.RepositoryException; +import org.apache.jackrabbit.core.RepositoryImpl.WorkspaceInfo; import org.apache.jackrabbit.core.cluster.ClusterNode; import org.apache.jackrabbit.core.config.RepositoryConfig; import org.apache.jackrabbit.core.data.DataStore; @@ -168,6 +170,10 @@ public class RepositoryContext { return create(RepositoryConfig.install(dir)); } + public RepositoryConfig getRepositoryConfig() { + return repository.getConfig(); + } + /** * Returns the repository instance to which this context is associated. * @@ -366,6 +372,21 @@ public class RepositoryContext { } /** + * Returns the {@link WorkspaceInfo} for the named workspace. + * + * @param workspaceName The name of the workspace whose {@link WorkspaceInfo} + * is to be returned. This must not be null. + * @return The {@link WorkspaceInfo} for the named workspace. This will + * never be null. + * @throws NoSuchWorkspaceException If the named workspace does not exist. + * @throws RepositoryException If this repository has been shut down. + */ + public WorkspaceInfo getWorkspaceInfo(String workspaceName) + throws NoSuchWorkspaceException, RepositoryException { + return repository.getWorkspaceInfo(workspaceName); + } + + /** * Returns the security manager of this repository. * * @return security manager Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1478719&r1=1478718&r2=1478719&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Fri May 3 10:39:45 2013 @@ -1616,7 +1616,7 @@ public class RepositoryImpl extends Abst * representing the same named workspace, i.e. the same physical * storage. */ - protected class WorkspaceInfo implements UpdateEventListener { + public class WorkspaceInfo implements UpdateEventListener { /** * workspace configuration (passed in constructor)