sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r646706 - /incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java
Date Thu, 10 Apr 2008 09:18:25 GMT
Author: fmeschbe
Date: Thu Apr 10 02:18:17 2008
New Revision: 646706

URL: http://svn.apache.org/viewvc?rev=646706&view=rev
Log:
SLING-266 - Remove support for the .xjson content file extension

Modified:
    incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java

Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java?rev=646706&r1=646705&r2=646706&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java
(original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/loader/Loader.java
Thu Apr 10 02:18:17 2008
@@ -63,8 +63,6 @@
 
     public static final String EXT_JSON = ".json";
 
-    public static final String EXT_XJSON = ".xjson";
-
     public static final String ROOT_DESCRIPTOR = "/ROOT";
 
     // default content type for createFile()
@@ -90,7 +88,6 @@
         importProviders = new LinkedHashMap<String, ImportProvider>();
         importProviders.put(EXT_JCR_XML, null);
         importProviders.put(EXT_JSON, JsonReader.PROVIDER);
-        importProviders.put(EXT_XJSON, JsonReader.PROVIDER);
         importProviders.put(EXT_XML, XmlReader.PROVIDER);
     }
 
@@ -255,8 +252,7 @@
                 }
 
                 // install if it is a descriptor
-                if (entry.endsWith(EXT_XML) || entry.endsWith(EXT_JSON)
-                    || entry.endsWith(EXT_XJSON)) {
+                if (entry.endsWith(EXT_XML) || entry.endsWith(EXT_JSON)) {
                     if (this.createNode(parent, this.getName(entry), file) != null) {
                         ignoreEntry.add(file);
                         continue;
@@ -683,8 +679,6 @@
             diff = EXT_XML.length();
         } else if (name.endsWith(EXT_JSON)) {
             diff = EXT_JSON.length();
-        } else if (name.endsWith(EXT_XJSON)) {
-            diff = EXT_XJSON.length();
         } else {
             return name;
         }



Mime
View raw message