Adapt to Jackrabbit v2.12

git-svn-id: https://svn.argeo.org/commons/trunk@8986 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 8c57c8cb8e4c45212cfc99daf7b77a3452eec6b5..a1f9661520d98a8376f407333978e8f05a12c552 100644 (file)
--- 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 (file)
index 0000000..59f22cd
--- /dev/null
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/protectedHandlers.xml
@@ -0,0 +1,5 @@
+<config>
+       <protecteditemremovehandler>
+               <class name="org.apache.jackrabbit.server.remoting.davex.AclRemoveHandler" />
+       </protecteditemremovehandler>
+</config>