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/23 13:37:23 UTC
svn commit: r1721535 - in /sling/trunk/contrib/extensions/acldef:
oak-jcr/src/main/java/org/apache/sling/acldef/jcr/
oak-jcr/src/main/java/org/apache/sling/acldef/jcr/webconsole/
oak-jcr/src/test/java/org/apache/sling/acldef/jcr/ parser/src/main/java/o...
Author: bdelacretaz
Date: Wed Dec 23 12:37:23 2015
New Revision: 1721535
URL: http://svn.apache.org/viewvc?rev=1721535&view=rev
Log:
SLING-5355 - parser service
Added:
sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclDefinitionsParser.java
sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclParsingException.java
sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/impl/
sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/impl/ACLDefinitionsParserService.java
sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/package-info.java
sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/package-info.java
sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserServiceTest.java
Modified:
sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java
sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java
sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/AclLine.java
sling/trunk/contrib/extensions/acldef/parser/src/main/javacc/ACLDefinitions.jjt
sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java
sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParsingErrorsTest.java
Modified: sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java?rev=1721535&r1=1721534&r2=1721535&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java Wed Dec 23 12:37:23 2015
@@ -16,9 +16,9 @@
*/
package org.apache.sling.acldef.jcr;
-import static org.apache.sling.acldef.parser.ACLDefinitions.PROP_PATHS;
-import static org.apache.sling.acldef.parser.ACLDefinitions.PROP_PRINCIPALS;
-import static org.apache.sling.acldef.parser.ACLDefinitions.PROP_PRIVILEGES;
+import static org.apache.sling.acldef.parser.operations.AclLine.PROP_PATHS;
+import static org.apache.sling.acldef.parser.operations.AclLine.PROP_PRINCIPALS;
+import static org.apache.sling.acldef.parser.operations.AclLine.PROP_PRIVILEGES;
import java.util.List;
Modified: sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java?rev=1721535&r1=1721534&r2=1721535&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java Wed Dec 23 12:37:23 2015
@@ -41,8 +41,8 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.acldef.jcr.AclOperationVisitor;
-import org.apache.sling.acldef.parser.ACLDefinitions;
-import org.apache.sling.acldef.parser.ParseException;
+import org.apache.sling.acldef.parser.AclDefinitionsParser;
+import org.apache.sling.acldef.parser.AclParsingException;
import org.apache.sling.acldef.parser.operations.Operation;
import org.apache.sling.acldef.parser.operations.OperationVisitor;
import org.apache.sling.api.request.ResponseUtil;
@@ -80,6 +80,9 @@ public class OakAclDefConsolePlugin exte
@Reference
private SlingRepository repository;
+ @Reference
+ private AclDefinitionsParser parser;
+
private String thisPath(HttpServletRequest request) {
return request.getContextPath() + request.getServletPath() + request.getPathInfo();
}
@@ -157,13 +160,13 @@ public class OakAclDefConsolePlugin exte
}
}
- private void setAcl(String aclDef) throws RepositoryException, IOException, ParseException {
+ private void setAcl(String aclDef) throws RepositoryException, IOException, AclParsingException {
final Reader r = new StringReader(aclDef);
Session s = null;
try {
s = repository.loginAdministrative(null);
final OperationVisitor v = new AclOperationVisitor(s);
- for(Operation op : new ACLDefinitions(r).parse()) {
+ for(Operation op : parser.parse(r)) {
op.accept(v);
}
s.save();
Modified: sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java?rev=1721535&r1=1721534&r2=1721535&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java Wed Dec 23 12:37:23 2015
@@ -26,7 +26,7 @@ import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.acldef.parser.ParseException;
+import org.apache.sling.acldef.parser.AclParsingException;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.After;
@@ -44,14 +44,14 @@ public class GeneralAclTest {
private Session s;
@Before
- public void setup() throws ParseException, RepositoryException {
+ public void setup() throws RepositoryException, AclParsingException {
U = new TestUtil(context);
U.parseAndExecute("create service user " + U.username);
s = U.loginService(U.username);
}
@After
- public void cleanup() throws ParseException, RepositoryException {
+ public void cleanup() throws RepositoryException, AclParsingException {
U.cleanupUser();
s.logout();
}
Modified: sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java?rev=1721535&r1=1721534&r2=1721535&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java Wed Dec 23 12:37:23 2015
@@ -16,13 +16,14 @@
*/
package org.apache.sling.acldef.jcr;
-import static org.junit.Assert.fail;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.acldef.parser.ParseException;
+import org.apache.sling.acldef.parser.AclParsingException;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.After;
@@ -40,14 +41,14 @@ public class NonExistentPathTest {
private Session s;
@Before
- public void setup() throws ParseException, RepositoryException {
+ public void setup() throws RepositoryException, AclParsingException {
U = new TestUtil(context);
U.parseAndExecute("create service user " + U.username);
s = U.loginService(U.username);
}
@After
- public void cleanup() throws ParseException, RepositoryException {
+ public void cleanup() throws RepositoryException, AclParsingException {
U.cleanupUser();
s.logout();
}
Modified: sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java?rev=1721535&r1=1721534&r2=1721535&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java (original)
+++ sling/trunk/contrib/extensions/acldef/oak-jcr/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java Wed Dec 23 12:37:23 2015
@@ -31,8 +31,8 @@ import javax.jcr.SimpleCredentials;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
-import org.apache.sling.acldef.parser.ACLDefinitions;
-import org.apache.sling.acldef.parser.ParseException;
+import org.apache.sling.acldef.parser.AclParsingException;
+import org.apache.sling.acldef.parser.impl.ACLDefinitionsParserService;
import org.apache.sling.acldef.parser.operations.Operation;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
@@ -49,10 +49,10 @@ class TestUtil {
username = "user_" + id;
}
- List<Operation> parse(String input) throws ParseException {
+ List<Operation> parse(String input) throws AclParsingException {
final Reader r = new StringReader(input);
try {
- return new ACLDefinitions(r).parse();
+ return new ACLDefinitionsParserService().parse(r);
} finally {
IOUtils.closeQuietly(r);
}
@@ -69,7 +69,7 @@ class TestUtil {
}
}
- void parseAndExecute(String input) throws ParseException, RepositoryException {
+ void parseAndExecute(String input) throws RepositoryException, AclParsingException {
final AclOperationVisitor v = new AclOperationVisitor(adminSession);
for(Operation o : parse(input)) {
o.accept(v);
@@ -77,7 +77,7 @@ class TestUtil {
adminSession.save();
}
- void cleanupUser() throws ParseException, RepositoryException {
+ void cleanupUser() throws RepositoryException, AclParsingException {
parseAndExecute("delete service user " + username);
assertServiceUser("in cleanupUser()", username, false);
}
Added: sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclDefinitionsParser.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclDefinitionsParser.java?rev=1721535&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclDefinitionsParser.java (added)
+++ sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclDefinitionsParser.java Wed Dec 23 12:37:23 2015
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+package org.apache.sling.acldef.parser;
+
+import java.io.Reader;
+import java.util.List;
+
+import org.apache.sling.acldef.parser.operations.Operation;
+
+/** ACL definitions parser service interface */
+public interface AclDefinitionsParser {
+ List<Operation> parse(Reader r) throws AclParsingException;
+}
Added: sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclParsingException.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclParsingException.java?rev=1721535&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclParsingException.java (added)
+++ sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/AclParsingException.java Wed Dec 23 12:37:23 2015
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+package org.apache.sling.acldef.parser;
+
+public class AclParsingException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public AclParsingException(String reason, Throwable cause) {
+ super(reason, cause);
+ }
+}
Added: sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/impl/ACLDefinitionsParserService.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/impl/ACLDefinitionsParserService.java?rev=1721535&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/impl/ACLDefinitionsParserService.java (added)
+++ sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/impl/ACLDefinitionsParserService.java Wed Dec 23 12:37:23 2015
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+package org.apache.sling.acldef.parser.impl;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.List;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.acldef.parser.AclDefinitionsParser;
+import org.apache.sling.acldef.parser.AclParsingException;
+import org.apache.sling.acldef.parser.operations.Operation;
+
+/** ACL definitions parser service */
+@Component
+@Service(value=AclDefinitionsParser.class)
+public class ACLDefinitionsParserService implements AclDefinitionsParser {
+
+ @Override
+ public List<Operation> parse(Reader r) throws AclParsingException {
+ try {
+ return new ACLDefinitionsParserImpl(r).parse();
+ } catch (ParseException pe) {
+ throw new AclParsingException(pe.getMessage(), pe);
+ } finally {
+ try {
+ r.close();
+ } catch(IOException ignore) {
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/AclLine.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/AclLine.java?rev=1721535&r1=1721534&r2=1721535&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/AclLine.java (original)
+++ sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/AclLine.java Wed Dec 23 12:37:23 2015
@@ -29,6 +29,11 @@ public class AclLine {
private final Action action;
private static final List<String> EMPTY_LIST = Collections.unmodifiableList(new ArrayList<String>());
+ public static final String PROP_PATHS = "paths";
+ public static final String PROP_PRINCIPALS = "principals";
+ public static final String PROP_PRIVILEGES = "privileges";
+ public static final String PROP_NODETYPES = "nodetypes";
+
public enum Action {
REMOVE,
REMOVE_ALL,
Added: sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/package-info.java?rev=1721535&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/package-info.java (added)
+++ sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/operations/package-info.java Wed Dec 23 12:37:23 2015
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+
+@Version("1.0.0")
+package org.apache.sling.acldef.parser.operations;
+
+import aQute.bnd.annotation.Version;
\ No newline at end of file
Added: sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/package-info.java?rev=1721535&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/package-info.java (added)
+++ sling/trunk/contrib/extensions/acldef/parser/src/main/java/org/apache/sling/acldef/parser/package-info.java Wed Dec 23 12:37:23 2015
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+
+@Version("1.0.0")
+package org.apache.sling.acldef.parser;
+
+import aQute.bnd.annotation.Version;
\ No newline at end of file
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=1721535&r1=1721534&r2=1721535&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 Wed Dec 23 12:37:23 2015
@@ -8,9 +8,9 @@ options
STATIC=false;
}
-PARSER_BEGIN(ACLDefinitions)
+PARSER_BEGIN(ACLDefinitionsParserImpl)
-package org.apache.sling.acldef.parser;
+package org.apache.sling.acldef.parser.impl;
import java.util.List;
import java.util.ArrayList;
@@ -34,15 +34,10 @@ import org.apache.sling.acldef.parser.op
* limitations under the License.
*/
-public class ACLDefinitions
+public class ACLDefinitionsParserImpl
{
- public static final String PROP_PATHS = "paths";
- public static final String PROP_PRINCIPALS = "principals";
- public static final String PROP_PRIVILEGES = "privileges";
- public static final String PROP_NODETYPES = "nodetypes";
}
-
-PARSER_END(ACLDefinitions)
+PARSER_END(ACLDefinitionsParserImpl)
SKIP :
{
@@ -178,9 +173,9 @@ void removeStarLine(List<AclLine> lines)
{
<REMOVE> <STAR>
(
- <FOR> tmp = principalsList() { line.setProperty(PROP_PRINCIPALS, tmp); }
+ <FOR> tmp = principalsList() { line.setProperty(AclLine.PROP_PRINCIPALS, tmp); }
- | <ON> tmp = pathsList() { line.setProperty(PROP_PATHS, tmp); }
+ | <ON> tmp = pathsList() { line.setProperty(AclLine.PROP_PATHS, tmp); }
)
<EOL>
@@ -206,9 +201,9 @@ void userPrivilegesLine(List<AclLine> li
}
{
line = privilegesLineOperation()
- tmp = namespacedItemsList() { line.setProperty(PROP_PRIVILEGES, tmp); }
+ tmp = namespacedItemsList() { line.setProperty(AclLine.PROP_PRIVILEGES, tmp); }
<FOR>
- tmp = principalsList() { line.setProperty(PROP_PRINCIPALS, tmp); }
+ tmp = principalsList() { line.setProperty(AclLine.PROP_PRINCIPALS, tmp); }
<EOL>
{
@@ -223,9 +218,9 @@ void pathPrivilegesLine(List<AclLine> li
}
{
line = privilegesLineOperation()
- tmp = namespacedItemsList() { line.setProperty(PROP_PRIVILEGES, tmp); }
- <ON> tmp = pathsList() { line.setProperty(PROP_PATHS, tmp); }
- ( <NODETYPES> tmp = namespacedItemsList() { line.setProperty(PROP_NODETYPES, tmp); }) ?
+ tmp = namespacedItemsList() { line.setProperty(AclLine.PROP_PRIVILEGES, tmp); }
+ <ON> tmp = pathsList() { line.setProperty(AclLine.PROP_PATHS, tmp); }
+ ( <NODETYPES> tmp = namespacedItemsList() { line.setProperty(AclLine.PROP_NODETYPES, tmp); }) ?
<EOL>
{
Added: sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserServiceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserServiceTest.java?rev=1721535&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserServiceTest.java (added)
+++ sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserServiceTest.java Wed Dec 23 12:37:23 2015
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.sling.acldef.parser.test;
+
+import java.io.Reader;
+import java.io.StringReader;
+
+import org.apache.sling.acldef.parser.AclParsingException;
+import org.apache.sling.acldef.parser.impl.ACLDefinitionsParserService;
+import org.junit.Test;
+
+public class ParserServiceTest {
+ @Test
+ public void noErrors() throws AclParsingException {
+ final Reader r = new StringReader("create service user foo");
+ new ACLDefinitionsParserService().parse(r);
+ }
+
+ @Test(expected = AclParsingException.class)
+ public void syntaxError() throws AclParsingException {
+ final Reader r = new StringReader("not a valid statement");
+ new ACLDefinitionsParserService().parse(r);
+ }
+}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java?rev=1721535&r1=1721534&r2=1721535&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java (original)
+++ sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParserTest.java Wed Dec 23 12:37:23 2015
@@ -28,8 +28,8 @@ import java.util.Collection;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.acldef.parser.ACLDefinitions;
-import org.apache.sling.acldef.parser.ParseException;
+import org.apache.sling.acldef.parser.impl.ACLDefinitionsParserImpl;
+import org.apache.sling.acldef.parser.impl.ParseException;
import org.apache.sling.acldef.parser.operations.Operation;
import org.apache.sling.acldef.parser.operations.OperationVisitor;
import org.junit.Test;
@@ -112,7 +112,7 @@ public class ParserTest {
try {
final StringWriter sw = new StringWriter();
final OperationVisitor v = new OperationToStringVisitor(new PrintWriter(sw));
- final List<Operation> result = new ACLDefinitions(tc.input).parse();
+ final List<Operation> result = new ACLDefinitionsParserImpl(tc.input).parse();
for(Operation o : result) {
o.accept(v);
}
Modified: sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParsingErrorsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParsingErrorsTest.java?rev=1721535&r1=1721534&r2=1721535&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParsingErrorsTest.java (original)
+++ sling/trunk/contrib/extensions/acldef/parser/src/test/java/org/apache/sling/acldef/parser/test/ParsingErrorsTest.java Wed Dec 23 12:37:23 2015
@@ -26,9 +26,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.sling.acldef.parser.ACLDefinitions;
-import org.apache.sling.acldef.parser.ParseException;
-import org.apache.sling.acldef.parser.TokenMgrError;
+import org.apache.sling.acldef.parser.impl.ACLDefinitionsParserImpl;
+import org.apache.sling.acldef.parser.impl.ParseException;
+import org.apache.sling.acldef.parser.impl.TokenMgrError;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -74,7 +74,7 @@ public class ParsingErrorsTest {
public void checkResult() throws ParseException, IOException {
final StringReader r = new StringReader(input);
try {
- new ACLDefinitions(r).parse();
+ new ACLDefinitionsParserImpl(r).parse();
if(expected != null) {
fail("Expected a " + expected.getSimpleName() + " for [" + input + "]");
}