You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ba...@apache.org on 2013/05/03 18:18:20 UTC
svn commit: r1478861 - in /jackrabbit/branches/2.6: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Author: baedke
Date: Fri May 3 16:18:20 2013
New Revision: 1478861
URL: http://svn.apache.org/r1478861
Log:
JCR-3587: RepositoryImpl should expose the collection of PersistenceManager instances in use.
Porting down r1478757,r1478719:
Make the RepositoryConfig and WorkspaceInfo instances available through RepositoryContext, allow the persistence manager to be retrieved.
Modified:
jackrabbit/branches/2.6/ (props changed)
jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java
jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1478719,1478757
Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java?rev=1478861&r1=1478860&r2=1478861&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryContext.java Fri May 3 16:18:20 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 <code>null</code>.
+ * @return The {@link WorkspaceInfo} for the named workspace. This will
+ * never be <code>null</code>.
+ * @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/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1478861&r1=1478860&r2=1478861&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Fri May 3 16:18:20 2013
@@ -1615,7 +1615,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)
@@ -1801,7 +1801,7 @@ public class RepositoryImpl extends Abst
* @throws RepositoryException if the persistence manager could not be
* instantiated/initialized
*/
- protected PersistenceManager getPersistenceManager()
+ public PersistenceManager getPersistenceManager()
throws RepositoryException {
if (!isInitialized()) {
throw new IllegalStateException("workspace '" + getName()