[sling-org-apache-sling-fsresource] 05/23: SLING-6440 update to latest API

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.fsresource-1.3.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-fsresource.git

commit aa2eeccb57f237f25eb037dc0a852fa770cb3601
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Mar 2 22:00:47 2017 +0000

    SLING-6440 update to latest API
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/fsresource-1.1.x@1785203 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                             | 4 ++--
 .../sling/fsprovider/internal/parser/ContentFileParserUtil.java     | 6 +++---
 .../apache/sling/fsprovider/internal/parser/ContentFileTypes.java   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5db693f..0db714b 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.fscontentparser;scope=compile;inline=false
+                            org.apache.sling.commons.fscontentparser;scope=compile;inline=false
                         </Embed-Dependency>
                     </instructions>
                 </configuration>
@@ -141,7 +141,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.fscontentparser</artifactId>
+            <artifactId>org.apache.sling.commons.fscontentparser</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 ec9af59..4b46157 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
@@ -25,9 +25,9 @@ import java.io.File;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.fscontentparser.ContentFileExtension;
 import org.apache.sling.fscontentparser.ContentFileParser;
 import org.apache.sling.fscontentparser.ContentFileParserFactory;
+import org.apache.sling.fscontentparser.ContentFileType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,13 +44,13 @@ class ContentFileParserUtil {
         ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(ContentFileParserUtil.class.getClassLoader());
-            JSON_PARSER = ContentFileParserFactory.create(ContentFileExtension.JSON);
+            JSON_PARSER = ContentFileParserFactory.create(ContentFileType.JSON);
         }
         finally {
             Thread.currentThread().setContextClassLoader(oldClassLoader);
         }
     }
-    private static final ContentFileParser JCR_XML_PARSER = ContentFileParserFactory.create(ContentFileExtension.JCR_XML);
+    private static final ContentFileParser JCR_XML_PARSER = ContentFileParserFactory.create(ContentFileType.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 689654d..f3e2c22 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.ContentFileExtension;
+import org.apache.sling.fscontentparser.ContentFileType;
 
 /**
  * Content file types.
@@ -28,12 +28,12 @@ public final class ContentFileTypes {
     /**
      * JSON content files.
      */
-    public static final String JSON_SUFFIX = "." + ContentFileExtension.JSON;
+    public static final String JSON_SUFFIX = "." + ContentFileType.JSON.getExtension();
 
     /**
      * JCR XML content files.
      */
-    public static final String JCR_XML_SUFFIX = "." + ContentFileExtension.JCR_XML;
+    public static final String JCR_XML_SUFFIX = "." + ContentFileType.JCR_XML.getExtension();
         
     private ContentFileTypes() {
         // static methods only

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.