This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-accessmanager.git
commit 9b37854cf0f424a2572c127e34ca8ac5c9dc3102 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Jan 11 14:23:40 2017 +0000 SLING-6452 : Update / Clean access manager project git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1778293 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE | 202 --------------------- NOTICE | 8 - pom.xml | 51 +----- .../jcr/jackrabbit/accessmanager/DeleteAces.java | 2 +- .../sling/jcr/jackrabbit/accessmanager/GetAcl.java | 2 +- .../jackrabbit/accessmanager/GetEffectiveAcl.java | 2 +- .../jcr/jackrabbit/accessmanager/ModifyAce.java | 2 +- .../{GetAcl.java => package-info.java} | 29 +-- .../accessmanager/post/DeleteAcesServlet.java | 25 +-- .../accessmanager/post/GetAclServlet.java | 29 +-- .../accessmanager/post/GetEffectiveAclServlet.java | 29 +-- .../accessmanager/post/ModifyAceServlet.java | 26 +-- .../accessmanager/post/package-info.java | 23 +++ src/main/resources/META-INF/LICENSE | 202 --------------------- src/main/resources/META-INF/NOTICE | 8 - .../OSGI-INF/metatype/metatype.properties | 41 ----- 16 files changed, 63 insertions(+), 618 deletions(-) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 75b5248..0000000 --- a/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 3baf465..0000000 --- a/NOTICE +++ /dev/null @@ -1,8 +0,0 @@ -Apache Sling Jackrabbit JSR-283 Access Control Manager Support -Copyright 2008-2010 The Apache Software Foundation - -Apache Sling is based on source code originally developed -by Day Software (http://www.day.com/). - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). diff --git a/pom.xml b/pom.xml index 1348f58..5e495ca 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>26</version> + <version>29</version> <relativePath/> </parent> @@ -51,49 +51,16 @@ <plugins> <plugin> <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> - <configuration> - <instructions> - <Private-Package> - </Private-Package> - <Embed-Dependency> - org.apache.sling.servlets.post;inline="org/apache/sling/servlets/post/impl/helper/JSONResponse*" - </Embed-Dependency> - <Export-Package> - org.apache.sling.jcr.jackrabbit.accessmanager;version=2.1.1, - org.apache.sling.jcr.jackrabbit.accessmanager.post;version=2.1.2 - </Export-Package> - <Sling-Initial-Content /> - <Sling-Nodetypes /> - </instructions> - </configuration> </plugin> </plugins> </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <!-- No javadocs --> - <excludePackageNames> - </excludePackageNames> - </configuration> - </plugin> - </plugins> - </reporting> - <dependencies> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> @@ -124,7 +91,6 @@ <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> - <version>2.0</version> <scope>provided</scope> </dependency> <dependency> @@ -134,21 +100,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.scr.annotations</artifactId> - </dependency> </dependencies> </project> diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/DeleteAces.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/DeleteAces.java index 26a03ff..4ff111c 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/DeleteAces.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/DeleteAces.java @@ -38,7 +38,7 @@ public interface DeleteAces { * @param principalNamesToDelete An array of ace principal names to delete.. (required) * @throws RepositoryException */ - public void deleteAces(Session jcrSession, + void deleteAces(Session jcrSession, String resourcePath, String [] principalNamesToDelete ) throws RepositoryException; diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetAcl.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetAcl.java index 127b631..5bae6d4 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetAcl.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetAcl.java @@ -41,7 +41,7 @@ public interface GetAcl { * @return the ACL as a JSON object * @throws RepositoryException */ - public JSONObject getAcl(Session jcrSession, + JSONObject getAcl(Session jcrSession, String resourcePath ) throws RepositoryException, JSONException; diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetEffectiveAcl.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetEffectiveAcl.java index a0e91c7..2a68a33 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetEffectiveAcl.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetEffectiveAcl.java @@ -41,7 +41,7 @@ public interface GetEffectiveAcl { * @return the ACL as a JSON object * @throws RepositoryException */ - public JSONObject getEffectiveAcl(Session jcrSession, + JSONObject getEffectiveAcl(Session jcrSession, String resourcePath ) throws RepositoryException, JSONException; diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/ModifyAce.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/ModifyAce.java index acfc315..06c7964 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/ModifyAce.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/ModifyAce.java @@ -44,7 +44,7 @@ public interface ModifyAce { * @return the user that was updated or null if not found * @throws RepositoryException */ - public void modifyAce(Session jcrSession, + void modifyAce(Session jcrSession, String resourcePath, String principalId, Map<String, String> privileges, diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetAcl.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/package-info.java similarity index 51% copy from src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetAcl.java copy to src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/package-info.java index 127b631..f3c7621 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/GetAcl.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/package-info.java @@ -16,33 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.jcr.jackrabbit.accessmanager; - -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import org.apache.sling.commons.json.JSONException; -import org.apache.sling.commons.json.JSONObject; [email protected]("2.1.1") +package org.apache.sling.jcr.jackrabbit.accessmanager; -/** - * The <code>GetAcl</code> service api. - * <p> - * This interface is not intended to be implemented by bundles. It is - * implemented by this bundle and may be used by client bundles. - * </p> - */ -public interface GetAcl { - /** - * Gets the access control list for a resource. - * - * @param jcrSession the JCR session of the user updating the user - * @param resourcePath The path of the resource to get the ACL for (required) - * @return the ACL as a JSON object - * @throws RepositoryException - */ - public JSONObject getAcl(Session jcrSession, - String resourcePath - ) throws RepositoryException, JSONException; - -} diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java index 21afaaa..a676276 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java @@ -30,18 +30,14 @@ import javax.jcr.security.AccessControlList; import javax.jcr.security.AccessControlManager; import javax.servlet.Servlet; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Properties; -import org.apache.felix.scr.annotations.Property; -import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.ResourceNotFoundException; -import org.apache.sling.api.servlets.HtmlResponse; import org.apache.sling.jcr.base.util.AccessControlUtil; import org.apache.sling.jcr.jackrabbit.accessmanager.DeleteAces; import org.apache.sling.servlets.post.AbstractPostResponse; import org.apache.sling.servlets.post.Modification; import org.apache.sling.servlets.post.SlingPostConstants; +import org.osgi.service.component.annotations.Component; /** * <p> @@ -74,18 +70,13 @@ import org.apache.sling.servlets.post.SlingPostConstants; * <dd>Failure. HTML explains the failure.</dd> * </dl> */ -@Component -@Service (value={ - Servlet.class, - DeleteAces.class}) -@Properties ({ - @Property (name="sling.servlet.resourceTypes", - value="sling/servlet/default"), - @Property (name="sling.servlet.methods", - value="POST"), - @Property (name="sling.servlet.selectors", - value="deleteAce") -}) + +@Component(service = {Servlet.class, DeleteAces.class}, + property= { + "sling.servlet.resourceTypes=sling/servlet/default", + "sling.servlet.methods=POST", + "sling.servlet.selectors=deleteAce" + }) public class DeleteAcesServlet extends AbstractAccessPostServlet implements DeleteAces { private static final long serialVersionUID = 3784866802938282971L; diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java index e7ed2b3..ba490a9 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java @@ -27,14 +27,11 @@ import javax.jcr.security.AccessControlManager; import javax.jcr.security.AccessControlPolicy; import javax.servlet.Servlet; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Properties; -import org.apache.felix.scr.annotations.Property; -import org.apache.felix.scr.annotations.Service; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; import org.apache.sling.jcr.base.util.AccessControlUtil; import org.apache.sling.jcr.jackrabbit.accessmanager.GetAcl; +import org.osgi.service.component.annotations.Component; /** * <p> @@ -101,23 +98,13 @@ import org.apache.sling.jcr.jackrabbit.accessmanager.GetAcl; * </pre> * </code> */ -@Component -@Service (value={ - Servlet.class, - GetAcl.class -}) -@Properties ({ - @Property (name="sling.servlet.resourceTypes", - value="sling/servlet/default"), - @Property (name="sling.servlet.methods", - value="GET"), - @Property (name="sling.servlet.selectors", - value={ - "acl", - "tidy.acl" - }), - @Property (name="sling.servlet.extensions", - value="json") + +@Component(service = {Servlet.class, GetAcl.class}, +property= { + "sling.servlet.resourceTypes=sling/servlet/default", + "sling.servlet.methods=GET", + "sling.servlet.selectors=acl", + "sling.servlet.selectors=tidy.acl" }) public class GetAclServlet extends AbstractGetAclServlet implements GetAcl { private static final long serialVersionUID = 3391376559396223185L; diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java index a3c5a29..3a4c6cd 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java @@ -27,14 +27,11 @@ import javax.jcr.security.AccessControlManager; import javax.jcr.security.AccessControlPolicy; import javax.servlet.Servlet; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Properties; -import org.apache.felix.scr.annotations.Property; -import org.apache.felix.scr.annotations.Service; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; import org.apache.sling.jcr.base.util.AccessControlUtil; import org.apache.sling.jcr.jackrabbit.accessmanager.GetEffectiveAcl; +import org.osgi.service.component.annotations.Component; /** * <p> @@ -101,23 +98,13 @@ import org.apache.sling.jcr.jackrabbit.accessmanager.GetEffectiveAcl; * </pre> * </code> */ -@Component -@Service (value={ - Servlet.class, - GetEffectiveAcl.class -}) -@Properties ({ - @Property (name="sling.servlet.resourceTypes", - value="sling/servlet/default"), - @Property (name="sling.servlet.methods", - value="GET"), - @Property (name="sling.servlet.selectors", - value={ - "eacl", - "tidy.eacl" - }), - @Property (name="sling.servlet.extensions", - value="json") + +@Component(service = {Servlet.class, GetEffectiveAcl.class}, +property= { + "sling.servlet.resourceTypes=sling/servlet/default", + "sling.servlet.methods=GET", + "sling.servlet.selectors=eacl", + "sling.servlet.selectors=tidy.eacl" }) @SuppressWarnings("serial") public class GetEffectiveAclServlet extends AbstractGetAclServlet implements GetEffectiveAcl { diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java index 023562b..8647cf9 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java @@ -22,26 +22,22 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import javax.jcr.Item; import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.servlet.Servlet; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Properties; -import org.apache.felix.scr.annotations.Property; -import org.apache.felix.scr.annotations.Service; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.ResourceNotFoundException; -import org.apache.sling.api.servlets.HtmlResponse; import org.apache.sling.jcr.base.util.AccessControlUtil; import org.apache.sling.jcr.jackrabbit.accessmanager.ModifyAce; import org.apache.sling.servlets.post.AbstractPostResponse; import org.apache.sling.servlets.post.Modification; +import org.osgi.service.component.annotations.Component; /** * <p> @@ -84,18 +80,12 @@ import org.apache.sling.servlets.post.Modification; * will not be added to the group. The group will only contain granted privileges. * </p> */ -@Component -@Service (value={ - Servlet.class, - ModifyAce.class -}) -@Properties ({ - @Property (name="sling.servlet.resourceTypes", - value="sling/servlet/default"), - @Property (name="sling.servlet.methods", - value="POST"), - @Property (name="sling.servlet.selectors", - value="modifyAce") + +@Component(service = {Servlet.class, ModifyAce.class}, +property= { + "sling.servlet.resourceTypes=sling/servlet/default", + "sling.servlet.methods=POST", + "sling.servlet.selectors=modifyAce" }) public class ModifyAceServlet extends AbstractAccessPostServlet implements ModifyAce { private static final long serialVersionUID = -9182485466670280437L; diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/package-info.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/package-info.java new file mode 100644 index 0000000..91d1967 --- /dev/null +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/package-info.java @@ -0,0 +1,23 @@ +/* + * 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. + */ + [email protected]("2.1.2") +package org.apache.sling.jcr.jackrabbit.accessmanager.post; + + diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE deleted file mode 100644 index d645695..0000000 --- a/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE deleted file mode 100644 index e83337d..0000000 --- a/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,8 +0,0 @@ -Apache Sling Jackrabbit JSR-283 Access Control Manager Support -Copyright 2008-2010 The Apache Software Foundation - -Apache Sling is based on source code originally developed -by Day Software (http://www.day.com/). - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties deleted file mode 100644 index a6577f9..0000000 --- a/src/main/resources/OSGI-INF/metatype/metatype.properties +++ /dev/null @@ -1,41 +0,0 @@ -# -# 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. -# - - -# -# This file contains localization strings for configuration labels and -# descriptions as used in the metatype.xml descriptor generated by the -# the Sling SCR plugin - -deleteAces.post.operation.name = Apache Sling Delete ACE -deleteAces.post.operation.description = The Sling operation to handle \ - access control entry delete requests in Sling. - -modifyAce.post.operation.name = Apache Sling Add/Update ACE -modifyAce.post.operation.description = The Sling operation to handle \ - access control entry add or update requests in Sling. - -getAcl.get.operation.name = Apache Sling Get ACL -getAcl.get.operation.description = The Sling operation to handle \ - get ACL requests in Sling. - -getEffectiveAcl.get.operation.name = Apache Sling Get Effective ACL -getEffectiveAcl.get.operation.description = The Sling operation to handle \ - get effective ACL requests in Sling. - \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
