Author: bdelacretaz
Date: Fri Jan 22 18:40:32 2016
New Revision: 1726279
URL: http://svn.apache.org/viewvc?rev=1726279&view=rev
Log:
SLING-5449 - rename one more thing from ACL to 'repoinit'
Added:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/JcrRepoInitOpVisitor.java
- copied, changed from r1726268,
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
Removed:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
Modified:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
Modified:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java?rev=1726279&r1=1726278&r2=1726279&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
Fri Jan 22 18:40:32 2016
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.api.Jackrab
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.repoinit.jcr.AclOperationVisitor;
+import org.apache.sling.repoinit.jcr.JcrRepoInitOpVisitor;
import org.apache.sling.repoinit.parser.RepoInitParser;
import org.apache.sling.repoinit.parser.operations.Operation;
import org.apache.sling.repoinit.parser.operations.OperationVisitor;
@@ -76,7 +76,7 @@ public class RepoInitIT {
assertNotNull("Expecting " + REPO_INIT_FILE, is);
try {
final RepoInitParser parser =
teleporter.getService(RepoInitParser.class);
- final OperationVisitor v = new AclOperationVisitor(session);
+ final OperationVisitor v = new JcrRepoInitOpVisitor(session);
for(Operation op : parser.parse(new InputStreamReader(is,
"UTF-8"))) {
op.accept(v);
}
Copied:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/JcrRepoInitOpVisitor.java
(from r1726268,
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/JcrRepoInitOpVisitor.java?p2=sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/JcrRepoInitOpVisitor.java&p1=sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java&r1=1726268&r2=1726279&rev=1726279&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/AclOperationVisitor.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/JcrRepoInitOpVisitor.java
Fri Jan 22 18:40:32 2016
@@ -35,11 +35,8 @@ import org.apache.sling.repoinit.parser.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/** Processes the Operations produced by the ACL
- * definitions parser to create the users and
- * set the ACLs defined by the parser input.
- */
-public class AclOperationVisitor implements OperationVisitor {
+/** JCR visitor for the Operations produced by the repoinit parser */
+public class JcrRepoInitOpVisitor implements OperationVisitor {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -49,7 +46,7 @@ public class AclOperationVisitor impleme
* @param s must have sufficient rights to create users
* and set ACLs.
*/
- public AclOperationVisitor(Session s) {
+ public JcrRepoInitOpVisitor(Session s) {
session = s;
}
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java?rev=1726279&r1=1726278&r2=1726279&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/main/java/org/apache/sling/repoinit/jcr/webconsole/OakAclDefConsolePlugin.java
Fri Jan 22 18:40:32 2016
@@ -42,7 +42,7 @@ import org.apache.felix.scr.annotations.
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.jcr.JcrRepoInitOpVisitor;
import org.apache.sling.repoinit.parser.RepoInitParser;
import org.apache.sling.repoinit.parser.RepoInitParsingException;
import org.apache.sling.repoinit.parser.operations.Operation;
@@ -165,7 +165,7 @@ public class OakAclDefConsolePlugin exte
Session s = null;
try {
s = repository.loginAdministrative(null);
- final OperationVisitor v = new AclOperationVisitor(s);
+ final OperationVisitor v = new JcrRepoInitOpVisitor(s);
for(Operation op : parser.parse(r)) {
op.accept(v);
}
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java?rev=1726279&r1=1726278&r2=1726279&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
Fri Jan 22 18:40:32 2016
@@ -71,7 +71,7 @@ class TestUtil {
}
void parseAndExecute(String input) throws RepositoryException,
RepoInitParsingException {
- final AclOperationVisitor v = new AclOperationVisitor(adminSession);
+ final JcrRepoInitOpVisitor v = new JcrRepoInitOpVisitor(adminSession);
for(Operation o : parse(input)) {
o.accept(v);
}
