Author: chetanm
Date: Wed Dec 2 14:17:24 2015
New Revision: 1717633
URL: http://svn.apache.org/viewvc?rev=1717633&view=rev
Log:
OAK-3701 - Exception in JcrRemotingServlet at startup
Switching the xml based config
Added:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/remoting/protectedHandlersConfig.xml
(with props)
jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/protectedHandlersConfig.xml
(with props)
Removed:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/remoting/protectedHandlers.properties
jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/protectedHandlers.properties
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java
jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/web.xml
Modified:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java?rev=1717633&r1=1717632&r2=1717633&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-examples/standalone/src/main/java/org/apache/jackrabbit/oak/standalone/RemotingInitializer.java
Wed Dec 2 14:17:24 2015
@@ -75,7 +75,7 @@ public class RemotingInitializer {
//but servlet always reads it as File not via input stream. Hence using
//actual class
bean.addInitParameter(JcrRemotingServlet.INIT_PARAM_PROTECTED_HANDLERS_CONFIG,
-
"org.apache.jackrabbit.server.remoting.davex.AclRemoveHandler");
+ "remoting/protectedHandlersConfig.xml");
bean.addInitParameter(JcrRemotingServlet.INIT_PARAM_HOME, davHome);
return bean;
}
Added:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/remoting/protectedHandlersConfig.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/remoting/protectedHandlersConfig.xml?rev=1717633&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/remoting/protectedHandlersConfig.xml
(added)
+++
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/remoting/protectedHandlersConfig.xml
Wed Dec 2 14:17:24 2015
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<config>
+ <!--
+ Defines the ProtectedItemRemoveHandler implementation(s) responsible for
removing
+ protected items using the JCR server.
+ -->
+ <protecteditemremovehandler>
+ <class
name="org.apache.jackrabbit.server.remoting.davex.AclRemoveHandler" />
+ </protecteditemremovehandler>
+</config>
Propchange:
jackrabbit/oak/trunk/oak-examples/standalone/src/main/resources/remoting/protectedHandlersConfig.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/protectedHandlersConfig.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/protectedHandlersConfig.xml?rev=1717633&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/protectedHandlersConfig.xml
(added)
+++
jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/protectedHandlersConfig.xml
Wed Dec 2 14:17:24 2015
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<config>
+ <!--
+ Defines the ProtectedItemRemoveHandler implementation(s) responsible for
removing
+ protected items using the JCR server.
+ -->
+ <protecteditemremovehandler>
+ <class
name="org.apache.jackrabbit.server.remoting.davex.AclRemoveHandler" />
+ </protecteditemremovehandler>
+</config>
Propchange:
jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/protectedHandlersConfig.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/web.xml?rev=1717633&r1=1717632&r2=1717633&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ jackrabbit/oak/trunk/oak-examples/webapp/src/main/webapp/WEB-INF/web.xml
Wed Dec 2 14:17:24 2015
@@ -328,13 +328,9 @@
<param-value>/WEB-INF/batchread.properties</param-value>
<description>JcrRemotingServlet: Optional mapping from node type
names to default depth.</description>
</init-param>
- <!--
- TODO FIXME Using a temporary workaround for OAK-3701. Once that is
fixed we should
- refer to actual config file
- -->
<init-param>
<param-name>protectedhandlers-config</param-name>
-
<param-value>org.apache.jackrabbit.server.remoting.davex.AclRemoveHandler</param-value>
+ <param-value>/WEB-INF/protectedHandlersConfig.xml</param-value>
<description>JcrRemotingServlet: Handlers for removing protected
items.</description>
</init-param>
<!-- init-param>
