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:48:51 UTC
[sling-org-apache-sling-jcr-repoinit] 08/43: SLING-5355 - parser
service
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jcr.repoinit-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-repoinit.git
commit de7c9809d6e88a96c4c2262a2db1eab926ca6ce4
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Dec 23 12:37:23 2015 +0000
SLING-5355 - parser service
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/acldef/oak-jcr@1721535 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/acldef/jcr/AclOperationVisitor.java | 6 +++---
.../sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java | 11 +++++++----
.../java/org/apache/sling/acldef/jcr/GeneralAclTest.java | 6 +++---
.../org/apache/sling/acldef/jcr/NonExistentPathTest.java | 9 +++++----
src/test/java/org/apache/sling/acldef/jcr/TestUtil.java | 12 ++++++------
5 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java b/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java
index f99b1b6..bd6310c 100644
--- a/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java
+++ b/src/main/java/org/apache/sling/acldef/jcr/AclOperationVisitor.java
@@ -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;
diff --git a/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java b/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java
index 16d3ff3..5421c04 100644
--- a/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java
+++ b/src/main/java/org/apache/sling/acldef/jcr/webconsole/OakAclDefConsolePlugin.java
@@ -41,8 +41,8 @@ import org.apache.felix.scr.annotations.Property;
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 extends HttpServlet {
@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 extends HttpServlet {
}
}
- 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();
diff --git a/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java b/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
index c4cfb12..1b85e0d 100644
--- a/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
+++ b/src/test/java/org/apache/sling/acldef/jcr/GeneralAclTest.java
@@ -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();
}
diff --git a/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java b/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
index 50746cc..f74fbe8 100644
--- a/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
+++ b/src/test/java/org/apache/sling/acldef/jcr/NonExistentPathTest.java
@@ -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();
}
diff --git a/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java b/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
index ea9c9bb..03782e2 100644
--- a/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
+++ b/src/test/java/org/apache/sling/acldef/jcr/TestUtil.java
@@ -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);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.