You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/03/14 10:44:18 UTC
svn commit: r1786873 - in /sling/branches/fsresource-1.x: ./
src/main/java/org/apache/sling/fsprovider/internal/parser/
src/test/java/org/apache/sling/fsprovider/internal/
Author: sseifert
Date: Tue Mar 14 10:44:18 2017
New Revision: 1786873
URL: http://svn.apache.org/viewvc?rev=1786873&view=rev
Log:
SLING-6440 switch to latest jcr/contentparser API
Modified:
sling/branches/fsresource-1.x/pom.xml
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java
sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java
sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java
Modified: sling/branches/fsresource-1.x/pom.xml
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/pom.xml?rev=1786873&r1=1786872&r2=1786873&view=diff
==============================================================================
--- sling/branches/fsresource-1.x/pom.xml (original)
+++ sling/branches/fsresource-1.x/pom.xml Tue Mar 14 10:44:18 2017
@@ -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>
@@ -147,7 +147,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>
Modified: sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java?rev=1786873&r1=1786872&r2=1786873&view=diff
==============================================================================
--- sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java (original)
+++ sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java Tue Mar 14 10:44:18 2017
@@ -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
Modified: sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java?rev=1786873&r1=1786872&r2=1786873&view=diff
==============================================================================
--- sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java (original)
+++ sling/branches/fsresource-1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java Tue Mar 14 10:44:18 2017
@@ -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
Modified: sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java?rev=1786873&r1=1786872&r2=1786873&view=diff
==============================================================================
--- sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java (original)
+++ sling/branches/fsresource-1.x/src/test/java/org/apache/sling/fsprovider/internal/JsonContentTest.java Tue Mar 14 10:44:18 2017
@@ -44,9 +44,9 @@ import javax.jcr.nodetype.NodeType;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
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;