Author: baedke
Date: Mon Sep 8 12:03:31 2014
New Revision: 1623364
URL: http://svn.apache.org/r1623364
Log:
OAK-1915: TarMK failover 2.0
Added missing licence header, exluded long running tests.
Modified:
jackrabbit/oak/trunk/oak-tarmk-failover/pom.xml
jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/failover/BulkTest.java
Modified: jackrabbit/oak/trunk/oak-tarmk-failover/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-failover/pom.xml?rev=1623364&r1=1623363&r2=1623364&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-failover/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-tarmk-failover/pom.xml Mon Sep 8 12:03:31 2014
@@ -86,6 +86,12 @@
combine.children="append">
<failover.server.port>${failover.server.port}</failover.server.port>
</systemPropertyVariables>
+ <excludes>
+ <!-- excluding long running tests -->
+ <exclude>**/BrokenNetworkTest.java</exclude>
+ <exclude>**/FailoverIPRangeTest.java</exclude>
+ <exclude>**/BulkTest.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified:
jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java?rev=1623364&r1=1623363&r2=1623364&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
Mon Sep 8 12:03:31 2014
@@ -1,3 +1,19 @@
+/*
+ * 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.oak.plugins.segment;
import io.netty.bootstrap.Bootstrap;
Modified:
jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/failover/BulkTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/failover/BulkTest.java?rev=1623364&r1=1623363&r2=1623364&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/failover/BulkTest.java
(original)
+++
jackrabbit/oak/trunk/oak-tarmk-failover/src/test/java/org/apache/jackrabbit/oak/plugins/segment/failover/BulkTest.java
Mon Sep 8 12:03:31 2014
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.failover;
-import junit.framework.Assert;
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.jmx.FailoverStatusMBean;
