svn commit: r1785203 - in /sling/branches/fsresource-1.1.x: pom.xml src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java

[ss...@apache.org]

Author: sseifert
Date: Thu Mar  2 22:00:47 2017
New Revision: 1785203

URL: http://svn.apache.org/viewvc?rev=1785203&view=rev
Log:
SLING-6440 update to latest API

Modified:
    sling/branches/fsresource-1.1.x/pom.xml
    sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java
    sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java

Modified: sling/branches/fsresource-1.1.x/pom.xml
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.1.x/pom.xml?rev=1785203&r1=1785202&r2=1785203&view=diff
==============================================================================
--- sling/branches/fsresource-1.1.x/pom.xml (original)
+++ sling/branches/fsresource-1.1.x/pom.xml Thu Mar  2 22:00:47 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.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>

Modified: sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java?rev=1785203&r1=1785202&r2=1785203&view=diff
==============================================================================
--- sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java (original)
+++ sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileParserUtil.java Thu Mar  2 22:00:47 2017
@@ -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

Modified: sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java
URL: http://svn.apache.org/viewvc/sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java?rev=1785203&r1=1785202&r2=1785203&view=diff
==============================================================================
--- sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java (original)
+++ sling/branches/fsresource-1.1.x/src/main/java/org/apache/sling/fsprovider/internal/parser/ContentFileTypes.java Thu Mar  2 22:00:47 2017
@@ -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