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:08:42 UTC
svn commit: r1720169 -
/sling/trunk/contrib/extensions/acldef-parser/src/main/javacc/ACLDefinitions.jjt
Author: bdelacretaz
Date: Tue Dec 15 14:08:42 2015
New Revision: 1720169
URL: http://svn.apache.org/viewvc?rev=1720169&view=rev
Log:
SLING-5355 - better formatting
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=1720169&r1=1720168&r2=1720169&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:08:42 2015
@@ -106,7 +106,11 @@ void serviceUserStatement(List<Operation
List<String> usernames;
}
{
- (t=<CREATE> | t=<DELETE>) <SERVICE> <USER> usernames = usernamesList() (<EOL> | <EOF>)
+ (t=<CREATE> | t=<DELETE>)
+ <SERVICE> <USER>
+ usernames = usernamesList()
+ (<EOL> | <EOF>)
+
{
for(String username : usernames) {
if(CREATE == t.kind) {
@@ -148,10 +152,12 @@ void setAclStatement(List<Operation> res
List<AclLine> lines = new ArrayList<AclLine>();
}
{
- <SET> <ACL> <ON> paths = pathsList() <EOL>
+ <SET> <ACL> <ON>
+ paths = pathsList() <EOL>
( removeStarLine(lines) ) ?
( privilegesOperationLine(lines) | blankLine() ) +
- <END> ( <EOL> | <EOF> )
+ <END>
+ ( <EOL> | <EOF> )
{
result.add(new SetAcl(paths, lines));
@@ -163,7 +169,9 @@ void removeStarLine(List<AclLine> lines)
List<String> usernames;
}
{
- <REMOVE> <STAR> <FOR> usernames = usernamesList() <EOL>
+ <REMOVE> <STAR>
+ <FOR> usernames = usernamesList()
+ <EOL>
{
lines.add(new AclLine(AclLine.Action.REMOVE_ALL, null, usernames));
@@ -177,7 +185,10 @@ void privilegesOperationLine(List<AclLin
List<String> usernames;
}
{
- ( t = <REMOVE> | t = <ALLOW> | t = <DENY> ) privileges = privilegesList() <FOR> usernames = usernamesList() <EOL>
+ ( t = <REMOVE> | t = <ALLOW> | t = <DENY> )
+ privileges = privilegesList()
+ <FOR> usernames = usernamesList()
+ <EOL>
{
AclLine.Action a = AclLine.Action.REMOVE_ALL;