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:58:01 UTC
[sling-org-apache-sling-repoinit-parser] 12/22: SLING-5449 - rename
the remaining things from ACL to 'repoinit'
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.repoinit.parser-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-parser.git
commit 927bc9e9f58ab4a7336d2a0f6f63e99d461d563f
Author: Bertrand Delacretaz <bd...@apache.org>
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/parser@1726273 13f79535-47bb-0310-9956-ffa450edef68
---
.../{AclDefinitionsParser.java => RepoInitParser.java} | 4 ++--
...ParsingException.java => RepoInitParsingException.java} | 4 ++--
...itionsParserService.java => RepoInitParserService.java} | 14 +++++++-------
.../javacc/{ACLDefinitions.jjt => RepoInitGrammar.jjt} | 9 +++++----
.../sling/repoinit/parser/test/ParserServiceTest.java | 14 +++++++-------
.../org/apache/sling/repoinit/parser/test/ParserTest.java | 4 ++--
.../sling/repoinit/parser/test/ParsingErrorsTest.java | 4 ++--
7 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java b/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java
similarity index 92%
rename from src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
rename to src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java
index a2c50c0..8fe70eb 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/AclDefinitionsParser.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java
@@ -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;
}
diff --git a/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java b/src/main/java/org/apache/sling/repoinit/parser/RepoInitParsingException.java
similarity index 88%
rename from src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
rename to src/main/java/org/apache/sling/repoinit/parser/RepoInitParsingException.java
index 13325be..fa40e52 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/AclParsingException.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/RepoInitParsingException.java
@@ -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);
}
}
diff --git a/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java b/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
similarity index 75%
rename from src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
rename to src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
index 5315b65..d599f55 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/impl/ACLDefinitionsParserService.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java
@@ -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();
diff --git a/src/main/javacc/ACLDefinitions.jjt b/src/main/javacc/RepoInitGrammar.jjt
similarity index 96%
rename from src/main/javacc/ACLDefinitions.jjt
rename to src/main/javacc/RepoInitGrammar.jjt
index d539f28..60e84d8 100644
--- a/src/main/javacc/ACLDefinitions.jjt
+++ b/src/main/javacc/RepoInitGrammar.jjt
@@ -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.operations.*;
* limitations under the License.
*/
-public class ACLDefinitionsParserImpl
+public class RepoInitParserImpl
{
}
-PARSER_END(ACLDefinitionsParserImpl)
+PARSER_END(RepoInitParserImpl)
SKIP :
{
diff --git a/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java b/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
index 6a45986..41a0495 100644
--- a/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
+++ b/src/test/java/org/apache/sling/repoinit/parser/test/ParserServiceTest.java
@@ -20,20 +20,20 @@ package org.apache.sling.repoinit.parser.test;
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);
}
}
diff --git a/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java b/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
index 8a096e7..8c75643 100644
--- a/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
+++ b/src/test/java/org/apache/sling/repoinit/parser/test/ParserTest.java
@@ -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);
}
diff --git a/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java b/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
index 1a7d3cb..fb46eef 100644
--- a/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
+++ b/src/test/java/org/apache/sling/repoinit/parser/test/ParsingErrorsTest.java
@@ -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 + "]");
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.