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 77904246ac6c77bc582481f1a84a3ec3f5436f51 Author: Bertrand Delacretaz <[email protected]> AuthorDate: Fri Jan 22 18:33:42 2016 +0000 SLING-5449 - rename the remaining things from ACL to 'repoinit' git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/repoinit/oak-jcr@1726273 13f79535-47bb-0310-9956-ffa450edef68 --- .../repoinit/jcr/webconsole/OakAclDefConsolePlugin.java | 12 ++++++------ .../java/org/apache/sling/repoinit/jcr/GeneralAclTest.java | 6 +++--- .../org/apache/sling/repoinit/jcr/NonExistentPathTest.java | 6 +++--- src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java b/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java index 464f5b0..48bc4c5 100644 --- a/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java +++ b/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java @@ -40,13 +40,13 @@ import org.apache.felix.scr.annotations.Properties; 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.api.request.ResponseUtil; +import org.apache.sling.jcr.api.SlingRepository; import org.apache.sling.repoinit.jcr.AclOperationVisitor; -import org.apache.sling.repoinit.parser.AclDefinitionsParser; -import org.apache.sling.repoinit.parser.AclParsingException; +import org.apache.sling.repoinit.parser.RepoInitParser; +import org.apache.sling.repoinit.parser.RepoInitParsingException; import org.apache.sling.repoinit.parser.operations.Operation; import org.apache.sling.repoinit.parser.operations.OperationVisitor; -import org.apache.sling.api.request.ResponseUtil; -import org.apache.sling.jcr.api.SlingRepository; import org.osgi.framework.Constants; @Component @@ -81,7 +81,7 @@ public class OakAclDefConsolePlugin extends HttpServlet { private SlingRepository repository; @Reference - private AclDefinitionsParser parser; + private RepoInitParser parser; private String thisPath(HttpServletRequest request) { return request.getContextPath() + request.getServletPath() + request.getPathInfo(); @@ -160,7 +160,7 @@ public class OakAclDefConsolePlugin extends HttpServlet { } } - private void setAcl(String aclDef) throws RepositoryException, IOException, AclParsingException { + private void setAcl(String aclDef) throws RepositoryException, IOException, RepoInitParsingException { final Reader r = new StringReader(aclDef); Session s = null; try { diff --git a/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java b/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java index 5634a21..0055d83 100644 --- a/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java +++ b/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java @@ -26,7 +26,7 @@ import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.sling.repoinit.parser.AclParsingException; +import org.apache.sling.repoinit.parser.RepoInitParsingException; 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 RepositoryException, AclParsingException { + public void setup() throws RepositoryException, RepoInitParsingException { U = new TestUtil(context); U.parseAndExecute("create service user " + U.username); s = U.loginService(U.username); } @After - public void cleanup() throws RepositoryException, AclParsingException { + public void cleanup() throws RepositoryException, RepoInitParsingException { U.cleanupUser(); s.logout(); } diff --git a/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java b/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java index 9e20ea0..bb727b0 100644 --- a/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java +++ b/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java @@ -23,7 +23,7 @@ import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.sling.repoinit.parser.AclParsingException; +import org.apache.sling.repoinit.parser.RepoInitParsingException; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.junit.After; @@ -41,14 +41,14 @@ public class NonExistentPathTest { private Session s; @Before - public void setup() throws RepositoryException, AclParsingException { + public void setup() throws RepositoryException, RepoInitParsingException { U = new TestUtil(context); U.parseAndExecute("create service user " + U.username); s = U.loginService(U.username); } @After - public void cleanup() throws RepositoryException, AclParsingException { + public void cleanup() throws RepositoryException, RepoInitParsingException { U.cleanupUser(); s.logout(); } diff --git a/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java b/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java index 5c68f3f..0a0681e 100644 --- a/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java +++ b/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java @@ -32,8 +32,8 @@ 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.repoinit.jcr.impl.ServiceUserUtil; -import org.apache.sling.repoinit.parser.AclParsingException; -import org.apache.sling.repoinit.parser.impl.ACLDefinitionsParserService; +import org.apache.sling.repoinit.parser.RepoInitParsingException; +import org.apache.sling.repoinit.parser.impl.RepoInitParserService; import org.apache.sling.repoinit.parser.operations.Operation; import org.apache.sling.testing.mock.sling.junit.SlingContext; @@ -50,10 +50,10 @@ class TestUtil { username = "user_" + id; } - List<Operation> parse(String input) throws AclParsingException { + List<Operation> parse(String input) throws RepoInitParsingException { final Reader r = new StringReader(input); try { - return new ACLDefinitionsParserService().parse(r); + return new RepoInitParserService().parse(r); } finally { IOUtils.closeQuietly(r); } @@ -70,7 +70,7 @@ class TestUtil { } } - void parseAndExecute(String input) throws RepositoryException, AclParsingException { + void parseAndExecute(String input) throws RepositoryException, RepoInitParsingException { final AclOperationVisitor v = new AclOperationVisitor(adminSession); for(Operation o : parse(input)) { o.accept(v); @@ -78,7 +78,7 @@ class TestUtil { adminSession.save(); } - void cleanupUser() throws RepositoryException, AclParsingException { + void cleanupUser() throws RepositoryException, RepoInitParsingException { parseAndExecute("delete service user " + username); assertServiceUser("in cleanupUser()", username, false); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
