You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2014/10/22 14:50:32 UTC
svn commit: r1633609 - in /jackrabbit/oak/branches/1.0: ./ oak-doc/
oak-doc/src/site/markdown/coldstandby/ oak-run/
oak-run/src/main/java/org/apache/jackrabbit/oak/run/ oak-tarmk-standby/
oak-tarmk-standby/osgi-conf/master/ oak-tarmk-standby/osgi-conf/...
Author: alexparvulescu
Date: Wed Oct 22 12:50:31 2014
New Revision: 1633609
URL: http://svn.apache.org/r1633609
Log:
OAK-1915 TarMK Cold Standby
- merged revisions: 1633559, 1633560, 1633562, 1633567, 1633571, 1633598, 1633608
Added:
jackrabbit/oak/branches/1.0/oak-tarmk-standby/
- copied from r1633559, jackrabbit/oak/trunk/oak-tarmk-standby/
jackrabbit/oak/branches/1.0/oak-tarmk-standby/osgi-conf/primary/
- copied from r1633571, jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/
jackrabbit/oak/branches/1.0/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config
- copied unchanged from r1633598, jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config
jackrabbit/oak/branches/1.0/oak-tarmk-standby/osgi-conf/standby/
- copied from r1633571, jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/
jackrabbit/oak/branches/1.0/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config
- copied unchanged from r1633598, jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/
- copied from r1633598, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/
- copied from r1633598, jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/
Removed:
jackrabbit/oak/branches/1.0/oak-tarmk-standby/README.md
jackrabbit/oak/branches/1.0/oak-tarmk-standby/osgi-conf/master/
jackrabbit/oak/branches/1.0/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
jackrabbit/oak/branches/1.0/oak-tarmk-standby/osgi-conf/slave/
jackrabbit/oak/branches/1.0/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/failover/
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-doc/ (props changed)
jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/coldstandby/coldstandby.md (contents, props changed)
jackrabbit/oak/branches/1.0/oak-run/README.md
jackrabbit/oak/branches/1.0/oak-run/pom.xml
jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties
jackrabbit/oak/branches/1.0/pom.xml
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1633559-1633560,1633562,1633567,1633571,1633598,1633608
Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-doc:r1633567,1633571,1633598
Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/coldstandby/coldstandby.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/coldstandby/coldstandby.md?rev=1633609&r1=1633608&r2=1633609&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/coldstandby/coldstandby.md (original)
+++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/coldstandby/coldstandby.md Wed Oct 22 12:50:31 2014
@@ -19,11 +19,11 @@
### What is it?
-The *Cold Standby* feature allows one or more clients to connect to a master instance and ensure automatic on-the-fly synchronization of the repository state from the master to the client(s). The sync process is one-way only. Data stored on the master is never changed. The only purpose of this client installation(s) is to garantuee a (almost live) data copy and enable a quick switch from the master to a client installation without data loss.
+The *Cold Standby* feature allows one or more clients to connect to a primary instance and ensure automatic on-the-fly synchronization of the repository state from the master to the client(s). The sync process is one-way only. Data stored on the master is never changed. The only purpose of this client installation(s) is to guarantee an (almost live) data copy and enable a quick switch from the master to a client installation without data loss.
### What is isn't
-The *Cold Standby* feature does not garantuee file, filesystem or even repository **integrity**! If the content of a tar file is corrupted, a file is missing or anything similar happens to the locally stored files the installation will break because these situation or not checked, detected or treated!
+The *Cold Standby* feature does not guarantee file, filesystem or even repository **integrity**! If the content of a tar file is corrupted, a file is missing or anything similar happens to the locally stored files the installation will break because these situation or not checked, detected or treated!
### How it works
@@ -42,31 +42,34 @@ An Oak installation using a SegmentStore
### Setup
1. Perform a filesystem based copy of the master repository.
-2. on the master activate the feature by specifying the runmode <!-- TODO: this must be changed --> `syncmaster`. If the repository is running within a OSGI environment the feature will be activated by a corresponding configuration. <!-- TODO: add some OSGI specific info here -->
-3. on the client(s) activate the feature by specifying the runmode `syncslave` (add additional parameters if desired) and specify the path to the repository (-tar) files
+2. on the master activate the feature by specifying the runmode `primary`.
+3. on the client(s) activate the feature by specifying the runmode `standby` (add additional parameters if desired) and specify the path to the repository
4. start the master and the client(s).
You can add the additional argument `--secure true` if you like a SSL secured connection between the client and the master. It must be garantueed that **all** clients and the master either use secure or standard connections! A mixed configuration will definitely fail.
-The clients specify the master host using the `--host` (default is `localhost`) and `--port` (default is `8023`) arguments. For monitoring reasons (see below) the client(s) must be distinctable. Therefore a generic UUID is automatically created for each running client and this UUID is used to identify the client on the master. If you want to specify the name of the client you can set a system property `failOverID`.
+The clients specify the master host using the `--host` (default is `localhost`) and `--port` (default is `8023`) arguments. For monitoring reasons (see below) the client(s) must be distinctable. Therefore a generic UUID is automatically created for each running client and this UUID is used to identify the client on the master. If you want to specify the name of the client you can set a system property `standbyID`.
To sum it up a typical client command line could be:
- java -DfailOverID="Client#1" -jar oak-run.jar syncslave --secure false --host 192.168.0.1 crx-quickstart/repository/segmentstore
+ java -DstandbyID="Client#1" -jar oak-run.jar syncslave --secure false --host 192.168.0.1 crx-quickstart/repository/segmentstore
<!-- TODO: add the master specific arguments (like the accepted incoming IP ranges) -->
The master can define the TCP port the feature is listening (default is `8023`) using the `--port` argument. If you want to restrict the communication you can specify a list of allowed IPs or IP ranges....
+#### OSGi setup
+If the repository is running within a OSGI environment the feature will be activated by a corresponding configuration. See examples attached to the [oak-tarmk-standby module](https://github.com/apache/jackrabbit-oak/tree/trunk/oak-tarmk-standby/osgi-conf)
+
### Robustness
The data flow is designed to detect and handle connection and network related problems automatically. All packets are bundled with checksums and as soon as problems with the connection or damaged packets occur retry mechanisms are triggered.
### Monitoring
-The *Cold Standby* feature exposes informations using JMX/MBeans. Doing so you can inspect the current state of the client(s) and the master using standard tools like `jconsole` or `jmc` (if running JDK 1.7 or higher). The information can be found if you look for a `org.apache.jackrabbit.oak:type="FailOver"` MBean named `Status`.
+The *Cold Standby* feature exposes informations using JMX/MBeans. Doing so you can inspect the current state of the client(s) and the master using standard tools like `jconsole` or `jmc` (if running JDK 1.7 or higher). The information can be found if you look for a `org.apache.jackrabbit.oak:type="Standby"` MBean named `Status`.
#####Client
-Observing a client you will notice exactly one node (the id is either a generic UUID or the name specified by the `failOverID` system property). This node has three readonly attributes:
+Observing a client you will notice exactly one node (the id is either a generic UUID or the name specified by the `standbyID` system property). This node has five readonly attributes:
* `Running`: boolean indicating whether the sync process is running
* `Mode`: always `Client: ` followed by the ID described above
Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/coldstandby/coldstandby.md
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/branches/1.0/oak-run/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-run/README.md?rev=1633609&r1=1633608&r2=1633609&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-run/README.md (original)
+++ jackrabbit/oak/branches/1.0/oak-run/README.md Wed Oct 22 12:50:31 2014
@@ -9,8 +9,8 @@ The following runmodes are currently ava
* debug : Print status information about an Oak repository.
* upgrade : Upgrade from Jackrabbit 2.x repository to Oak.
* server : Run the Oak Server
- * syncmaster : Run a TarMK Cold Standby master
- * syncslave : Run a TarMK Cold Standby slave
+ * primary : Run a TarMK Cold Standby primary instance
+ * standby : Run a TarMK Cold Standby standby instance
See the subsections below for more details on how to use these modes.
@@ -37,32 +37,32 @@ store. Currently this is only supported
$ java -jar oak-run-*.jar debug /path/to/oak/repository [id...]
-Syncmaster
+Primary
-------
-The 'syncmaster' mode starts a TarMK Cold Standby master listening on a TCP/IP port for connecting slaves.
+The 'primary' mode starts a TarMK Cold Standby primary instance (master) listening on a TCP/IP port for connecting slaves.
+
+ $ java -jar oak-run-*.jar primary [options] /path/to/TarMK
- $ java -jar oak-run-*.jar syncmaster [options] /path/to/TarMK
-
The following options are available:
--port 8023 - port to listen at
--admissible 127.0.0.1 - admissible client IP range or host name
--secure - use secure connections
-Syncslave
+Standby
-------
-The 'syncslave' mode starts a TarMK Cold Standby slave to create or update a continous backup from a Cold Standby master.
+The 'standby' mode starts a TarMK Cold Standby standby instance (slave) to create or update a continuous backup from a Cold Standby primary.
- $ java -jar oak-run-*.jar syncslave [options] /path/to/TarMK
+ $ java -jar oak-run-*.jar standby [options] /path/to/TarMK
The following options are available:
--port 8023 - port to connect to
--host 127.0.0.1 - host to connect to
--secure - use secure connections
- --interval 5 - schedule the slave to run continously, connecting every n seconds
+ --interval 5 - schedule the slave to run continuously, connecting every n seconds
Compact
-------
Modified: jackrabbit/oak/branches/1.0/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-run/pom.xml?rev=1633609&r1=1633608&r2=1633609&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-run/pom.xml Wed Oct 22 12:50:31 2014
@@ -141,7 +141,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-tarmk-failover</artifactId>
+ <artifactId>oak-tarmk-standby</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1633609&r1=1633608&r2=1633609&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/branches/1.0/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Wed Oct 22 12:50:31 2014
@@ -63,9 +63,9 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentId;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeState;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -129,11 +129,11 @@ public class Main {
case UPGRADE:
upgrade(args);
break;
- case SYNCSLAVE:
- syncSlave(args);
+ case STANDBY:
+ standbyInstance(args);
break;
- case SYNCMASTER:
- syncMaster(args);
+ case PRIMARY:
+ primaryInstance(args);
break;
case CHECKPOINTS:
checkpoints(args);
@@ -205,10 +205,10 @@ public class Main {
//TODO react to state changes of FailoverClient (triggered via JMX), once the state model of FailoverClient is complete.
private static class ScheduledSyncService extends AbstractScheduledService {
- private final FailoverClient failoverClient;
+ private final StandbyClient failoverClient;
private final int interval;
- public ScheduledSyncService(FailoverClient failoverClient, int interval) {
+ public ScheduledSyncService(StandbyClient failoverClient, int interval) {
this.failoverClient = failoverClient;
this.interval = interval;
}
@@ -225,7 +225,7 @@ public class Main {
}
- private static void syncSlave(String[] args) throws Exception {
+ private static void standbyInstance(String[] args) throws Exception {
final String defaultHost = "127.0.0.1";
final int defaultPort = 8023;
@@ -236,7 +236,7 @@ public class Main {
final OptionSpec<Integer> interval = parser.accepts("interval", "interval between successive executions").withRequiredArg().ofType(Integer.class);
final OptionSpec<Boolean> secure = parser.accepts("secure", "use secure connections").withRequiredArg().ofType(Boolean.class);
final OptionSpec<?> help = parser.acceptsAll(asList("h", "?", "help"), "show help").forHelp();
- final OptionSpec<String> nonOption = parser.nonOptions(Mode.SYNCSLAVE + " <path to repository>");
+ final OptionSpec<String> nonOption = parser.nonOptions(Mode.STANDBY + " <path to repository>");
final OptionSet options = parser.parse(args);
final List<String> nonOptions = nonOption.values(options);
@@ -252,10 +252,10 @@ public class Main {
}
FileStore store = null;
- FailoverClient failoverClient = null;
+ StandbyClient failoverClient = null;
try {
store = new FileStore(new File(nonOptions.get(0)), 256);
- failoverClient = new FailoverClient(
+ failoverClient = new StandbyClient(
options.has(host)? options.valueOf(host) : defaultHost,
options.has(port)? options.valueOf(port) : defaultPort,
store,
@@ -277,7 +277,7 @@ public class Main {
}
}
- private static void syncMaster(String[] args) throws Exception {
+ private static void primaryInstance(String[] args) throws Exception {
final int defaultPort = 8023;
@@ -286,7 +286,7 @@ public class Main {
final OptionSpec<Boolean> secure = parser.accepts("secure", "use secure connections").withRequiredArg().ofType(Boolean.class);
final OptionSpec<String> admissible = parser.accepts("admissible", "list of admissible slave host names or ip ranges").withRequiredArg().ofType(String.class);
final OptionSpec<?> help = parser.acceptsAll(asList("h", "?", "help"), "show help").forHelp();
- final OptionSpec<String> nonOption = parser.nonOptions(Mode.SYNCMASTER + " <path to repository>");
+ final OptionSpec<String> nonOption = parser.nonOptions(Mode.PRIMARY + " <path to repository>");
final OptionSet options = parser.parse(args);
final List<String> nonOptions = nonOption.values(options);
@@ -305,10 +305,10 @@ public class Main {
List<String> admissibleSlaves = options.has(admissible) ? options.valuesOf(admissible) : Collections.EMPTY_LIST;
FileStore store = null;
- FailoverServer failoverServer = null;
+ StandbyServer failoverServer = null;
try {
store = new FileStore(new File(nonOptions.get(0)), 256);
- failoverServer = new FailoverServer(
+ failoverServer = new StandbyServer(
options.has(port)? options.valueOf(port) : defaultPort,
store,
admissibleSlaves.toArray(new String[0]),
@@ -833,8 +833,8 @@ public class Main {
COMPACT("compact"),
SERVER("server"),
UPGRADE("upgrade"),
- SYNCSLAVE("syncSlave"),
- SYNCMASTER("syncmaster"),
+ PRIMARY("primary"),
+ STANDBY("standy"),
CHECKPOINTS("checkpoints");
private final String name;
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml?rev=1633609&r1=1633559&r2=1633609&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml Wed Oct 22 12:50:31 2014
@@ -17,14 +17,14 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.8-SNAPSHOT</version>
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
- <artifactId>oak-tarmk-failover</artifactId>
- <name>Oak TarMK Failover</name>
+ <artifactId>oak-tarmk-standby</artifactId>
+ <name>Oak TarMK Standby</name>
<packaging>bundle</packaging>
- <description>Oak TarMK failover module</description>
+ <description>Oak TarMK standby module</description>
<properties>
<netty-version>4.0.23.Final</netty-version>
@@ -52,6 +52,7 @@
*
</Import-Package>
<Embed-Dependency>netty-*;inline=true</Embed-Dependency>
+ <Export-Package>!org.apache.jackrabbit.oak.plugins.segment.standby.*</Export-Package>
</instructions>
</configuration>
</plugin>
@@ -72,7 +73,7 @@
<phase>process-test-resources</phase>
<configuration>
<portNames>
- <portName>failover.server.port</portName>
+ <portName>standby.server.port</portName>
</portNames>
</configuration>
</execution>
@@ -82,7 +83,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables combine.children="append">
- <failover.server.port>${failover.server.port}</failover.server.port>
+ <standby.server.port>${standby.server.port}</standby.server.port>
</systemPropertyVariables>
<excludes>
<!-- excluding long running tests -->
@@ -101,9 +102,9 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>osgi-conf/master/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config</exclude>
- <exclude>osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config</exclude>
- <exclude>osgi-conf/slave/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config</exclude>
+ <exclude>osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config</exclude>
+ <exclude>osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config</exclude>
+ <exclude>osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config</exclude>
</excludes>
</configuration>
</plugin>
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1633609&r1=1633559&r2=1633609&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties Wed Oct 22 12:50:31 2014
@@ -19,23 +19,23 @@
# suppress inspection "UnusedProperty" for whole file
-org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.name = TarMK cold backup service
-org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.description = Provides continuous backups of TarMK based reporitories
+org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.name = TarMK Cold Standby service
+org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.description = Provides continuous backups of TarMK based repositories
mode.name = Mode
-mode.description = TarMK Cold Standby mode (master or slave)
+mode.description = TarMK Cold Standby mode (primary or standby)
port.name = Port
port.description = TCP/IP port to use
-master.host.name = Master Host
-master.host.description = Master host (slave mode only)
+primary.host.name = Primary Host
+primary.host.description = Primary host (standby mode only)
interval.name = Sync interval (seconds)
-interval.description = Sync interval in seconds (slave mode only)
+interval.description = Sync interval in seconds (standby mode only)
-master.allowed-client-ip-ranges.name = Allowed IP-Ranges
-master.allowed-client-ip-ranges.description = Accept incoming requests for these host names and IP-ranges only (master mode only)
+primary.allowed-client-ip-ranges.name = Allowed IP-Ranges
+primary.allowed-client-ip-ranges.description = Accept incoming requests for these host names and IP-ranges only (primary mode only)
secure.name = Secure
secure.description = Use secure connections
Modified: jackrabbit/oak/branches/1.0/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/pom.xml?rev=1633609&r1=1633608&r2=1633609&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/pom.xml Wed Oct 22 12:50:31 2014
@@ -51,10 +51,10 @@
<module>oak-solr-osgi</module>
<module>oak-auth-external</module>
<module>oak-auth-ldap</module>
+ <module>oak-tarmk-standby</module>
<module>oak-run</module>
<module>oak-it</module>
<module>oak-pojosr</module>
- <module>oak-tarmk-failover</module>
</modules>
<scm>