This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.fsresource-2.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git
commit 9f5cdf6a4eb0773f67c73d640a8740b1138e0e50 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Mar 14 10:44:14 2017 +0000 SLING-6440 switch to latest jcr/contentparser API git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource@1786872 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- .../fsprovider/internal/parser/ContentFileParserUtil.java | 12 ++++++------ .../sling/fsprovider/internal/parser/ContentFileTypes.java | 6 +++--- .../apache/sling/fsprovider/internal/JsonContentTest.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index f7f45c8..efb1f26 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ <Embed-Dependency> johnzon-core;scope=compile;inline=false, geronimo-json_1.0_spec;scope=compile;inline=false, - org.apache.sling.commons.fscontentparser;scope=compile;inline=false + org.apache.sling.jcr.contentparser;scope=compile;inline=false </Embed-Dependency> </instructions> </configuration> @@ -145,7 +145,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/fsprovider/internal/parser/ContentFileParserUtil.java b/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java index 6ac72c5..ff83c00 100644 --- a/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java +++ b/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java @@ -26,9 +26,9 @@ import java.io.File; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.apache.sling.fscontentparser.ContentFileParser; -import org.apache.sling.fscontentparser.ContentFileParserFactory; -import org.apache.sling.fscontentparser.ContentFileType; +import org.apache.sling.jcr.contentparser.ContentParser; +import org.apache.sling.jcr.contentparser.ContentParserFactory; +import org.apache.sling.jcr.contentparser.ContentType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,19 +39,19 @@ class ContentFileParserUtil { private static final Logger log = LoggerFactory.getLogger(ContentFileParserUtil.class); - private static final ContentFileParser JSON_PARSER; + private static final ContentParser JSON_PARSER; static { // workaround for JsonProvider classloader issue until https://issues.apache.org/jira/browse/GERONIMO-6560 is fixed ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader(ContentFileParserUtil.class.getClassLoader()); - JSON_PARSER = ContentFileParserFactory.create(ContentFileType.JSON); + JSON_PARSER = ContentParserFactory.create(ContentType.JSON); } finally { Thread.currentThread().setContextClassLoader(oldClassLoader); } } - private static final ContentFileParser JCR_XML_PARSER = ContentFileParserFactory.create(ContentFileType.JCR_XML); + private static final ContentParser JCR_XML_PARSER = ContentParserFactory.create(ContentType.JCR_XML); private ContentFileParserUtil() { // static methods only diff --git a/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java b/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java index f3e2c22..8e6a9be 100644 --- a/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java +++ b/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java @@ -18,7 +18,7 @@ */ package org.apache.sling.fsprovider.internal.parser; -import org.apache.sling.fscontentparser.ContentFileType; +import org.apache.sling.jcr.contentparser.ContentType; /** * Content file types. @@ -28,12 +28,12 @@ public final class ContentFileTypes { /** * JSON content files. */ - public static final String JSON_SUFFIX = "." + ContentFileType.JSON.getExtension(); + public static final String JSON_SUFFIX = "." + ContentType.JSON.getExtension(); /** * JCR XML content files. */ - public static final String JCR_XML_SUFFIX = "." + ContentFileType.JCR_XML.getExtension(); + public static final String JCR_XML_SUFFIX = "." + ContentType.JCR_XML.getExtension(); private ContentFileTypes() { // static methods only diff --git a/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java b/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java index 32fa3ca..50150c7 100644 --- a/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java +++ b/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java @@ -43,9 +43,9 @@ import javax.jcr.nodetype.NodeType; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.fscontentparser.ParserOptions; import org.apache.sling.fsprovider.internal.TestUtils.RegisterFsResourcePlugin; import org.apache.sling.hamcrest.ResourceMatchers; +import org.apache.sling.jcr.contentparser.ParserOptions; import org.apache.sling.testing.mock.sling.ResourceResolverType; import org.apache.sling.testing.mock.sling.junit.SlingContext; import org.apache.sling.testing.mock.sling.junit.SlingContextBuilder; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
