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 mi...@apache.org on 2021/10/19 10:05:16 UTC
[jackrabbit-oak] branch 1.22 updated: OAK-9600 - Make
standby.secure configurable
This is an automated email from the ASF dual-hosted git repository.
miroslav pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/1.22 by this push:
new 1e9cefb OAK-9600 - Make standby.secure configurable
new ca0dac7 Merge pull request #392 from kunal3112/1.22
1e9cefb is described below
commit 1e9cefbb79c1719d9dc1b656a9263b21cd68afaf
Author: Kunal Shubham <sh...@adobe.com>
AuthorDate: Tue Oct 19 13:35:02 2021 +0530
OAK-9600 - Make standby.secure configurable
---
.../jackrabbit/oak/segment/standby/store/StandbyStoreService.java | 4 ++--
.../apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
index 8efbb9e..ed90f53 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
@@ -91,7 +91,7 @@ public class StandbyStoreService {
name = "Sync interval (seconds)",
description = "Sync interval in seconds (standby mode only)"
)
- int interval() default 5;
+ long interval() default 5;
@AttributeDefinition(
name = "Allowed IP-Ranges",
@@ -198,7 +198,7 @@ public class StandbyStoreService {
.withFileStore(fileStore)
.withBlobChunkSize(BLOB_CHUNK_SIZE)
.withAllowedClientIPRanges(ranges)
- .withSecureConnection(true)
+ .withSecureConnection(secure)
.withSSLKeyFile(sslKeyFile)
.withSSLChainFile(sslChainFile)
.withSSLClientValidation(sslValidateClient)
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java
index 9e7d929..91a4f3c 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/osgi/StandbyStoreServiceTest.java
@@ -50,7 +50,7 @@ public class StandbyStoreServiceTest {
.withValue("127.0.0.1")
.check());
assertTrue(cd.hasProperty("interval")
- .withIntegerType()
+ .withLongType()
.withValue("5")
.check());
assertTrue(cd.hasProperty("secure")
@@ -101,7 +101,7 @@ public class StandbyStoreServiceTest {
.withDefaultValue("127.0.0.1")
.check());
assertTrue(ocd.hasAttributeDefinition("interval")
- .withIntegerType()
+ .withLongType()
.withDefaultValue("5")
.check());
assertTrue(ocd.hasAttributeDefinition("secure")