Author: bdelacretaz
Date: Fri Jan 22 18:33:42 2016
New Revision: 1726273
URL: http://svn.apache.org/viewvc?rev=1726273&view=rev
Log:
SLING-5449 - rename the remaining things from ACL to 'repoinit'
Added:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
- copied, changed from r1726268,
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java
- copied, changed from r1726259,
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParsingException.java
- copied, changed from r1726259,
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
- copied, changed from r1726259,
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/RepoInitGrammar.jjt
- copied, changed from r1726259,
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt
Removed:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt
Modified:
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/GeneralAclTest.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/TestUtil.java
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
Copied:
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
(from r1726268,
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java?p2=sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java&p1=sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java&r1=1726268&r2=1726273&rev=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/ProvisionedAclIT.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/it/src/test/java/org/apache/sling/repoinit/it/RepoInitIT.java
Fri Jan 22 18:33:42 2016
@@ -22,8 +22,6 @@ import static org.junit.Assert.assertTru
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.Dictionary;
-import java.util.Hashtable;
import java.util.UUID;
import javax.jcr.AccessDeniedException;
@@ -39,18 +37,16 @@ import org.apache.jackrabbit.api.securit
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.parser.AclDefinitionsParser;
+import org.apache.sling.repoinit.parser.RepoInitParser;
import org.apache.sling.repoinit.parser.operations.Operation;
import org.apache.sling.repoinit.parser.operations.OperationVisitor;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
/** Test service users and ACLs set from a text file. */
-public class ProvisionedAclIT {
+public class RepoInitIT {
private Session session;
private static final String FRED_WILMA = "fredWilmaService";
@@ -65,7 +61,7 @@ public class ProvisionedAclIT {
@Before
public void setup() throws Exception {
- WaitFor.services(teleporter, SlingRepository.class,
AclDefinitionsParser.class);
+ WaitFor.services(teleporter, SlingRepository.class,
RepoInitParser.class);
session =
teleporter.getService(SlingRepository.class).loginAdministrative(null);
// TODO this should be done by the repoinit language
@@ -79,7 +75,7 @@ public class ProvisionedAclIT {
final InputStream is = getClass().getResourceAsStream(REPO_INIT_FILE);
assertNotNull("Expecting " + REPO_INIT_FILE, is);
try {
- final AclDefinitionsParser parser =
teleporter.getService(AclDefinitionsParser.class);
+ final RepoInitParser parser =
teleporter.getService(RepoInitParser.class);
final OperationVisitor v = new AclOperationVisitor(session);
for(Operation op : parser.parse(new InputStreamReader(is,
"UTF-8"))) {
op.accept(v);
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=1726273&r1=1726272&r2=1726273&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:33:42 2016
@@ -40,13 +40,13 @@ import org.apache.felix.scr.annotations.
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 exte
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 exte
}
}
- 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 {
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java?rev=1726273&r1=1726272&r2=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/GeneralAclTest.java
Fri Jan 22 18:33:42 2016
@@ -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();
}
Modified:
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java?rev=1726273&r1=1726272&r2=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/oak-jcr/src/test/java/org/apache/sling/repoinit/jcr/NonExistentPathTest.java
Fri Jan 22 18:33:42 2016
@@ -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();
}
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=1726273&r1=1726272&r2=1726273&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:33:42 2016
@@ -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);
}
Copied:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java
(from r1726259,
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java?p2=sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java&p1=sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java&r1=1726259&r2=1726273&rev=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java
Fri Jan 22 18:33:42 2016
@@ -24,11 +24,11 @@ import java.util.List;
import org.apache.sling.repoinit.parser.operations.Operation;
/** ACL definitions parser service interface */
-public interface AclDefinitionsParser {
+public interface RepoInitParser {
/** Parse the supplied input.
* @param r Input in ACL definitions format. The reader is closed
* by this method.
* @throws AclParsingException on parsing errors
*/
- List<Operation> parse(Reader r) throws AclParsingException;
+ List<Operation> parse(Reader r) throws RepoInitParsingException;
}
Copied:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParsingException.java
(from r1726259,
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParsingException.java?p2=sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParsingException.java&p1=sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java&r1=1726259&r2=1726273&rev=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/RepoInitParsingException.java
Fri Jan 22 18:33:42 2016
@@ -18,10 +18,10 @@
*/
package org.apache.sling.repoinit.parser;
-public class AclParsingException extends Exception {
+public class RepoInitParsingException extends Exception {
private static final long serialVersionUID = 1L;
- public AclParsingException(String reason, Throwable cause) {
+ public RepoInitParsingException(String reason, Throwable cause) {
super(reason, cause);
}
}
Copied:
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
(from r1726259,
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java?p2=sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java&p1=sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java&r1=1726259&r2=1726273&rev=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
Fri Jan 22 18:33:42 2016
@@ -24,21 +24,21 @@ import java.util.List;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
-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;
/** ACL definitions parser service */
@Component
-@Service(value=AclDefinitionsParser.class)
-public class ACLDefinitionsParserService implements AclDefinitionsParser {
+@Service(value=RepoInitParser.class)
+public class RepoInitParserService implements RepoInitParser {
@Override
- public List<Operation> parse(Reader r) throws AclParsingException {
+ public List<Operation> parse(Reader r) throws RepoInitParsingException {
try {
- return new ACLDefinitionsParserImpl(r).parse();
+ return new RepoInitParserImpl(r).parse();
} catch (ParseException pe) {
- throw new AclParsingException(pe.getMessage(), pe);
+ throw new RepoInitParsingException(pe.getMessage(), pe);
} finally {
try {
r.close();
Copied:
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/RepoInitGrammar.jjt
(from r1726259,
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt)
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/RepoInitGrammar.jjt?p2=sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/RepoInitGrammar.jjt&p1=sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt&r1=1726259&r2=1726273&rev=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/ACLDefinitions.jjt
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/main/javacc/RepoInitGrammar.jjt
Fri Jan 22 18:33:42 2016
@@ -1,4 +1,5 @@
-/* JavaCC grammar for the SLING-5355 ACL definitions language
+/* JavaCC grammar for the SLING-5449 content repository
+ * initialization language
* See https://javacc.java.net/doc/docindex.html for the JavaCC docs
*/
@@ -8,7 +9,7 @@ options
STATIC=false;
}
-PARSER_BEGIN(ACLDefinitionsParserImpl)
+PARSER_BEGIN(RepoInitParserImpl)
package org.apache.sling.repoinit.parser.impl;
@@ -34,10 +35,10 @@ import org.apache.sling.repoinit.parser.
* limitations under the License.
*/
-public class ACLDefinitionsParserImpl
+public class RepoInitParserImpl
{
}
-PARSER_END(ACLDefinitionsParserImpl)
+PARSER_END(RepoInitParserImpl)
SKIP :
{
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java?rev=1726273&r1=1726272&r2=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
Fri Jan 22 18:33:42 2016
@@ -20,20 +20,20 @@ package org.apache.sling.repoinit.parser
import java.io.Reader;
import java.io.StringReader;
-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.junit.Test;
public class ParserServiceTest {
@Test
- public void noErrors() throws AclParsingException {
+ public void noErrors() throws RepoInitParsingException {
final Reader r = new StringReader("create service user foo");
- new ACLDefinitionsParserService().parse(r);
+ new RepoInitParserService().parse(r);
}
- @Test(expected = AclParsingException.class)
- public void syntaxError() throws AclParsingException {
+ @Test(expected = RepoInitParsingException.class)
+ public void syntaxError() throws RepoInitParsingException {
final Reader r = new StringReader("not a valid statement");
- new ACLDefinitionsParserService().parse(r);
+ new RepoInitParserService().parse(r);
}
}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java?rev=1726273&r1=1726272&r2=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
Fri Jan 22 18:33:42 2016
@@ -28,8 +28,8 @@ import java.util.Collection;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.repoinit.parser.impl.ACLDefinitionsParserImpl;
import org.apache.sling.repoinit.parser.impl.ParseException;
+import org.apache.sling.repoinit.parser.impl.RepoInitParserImpl;
import org.apache.sling.repoinit.parser.operations.Operation;
import org.apache.sling.repoinit.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
ACLDefinitionsParserImpl(tc.input).parse();
+ final List<Operation> result = new
RepoInitParserImpl(tc.input).parse();
for(Operation o : result) {
o.accept(v);
}
Modified:
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java?rev=1726273&r1=1726272&r2=1726273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
(original)
+++
sling/trunk/contrib/extensions/repoinit/parser/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
Fri Jan 22 18:33:42 2016
@@ -26,8 +26,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.sling.repoinit.parser.impl.ACLDefinitionsParserImpl;
import org.apache.sling.repoinit.parser.impl.ParseException;
+import org.apache.sling.repoinit.parser.impl.RepoInitParserImpl;
import org.apache.sling.repoinit.parser.impl.TokenMgrError;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -74,7 +74,7 @@ public class ParsingErrorsTest {
public void checkResult() throws ParseException, IOException {
final StringReader r = new StringReader(input);
try {
- new ACLDefinitionsParserImpl(r).parse();
+ new RepoInitParserImpl(r).parse();
if(expected != null) {
fail("Expected a " + expected.getSimpleName() + " for [" +
input + "]");
}
