jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sch...@apache.org
Subject svn commit: r1302342 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
Date Mon, 19 Mar 2012 09:23:34 GMT
Author: schans
Date: Mon Mar 19 09:23:34 2012
New Revision: 1302342

URL: http://svn.apache.org/viewvc?rev=1302342&view=rev
Log:
JCR-3255: Provide cluster id as a repository descriptor (merge from 1301046)

Added:
    jackrabbit/branches/2.2/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.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1301046

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1302342&r1=1302341&r2=1302342&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Mon Mar 19 09:23:34 2012
@@ -158,6 +158,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>();
@@ -320,6 +326,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) {



Mime
View raw message