You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:49:05 UTC
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] annotated tag
org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0 created (now 9f6336b)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change 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.
at 9f6336b (tag)
tagging 562ce9a65a046099c7f4c8f3ae960b730186e84d (commit)
by Karl Pauls
on Mon May 8 12:12:12 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new d3f7b97 Import jackrabbit-accessmanager
new 6e7aae9 SLING-879: New Bundle to provide actions for interacting with the jackrabbit AccessManager. Patch provided by Eric Norman. https://issues.apache.org/jira/browse/SLING-879
new 1431cb1 SLING-941: Lots of svn:eol-style settings missing
new 1ab84c7 SLING-941: Lots of svn:eol-style settings missing
new 8c19a30 SLING-941: Lots of svn:eol-style settings missing
new d78f209 Use released version of jackrabbit api
new 067e7fc Use jackrabbit api bundle instead of Sling's obsolete version.
new ab58792 Use release parent pom
new f64de42 Use released version as dependencies.
new 258a10d [maven-release-plugin] prepare release org.apache.sling.jcr.jackrabbit.accessmanager-2.0.0-incubator
new 70bb409 [maven-release-plugin] prepare for next development iteration
new 9f5f16d Use next dev version of parent pom
new 8101ae1 Add license header
new c1777c5 Add missing licence, notice etc.
new 3b447fa Prepare new release.
new 995d0e6 [maven-release-plugin] prepare release org.apache.sling.jcr.jackrabbit.accessmanager-2.0.2-incubator
new 3c7b087 [maven-release-plugin] prepare for next development iteration
new c4e0670 Use next parent pom for development.
new d627e7e Set parent pom to released version.
new a8d22a3 Move Sling to new TLP location
new 94aca6e SLING-1011 : Remove disclaimer file.
new 6bbebdf SLING-1011 : Adjust svn location
new 6d9578b SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
new 6390829 SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app has the leglize stuff, too)
new 4a672c9 SLING-940 Applied patch from myself. Adds Javadoc to accessmanager and usermanager servlets.
new 5f5f49d Use official release instead of incubator release.
new 5fd0e3b Update to latest Sling releases.
new 0e2d9a5 SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
new 32c555a SLING-1208 Adapt to an API change between Jackrabbit 1.5 and 1.6: If a node as a access control policy set, the AccessControlManager.getApplicableAccessControlPolicies() returns an empty iterator. In this case the getAccessControlPolicies returns the current policies. Also upgraded dependency to Jackrabbit API to 1.6
new a9b8cd7 Update notice files.
new 1ef6653 [maven-release-plugin] prepare release org.apache.sling.jcr.jackrabbit.accessmanager-2.0.4
new 7a8f5c3 [maven-release-plugin] prepare for next development iteration
new baa13c6 SLING-1212 - upgrading to Jackrabbit 2. Also includes re-revert of SLING-1363 and implementation of SLING-1330. Thanks to Felix for getting this started.
new 4a18344 SLING-997 ModifyAceServlet replaces rather than merges privileges
new 60e312a SLING-997 handle merges involving aggregate privileges properly
new 533a4ba SLING-1411 Add replaceAccessControlEntry method to AccessControlUtil Thanks to Ray Davis for the contribution.
new b866e1d SLING-1411 Clarify how to un-set a privilege and fix the sample ACE edit script from the launchpad.content bundle
new d1328f5 SLING-1090 fixed return value of PrivilegesInfo.canDelete(..) for children of the root node + added some unit tests
new d59aaea Removed the 'authorizable' related privilege helpers since they don't work after the upgrade to JR2. To check the authorizable privileges use the 'AuthorizablePrivilegesInfo' service from the jackrabbit.usermanager bundle.
new 1bc3e51 SLING-1457 SLING-1458 - enable support for specifying the position of an ACE (within the ACL) when it is added/updated
new 9cf61d2 SLING-1517 - fixing Maven 3 warnings and switching to released version of animal sniffer
new f66de82 Use released parent pom.
new eee036b SLING-1528 Fixed, reverting to original format, and fixing the reverting the integration tests (keeping the additional integration tests to cover this area)
new 786e49d Clean up code
new d4ac26b SLING-1612 - adding Effective ACL servlet
new 51205d6 SLING-1677 Let AccessManager POST servlets return JSON
new d4f3eec SLING-1698 - setting explicit export version
new 1810e04 updating to released jcr bundles
new 9038481 tabs -> spaces
new 2c7e61a SLING-1805 Fix registration property
new ae5853c updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
new 8868e8f using released version of servlet modules
new 2c72380 updating pom files pre-release
new b67cc19 [maven-release-plugin] prepare release org.apache.sling.jcr.jackrabbit.accessmanager-2.1.0
new 966fe2f [maven-release-plugin] prepare for next development iteration
new cdc9e63 using latest parent
new 15cd533 Update to recent snapshots
new 3422d99 Use latest releases.
new fcc025a SLING-2083 AccessManager permissions manipulation services that mirror the functionality of the REST operations for programmatic access management code.
new 5275f71 cleanup metatype labels
new 145ed58 SLING-2150 : Update plugins to use the latest available versions
new eef6db0 Update to recent snapshot
new 7ab01b7 Using latest released parent pom
new 23314cd SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new 3135335 temporarily using snapshots during release vote
new 468f67e using latest releases
new c454fa1 SLING-2080 Apply patch by Angela Schreiber (thank you very much)
new 0a56b45 SLING-2309 AccessManager - Convert @scr Java Doc Tags to SCR Annotations
new acceb57 SLING-2309 AccessManager - Convert @scr Java Doc Tags to SCR Annotations
new e3ac8c7 Add scope provided to dependencies
new 8357bb0 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 854db05 Use version from parent pom
new 0e1eb7e Update to latest parent pom
new 0776b5a Use released versions
new 3fdd00d SLING-2600 Effective ACL servlet returns incorrect information
new cbc32dc SLING-2616 Enable tidy output from acl servlets
new 06bac52 SLING-2600 Attempt #2. Effective ACL servlet returns incorrect information. Merge the information from the applicable access control entries to produce the eacl JSON output. + a few unit tests
new 48c3c0a SLING-2644 - Make the jackrabbit/accessmanager and jackrabbit/usermanager to work with newer servlets/post bundle
new 5230867 Use latest releases and update to new parent pom
new ba4f32a Update to latest parent pom and use latest releases in launchpad
new 10f73c6 Correct reactor pom and update to parent pom 16
new d3e5b41 SLING-2926 : Wasted work in AbstractGetAclServlet.doGet() . Apply patch from Adrian Nistor
new dae3151 Update to latest parent pom
new 2e1ea36 Update to parent pom 18
new 446c5d0 Update to parent pom v19
new 625d59b Clean up usage of SCR annotations
new a005549 Updated to parent version 20
new 8e1370a [maven-release-plugin] prepare release org.apache.sling.jcr.jackrabbit.accessmanager-2.1.2
new 0d9e077 [maven-release-plugin] prepare for next development iteration
new 31a51be Update to Sling Parent POM 22 with baselining enabled
new 839a1ba SLING-4698 - Set parent.relativePath to empty for all modules
new a8b16e4 Update to Sling Parent 23
new eb50668 set parent version to 24 and add empty relativePath where missing
new b504b01 Update the main reactor to parent 25
new a92539a Switch to parent pom 26
new 9b37854 SLING-6452 : Update / Clean access manager project
new dcf01a2 use Sling Parent 30
new 5e333e8 SLING-6684: Replace commons.json usage in org.apache.sling.jcr.jackrabbit.accessmanager
new 27a6432 SLING-6694: Switch to geronimo provider for javax.json api.
new ed67d00 Disable doclint for javadoc on java8.
new 9fb7a61 [maven-release-plugin] prepare release org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
new 562ce9a [maven-release-plugin] copy for tag org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
The 102 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 06/14: Update
the main reactor to parent 25
Posted by ro...@apache.org.
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 b504b01ccc1ffd9560e97e73955dc08dece61997
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f56c76b..7806aca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 09/14: use
Sling Parent 30
Posted by ro...@apache.org.
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 dcf01a2535de1d5c59446d370d415615ef3c16a7
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:22:30 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1785621 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5e495ca..f852f82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>29</version>
+ <version>30</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 02/14: Update
to Sling Parent POM 22 with baselining enabled
Posted by ro...@apache.org.
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 31a51be9ac35637c7e6382e0da9951ace94ee358
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:57:44 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1628622 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 51fa88b..604aa0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
@@ -66,7 +66,7 @@
</Embed-Dependency>
<Export-Package>
org.apache.sling.jcr.jackrabbit.accessmanager;version=2.1.1,
- org.apache.sling.jcr.jackrabbit.accessmanager.post;version=2.1.1
+ org.apache.sling.jcr.jackrabbit.accessmanager.post;version=2.1.2
</Export-Package>
<Sling-Initial-Content />
<Sling-Nodetypes />
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 14/14:
[maven-release-plugin] copy for tag
org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
Posted by ro...@apache.org.
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 562ce9a65a046099c7f4c8f3ae960b730186e84d
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Mon May 8 12:12:12 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0@1794346 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 03/14:
SLING-4698 - Set parent.relativePath to empty for all modules
Posted by ro...@apache.org.
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 839a1bae3fa5151bdc90a7f8696774b25c18338d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 604aa0b..be63018 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.jcr.jackrabbit.accessmanager</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 07/14: Switch
to parent pom 26
Posted by ro...@apache.org.
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 a92539af11aca927424fb049823d9cbcceadd418
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7806aca..1348f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 13/14:
[maven-release-plugin] prepare release
org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
Posted by ro...@apache.org.
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 9fb7a617b8ea9fec71c155e1cd79f361e10316eb
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Mon May 8 12:11:58 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1794345 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index a667597..d26c8f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,12 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>30</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>org.apache.sling.jcr.jackrabbit.accessmanager</artifactId>
<packaging>bundle</packaging>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.0.0</version>
<name>Apache Sling Jackrabbit JSR-283 Access Control Manager Support</name>
<description>
Provides SlingPostOperations for the Jackrabbit JSR-283 Access Control Manager.
@@ -37,13 +37,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager
+ scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager
+ scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
</developerConnection>
<url>
- http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager
+ http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.jackrabbit.accessmanager-3.0.0
</url>
</scm>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.post</artifactId>
- <version>2.3.15-SNAPSHOT</version>
+ <version>2.3.16</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 10/14:
SLING-6684: Replace commons.json usage in
org.apache.sling.jcr.jackrabbit.accessmanager
Posted by ro...@apache.org.
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 5e333e866d3fe9a5e9e838f63003ae0859cb4de8
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Tue Mar 28 13:02:40 2017 +0000
SLING-6684: Replace commons.json usage in org.apache.sling.jcr.jackrabbit.accessmanager
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1789115 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 22 +++---
.../sling/jcr/jackrabbit/accessmanager/GetAcl.java | 8 +-
.../jackrabbit/accessmanager/GetEffectiveAcl.java | 8 +-
.../jcr/jackrabbit/accessmanager/package-info.java | 2 +-
.../accessmanager/post/AbstractGetAclServlet.java | 92 ++++++++++++++++------
.../accessmanager/post/GetAclServlet.java | 7 +-
.../accessmanager/post/GetEffectiveAclServlet.java | 7 +-
.../accessmanager/post/package-info.java | 2 +-
8 files changed, 95 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index f852f82..0578dfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.jcr.jackrabbit.accessmanager</artifactId>
<packaging>bundle</packaging>
- <version>2.1.3-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<name>Apache Sling Jackrabbit JSR-283 Access Control Manager Support</name>
<description>
Provides SlingPostOperations for the Jackrabbit JSR-283 Access Control Manager.
@@ -53,6 +53,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -62,14 +66,6 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.4-incubator</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
@@ -85,7 +81,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.post</artifactId>
- <version>2.1.2</version>
+ <version>2.3.15-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -103,5 +99,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.johnzon</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
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 5bae6d4..be9d415 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
@@ -20,9 +20,7 @@ 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;
+import javax.json.JsonObject;
/**
* The <code>GetAcl</code> service api.
@@ -41,8 +39,8 @@ public interface GetAcl {
* @return the ACL as a JSON object
* @throws RepositoryException
*/
- JSONObject getAcl(Session jcrSession,
+ JsonObject getAcl(Session jcrSession,
String resourcePath
- ) throws RepositoryException, JSONException;
+ ) throws RepositoryException;
}
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 2a68a33..c192df0 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
@@ -20,9 +20,7 @@ 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;
+import javax.json.JsonObject;
/**
* The <code>GetAcl</code> service api.
@@ -41,8 +39,8 @@ public interface GetEffectiveAcl {
* @return the ACL as a JSON object
* @throws RepositoryException
*/
- JSONObject getEffectiveAcl(Session jcrSession,
+ JsonObject getEffectiveAcl(Session jcrSession,
String resourcePath
- ) throws RepositoryException, JSONException;
+ ) throws RepositoryException;
}
diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/package-info.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/package-info.java
index f3c7621..5119ee5 100644
--- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/package-info.java
+++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("2.1.1")
+@org.osgi.annotation.versioning.Version("3.0.0")
package org.apache.sling.jcr.jackrabbit.accessmanager;
diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java
index 204aaff..fd06c0d 100644
--- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java
+++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java
@@ -36,6 +36,12 @@ import javax.jcr.Session;
import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.Privilege;
+import javax.json.Json;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonValue;
+import javax.json.stream.JsonGenerator;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
@@ -43,8 +49,6 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.ResourceNotFoundException;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.jcr.base.util.AccessControlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +73,7 @@ public abstract class AbstractGetAclServlet extends SlingAllMethodsServlet {
Session session = request.getResourceResolver().adaptTo(Session.class);
String resourcePath = request.getResource().getPath();
- JSONObject acl = internalGetAcl(session, resourcePath);
+ JsonObject acl = internalGetAcl(session, resourcePath);
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
@@ -84,11 +88,9 @@ public abstract class AbstractGetAclServlet extends SlingAllMethodsServlet {
}
}
- if (isTidy) {
- response.getWriter().append(acl.toString(2));
- } else {
- acl.write(response.getWriter());
- }
+ Map<String, Object> options = new HashMap<>();
+ options.put(JsonGenerator.PRETTY_PRINTING, isTidy);
+ Json.createGeneratorFactory(options).createGenerator(response.getWriter()).write(acl).flush();
} catch (AccessDeniedException ade) {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (ResourceNotFoundException rnfe) {
@@ -102,8 +104,7 @@ public abstract class AbstractGetAclServlet extends SlingAllMethodsServlet {
}
@SuppressWarnings("unchecked")
- protected JSONObject internalGetAcl(Session jcrSession, String resourcePath)
- throws RepositoryException, JSONException {
+ protected JsonObject internalGetAcl(Session jcrSession, String resourcePath) throws RepositoryException {
if (jcrSession == null) {
throw new RepositoryException("JCR Session not found");
@@ -184,33 +185,78 @@ public abstract class AbstractGetAclServlet extends SlingAllMethodsServlet {
}
}
- List<JSONObject> aclList = new ArrayList<JSONObject>();
+ List<JsonObject> aclList = new ArrayList<>();
Set<Entry<String, Map<String, Object>>> entrySet = aclMap.entrySet();
for (Entry<String, Map<String, Object>> entry : entrySet) {
String principalName = entry.getKey();
Map<String, Object> value = entry.getValue();
- JSONObject aceObject = new JSONObject();
- aceObject.put("principal", principalName);
+ JsonObjectBuilder aceObject = Json.createObjectBuilder();
+ aceObject.add("principal", principalName);
- Set<String> grantedSet = (Set<String>) value.get("granted");
+ Set<Privilege> grantedSet = (Set<Privilege>) value.get("granted");
if (grantedSet != null && !grantedSet.isEmpty()) {
- aceObject.put("granted", grantedSet);
+ JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
+ for (Privilege v : grantedSet)
+ {
+ arrayBuilder.add(v.getName());
+ }
+ aceObject.add("granted", arrayBuilder);
}
- Set<String> deniedSet = (Set<String>) value.get("denied");
+ Set<Privilege> deniedSet = (Set<Privilege>) value.get("denied");
if (deniedSet != null && !deniedSet.isEmpty()) {
- aceObject.put("denied", deniedSet);
+ JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
+ for (Privilege v : deniedSet)
+ {
+ arrayBuilder.add(v.getName());
+ }
+ aceObject.add("denied", arrayBuilder);
}
- aceObject.put("order", value.get("order"));
- aclList.add(aceObject);
+ aceObject.add("order", (Integer) value.get("order"));
+ aclList.add(aceObject.build());
}
- JSONObject jsonAclMap = new JSONObject(aclMap);
- for ( JSONObject jsonObj : aclList) {
- jsonAclMap.put(jsonObj.getString("principal"), jsonObj);
+ JsonObjectBuilder jsonAclMap = Json.createObjectBuilder();
+ for (Map.Entry<String, Map<String, Object>> entry : aclMap.entrySet())
+ {
+ JsonObjectBuilder builder = Json.createObjectBuilder();
+ for (Map.Entry<String, Object> inner : entry.getValue().entrySet())
+ {
+ addTo(builder, inner.getKey(), inner.getValue());
+ }
+ jsonAclMap.add(entry.getKey(), builder);
+ }
+ for (JsonObject jsonObj : aclList) {
+ jsonAclMap.add(jsonObj.getString("principal"), jsonObj);
}
- return jsonAclMap;
+ return jsonAclMap.build();
+ }
+
+ private JsonObjectBuilder addTo(JsonObjectBuilder builder, String key, Object value) {
+ if (value instanceof Byte || value instanceof Short || value instanceof Integer || value instanceof Long)
+ {
+ builder.add(key, ((Number) value).longValue());
+ }
+ else if (value instanceof Float || value instanceof Double)
+ {
+ builder.add(key, ((Number) value).doubleValue());
+ }
+ else if (value instanceof Privilege)
+ {
+ JsonObjectBuilder privilegeBuilder = Json.createObjectBuilder();
+ privilegeBuilder.add("name", ((Privilege) value).getName());
+ builder.add(key, privilegeBuilder);
+ }
+ else if (value instanceof String)
+ {
+ builder.add(key, (String) value);
+ }
+ else
+ {
+ builder.add(key, value.toString());
+ }
+ return builder;
}
/**
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 ba490a9..2bd7ba8 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
@@ -25,10 +25,9 @@ import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
+import javax.json.JsonObject;
import javax.servlet.Servlet;
-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;
@@ -112,8 +111,8 @@ public class GetAclServlet extends AbstractGetAclServlet implements GetAcl {
/* (non-Javadoc)
* @see org.apache.sling.jcr.jackrabbit.accessmanager.GetAcl#getAcl(javax.jcr.Session, java.lang.String)
*/
- public JSONObject getAcl(Session jcrSession, String resourcePath)
- throws RepositoryException, JSONException {
+ public JsonObject getAcl(Session jcrSession, String resourcePath)
+ throws RepositoryException {
return internalGetAcl(jcrSession, resourcePath);
}
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 3a4c6cd..3938fc8 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
@@ -25,10 +25,9 @@ import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
+import javax.json.JsonObject;
import javax.servlet.Servlet;
-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;
@@ -112,8 +111,8 @@ public class GetEffectiveAclServlet extends AbstractGetAclServlet implements Get
/* (non-Javadoc)
* @see org.apache.sling.jcr.jackrabbit.accessmanager.GetEffectiveAcl#getEffectiveAcl(javax.jcr.Session, java.lang.String)
*/
- public JSONObject getEffectiveAcl(Session jcrSession, String resourcePath)
- throws RepositoryException, JSONException {
+ public JsonObject getEffectiveAcl(Session jcrSession, String resourcePath)
+ throws RepositoryException {
return internalGetAcl(jcrSession, resourcePath);
}
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
index 91d1967..c0361a1 100644
--- 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
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("2.1.2")
+@org.osgi.annotation.versioning.Version("3.0.0")
package org.apache.sling.jcr.jackrabbit.accessmanager.post;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 01/14:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
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 0d9e0778fd14414acc5e1033cde93884e830efce
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Sep 16 14:28:12 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1625314 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a5761b7..51fa88b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.jcr.jackrabbit.accessmanager</artifactId>
<packaging>bundle</packaging>
- <version>2.1.2</version>
+ <version>2.1.3-SNAPSHOT</version>
<name>Apache Sling Jackrabbit JSR-283 Access Control Manager Support</name>
<description>
Provides SlingPostOperations for the Jackrabbit JSR-283 Access Control Manager.
@@ -37,13 +37,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.jackrabbit.accessmanager-2.1.2
+ scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.jackrabbit.accessmanager-2.1.2
+ scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager
</developerConnection>
<url>
- http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.jackrabbit.accessmanager-2.1.2
+ http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager
</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 12/14:
Disable doclint for javadoc on java8.
Posted by ro...@apache.org.
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 ed67d00529ba4f9d18152d761e3586e54618d864
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Mon May 8 12:10:39 2017 +0000
Disable doclint for javadoc on java8.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1794344 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index e400f27..a667597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
</plugins>
</build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 04/14: Update
to Sling Parent 23
Posted by ro...@apache.org.
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 a8b16e427b8a680df88be073df0e265cf4f93674
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index be63018..92ccfd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 08/14:
SLING-6452 : Update / Clean access manager project
Posted by ro...@apache.org.
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 <cz...@apache.org>
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;
+@org.osgi.annotation.versioning.Version("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.
+ */
+
+@org.osgi.annotation.versioning.Version("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
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 05/14: set
parent version to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
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 eb5066829da1cf4de2182dc6da359bff583f7170
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 92ccfd6..f56c76b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] 11/14:
SLING-6694: Switch to geronimo provider for javax.json api.
Posted by ro...@apache.org.
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 27a6432534e742f1e01eba016e6037fb57c064d2
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Tue Mar 28 21:17:36 2017 +0000
SLING-6694: Switch to geronimo provider for javax.json api.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1789235 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0578dfc..e400f27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,9 +100,9 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.johnzon</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-json_1.0_spec</artifactId>
+ <version>1.0-alpha-1</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.