commit 823f0df49c73842c89605a0930af90050fc2c7a4 Author: Alfusainey Date: Fri Feb 20 20:39:59 2015 +0100 use classloader to load ac provider as resource; add protectedHandlers.properties to webapp project diff --git a/jackrabbit-jcr2dav/src/main/resources/accessControlProvider.properties b/jackrabbit-jcr2dav/src/main/resources/accessControlProvider.properties new file mode 100644 index 0000000..d89cc0e --- /dev/null +++ b/jackrabbit-jcr2dav/src/main/resources/accessControlProvider.properties @@ -0,0 +1,16 @@ +# 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. + +org.apache.jackrabbit.jcr2spi.AccessControlProvider.class=org.apache.jackrabbit.jcr2spi.security.authorization.jackrabbit.acl.AccessControlProviderImpl diff --git a/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/authorization/AccessControlProviderStub.java b/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/authorization/AccessControlProviderStub.java index 44ecfab..94f376f 100644 --- a/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/authorization/AccessControlProviderStub.java +++ b/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/authorization/AccessControlProviderStub.java @@ -96,7 +96,7 @@ public class AccessControlProviderStub { try { // not configured try to load as resource Properties prop = new Properties(); - InputStream is = AccessControlProviderStub.class.getResourceAsStream(ACCESS_CONTROL_PROVIDER_PROPERTIES); + InputStream is = AccessControlProviderStub.class.getClassLoader().getResourceAsStream(ACCESS_CONTROL_PROVIDER_PROPERTIES); if (is != null) { prop.load(is); // loads the concrete class to instantiate. diff --git a/jackrabbit-webapp/src/main/webapp/WEB-INF/protectedHandlers.properties b/jackrabbit-webapp/src/main/webapp/WEB-INF/protectedHandlers.properties new file mode 100644 index 0000000..f51e656 --- /dev/null +++ b/jackrabbit-webapp/src/main/webapp/WEB-INF/protectedHandlers.properties @@ -0,0 +1,17 @@ +# 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. + +# ProtectedItemRemoveHandler implementation class +javax.jcr.tck.access.control.list.handler=org.apache.jackrabbit.server.remoting.davex.AclRemoveHandler