From a52f72fd8d7d5d6732817e331336e039b0005443 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 10 Jun 2016 16:43:24 +0000 Subject: [PATCH] Adapt to Jackrabbit v2.12 git-svn-id: https://svn.argeo.org/commons/trunk@8986 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/org/argeo/cms/internal/kernel/DataHttp.java | 5 +++-- .../src/org/argeo/cms/internal/kernel/protectedHandlers.xml | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 org.argeo.cms/src/org/argeo/cms/internal/kernel/protectedHandlers.xml diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataHttp.java index 8c57c8cb8..a1f966152 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataHttp.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataHttp.java @@ -53,6 +53,8 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { private final static String HEADER_AUTHORIZATION = "Authorization"; private final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; + private final static String DEFAULT_PROTECTED_HANDLERS = "/org/argeo/cms/internal/kernel/protectedHandlers.xml"; + private final HttpService httpService; // FIXME Make it more unique @@ -108,8 +110,7 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { // Looks like a bug in Jackrabbit remoting init ip.setProperty(RemotingServlet.INIT_PARAM_HOME, KernelUtils.getOsgiInstanceDir() + "/tmp/jackrabbit"); ip.setProperty(RemotingServlet.INIT_PARAM_TMP_DIRECTORY, "remoting"); - // in order to avoid annoying warning. - ip.setProperty(RemotingServlet.INIT_PARAM_PROTECTED_HANDLERS_CONFIG, ""); + ip.setProperty(RemotingServlet.INIT_PARAM_PROTECTED_HANDLERS_CONFIG, DEFAULT_PROTECTED_HANDLERS); httpService.registerServlet(path, remotingServlet, ip, new DataHttpContext(anonymous)); } diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/protectedHandlers.xml b/org.argeo.cms/src/org/argeo/cms/internal/kernel/protectedHandlers.xml new file mode 100644 index 000000000..59f22cd5e --- /dev/null +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/protectedHandlers.xml @@ -0,0 +1,5 @@ + + + + + -- 2.30.2