jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sch...@apache.org
Subject svn commit: r1301046 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/RepositoryImpl.java test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
Date Thu, 15 Mar 2012 15:28:09 GMT
Author: schans
Date: Thu Mar 15 15:28:09 2012
New Revision: 1301046

URL: http://svn.apache.org/viewvc?rev=1301046&view=rev
Log:
JCR-3255: Add a cluster id descriptor with value jackrabbit.cluster.id

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
  (with props)
Modified:
    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/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1301046&r1=1301045&r2=1301046&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
Thu Mar 15 15:28:09 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) {

Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java?rev=1301046&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
(added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
Thu Mar 15 15:28:09 2012
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.cluster;
+
+import java.io.File;
+import java.io.IOException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.core.RepositoryImpl;
+import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.apache.jackrabbit.test.JUnitTest;
+import org.h2.tools.Server;
+
+/**
+ * Tests clustering with a database.
+ */
+public class ClusterDescriptorTest extends JUnitTest {
+
+    Server server1, server2;
+    RepositoryImpl rep1, rep2;
+
+    public void setUp() throws Exception {
+        deleteAll();
+        server1 = Server.createTcpServer("-tcpPort", "9001", "-baseDir",
+                "./target/descriptorClusterTest/db1", "-tcpAllowOthers").start();
+        server2 = Server.createTcpServer("-tcpPort", "9002", "-baseDir",
+                "./target/descriptorClusterTest/db2", "-tcpAllowOthers").start();
+        FileUtils.copyFile(
+                new File("./src/test/resources/org/apache/jackrabbit/core/cluster/repository-h2.xml"),
+                new File("./target/descriptorClusterTest/node1/repository.xml"));
+        FileUtils.copyFile(
+                new File("./src/test/resources/org/apache/jackrabbit/core/cluster/repository-h2.xml"),
+                new File("./target/descriptorClusterTest/node2/repository.xml"));
+
+        rep1 = RepositoryImpl.create(RepositoryConfig.create(
+                new File("./target/descriptorClusterTest/node1")));
+        rep2 = RepositoryImpl.create(RepositoryConfig.create(
+                new File("./target/descriptorClusterTest/node2")));
+    }
+
+    public void tearDown() throws Exception {
+        rep1.shutdown();
+        rep2.shutdown();
+        server1.stop();
+        server2.stop();
+        deleteAll();
+    }
+
+    private void deleteAll() throws IOException {
+        FileUtils.deleteDirectory(new File("./target/descriptorClusterTest"));
+    }
+
+    public void testRepositoryDescriptor() throws RepositoryException {
+        String clusterId1 =  rep1.getDescriptor(RepositoryImpl.JACKRABBIT_CLUSTER_ID);
+        String clusterId2 =  rep2.getDescriptor(RepositoryImpl.JACKRABBIT_CLUSTER_ID);
+
+        assertNotNull("Cluster descriptor not set for cluster node 1", clusterId1);
+        assertNotNull("Cluster descriptor not set for cluster node 2", clusterId2);
+
+        assertFalse("Cluster ids should be unique", clusterId1.equals(clusterId2));
+    }
+
+}

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/cluster/ClusterDescriptorTest.java
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message