You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/12/15 15:48:17 UTC
svn commit: r1720179 - in /sling/trunk/contrib/extensions/acldef-parser/src:
main/javacc/ACLDefinitions.jjt test/resources/testcases/test-11-output.txt
test/resources/testcases/test-11.txt
Author: bdelacretaz
Date: Tue Dec 15 14:48:17 2015
New Revision: 1720179
URL: http://svn.apache.org/viewvc?rev=1720179&view=rev
Log:
SLING-5355 - allow multiple remove * statements
Added:
sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11-output.txt
sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11.txt
Modified:
sling/trunk/contrib/extensions/acldef-parser/src/main/javacc/ACLDefinitions.jjt
Modified: sling/trunk/contrib/extensions/acldef-parser/src/main/javacc/ACLDefinitions.jjt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef-parser/src/main/javacc/ACLDefinitions.jjt?rev=1720179&r1=1720178&r2=1720179&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef-parser/src/main/javacc/ACLDefinitions.jjt (original)
+++ sling/trunk/contrib/extensions/acldef-parser/src/main/javacc/ACLDefinitions.jjt Tue Dec 15 14:48:17 2015
@@ -152,8 +152,7 @@ void setAclStatement(List<Operation> res
{
<SET> <ACL> <ON>
paths = pathsList() <EOL>
- ( removeStarLine(lines) ) ?
- ( privilegesOperationLine(lines) | blankLine() ) +
+ ( removeStarLine(lines) | privilegesOperationLine(lines) | blankLine() ) +
<END>
( <EOL> | <EOF> )
Added: sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11-output.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11-output.txt?rev=1720179&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11-output.txt (added)
+++ sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11-output.txt Tue Dec 15 14:48:17 2015
@@ -0,0 +1 @@
+SetAcl on [/libs, /apps] : [REMOVE_ALL null for [user1, user2], ALLOW [jcr:read] for [user1, user2], REMOVE_ALL null for [another], ALLOW [x:y] for [another]]
\ No newline at end of file
Added: sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11.txt
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11.txt?rev=1720179&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11.txt (added)
+++ sling/trunk/contrib/extensions/acldef-parser/src/test/resources/testcases/test-11.txt Tue Dec 15 14:48:17 2015
@@ -0,0 +1,8 @@
+# Test multiple remove lines
+set ACL on /libs,/apps
+ remove * for user1,user2
+ allow jcr:read for user1,user2
+
+ remove * for another
+ allow x:y for another
+end
\ No newline at end of file