This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-2.2.10 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 38d4dc6890233a967e4628c306566cc1c116397c Author: Stefan Seifert <[email protected]> AuthorDate: Tue Mar 14 10:42:37 2017 +0000 SLING-6595 sling-mock: Use File System Content Parser for parsing JSON files git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1786870 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- .../sling/testing/mock/sling/loader/ContentLoader.java | 12 ++++++------ .../testing/mock/sling/NodeTypeDefinitionScannerTest.java | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index afa5eb8..6c89a0c 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ </dependency> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.fscontentparser</artifactId> + <artifactId>org.apache.sling.jcr.contentparser</artifactId> <version>1.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> diff --git a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java b/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java index 68740ce..73120f9 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java @@ -33,11 +33,11 @@ import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.commons.mime.MimeTypeService; -import org.apache.sling.fscontentparser.ContentFileParser; -import org.apache.sling.fscontentparser.ContentFileParserFactory; -import org.apache.sling.fscontentparser.ContentFileType; -import org.apache.sling.fscontentparser.ParseException; -import org.apache.sling.fscontentparser.ParserOptions; +import org.apache.sling.jcr.contentparser.ContentParser; +import org.apache.sling.jcr.contentparser.ContentParserFactory; +import org.apache.sling.jcr.contentparser.ContentType; +import org.apache.sling.jcr.contentparser.ParseException; +import org.apache.sling.jcr.contentparser.ParserOptions; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -65,7 +65,7 @@ public final class ContentLoader { "jcr:isCheckedOut", "rep:policy"); - private static ContentFileParser JSON_PARSER = ContentFileParserFactory.create(ContentFileType.JSON, new ParserOptions() + private static ContentParser JSON_PARSER = ContentParserFactory.create(ContentType.JSON, new ParserOptions() .detectCalendarValues(true) .ignorePropertyNames(IGNORED_NAMES) .ignoreResourceNames(IGNORED_NAMES)); diff --git a/src/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java b/src/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java index 1b1f888..032129b 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/NodeTypeDefinitionScannerTest.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import org.apache.sling.testing.mock.sling.NodeTypeDefinitionScanner; import org.junit.Test; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
