You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by sc...@apache.org on 2012/03/19 10:22:08 UTC
svn commit: r1302339 - in /jackrabbit/branches/2.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
Author: schans
Date: Mon Mar 19 09:22:07 2012
New Revision: 1302339
URL: http://svn.apache.org/viewvc?rev=1302339&view=rev
Log:
JCR-3255: Provide cluster id a repository descriptor (merge from 1301046)
Added:
jackrabbit/branches/2.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
- copied unchanged from r1301046, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1301046
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1302339&r1=1302338&r2=1302339&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Mon Mar 19 09:22:07 2012
@@ -162,6 +162,12 @@ public class RepositoryImpl extends Abst
private static final String PROPERTIES_RESOURCE = "repository.properties";
/**
+ * Key to a <code>string</code> descriptor. Returns the repository cluster id if
+ * and only if clustering is enabled.
+ */
+ public static final String JACKRABBIT_CLUSTER_ID = "jackrabbit.cluster.id";
+
+ /**
* the repository descriptors, maps String keys to Value/Value[] objects
*/
private final Map<String, DescriptorValue> repDescriptors = new HashMap<String, DescriptorValue>();
@@ -331,6 +337,7 @@ public class RepositoryImpl extends Abst
// now start cluster node as last step
if (clusterNode != null) {
+ setDescriptor(JACKRABBIT_CLUSTER_ID, repConfig.getClusterConfig().getId());
try {
clusterNode.start();
} catch (ClusterException e) {