You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/03/15 09:00:24 UTC

svn commit: r1735035 - in /sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot: docs/ users/ users/slingshot1/ users/slingshot1/content/ users/slingshot1/travel/ users/slingshot1/travel/home/ users/slingshot1/travel/home/images...

Author: cziegeler
Date: Tue Mar 15 08:00:24 2016
New Revision: 1735035

URL: http://svn.apache.org/viewvc?rev=1735035&view=rev
Log:
Rework sample app and update UI

Added:
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/docs/content-model2.html   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel.json   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home.json   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home/images/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home/images/home.jpg   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/info.json   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet.json   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet/images/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet/images/pet.jpg   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea.json   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea/images/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea/images/see.jpg   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view.json   (with props)
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view/images/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view/images/view.jpg   (with props)
Removed:
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/content/
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/content.json
Modified:
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/info.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/profile.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/strange.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/underwater.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/welcome.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/flight.json
    sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/landing.json

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/docs/content-model2.html
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/docs/content-model2.html?rev=1735035&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/docs/content-model2.html (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/docs/content-model2.html Tue Mar 15 08:00:24 2016
@@ -0,0 +1,64 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<html>
+    <head>
+        <title>Slingshot Content Model</title>
+    </head>
+    <body>
+        <p>
+            Draft description of the Slingshot content model.
+        </p>
+        <ul>
+            <li>/slingshot</li>
+            <li><ul>
+                <li>/users</li>
+                <li><ul>
+                    <li>&lt;username&gt;</li>
+                    <li><ul>
+                        <li>content</li>
+                        <li><ul>
+                            <li>&lt;stream&gt;</li>
+                            <li><ul>
+                                <li>&lt;item&gt;</li>
+                                <li><ul>
+                                    <li>images</li>
+                                </ul></li>
+                            </ul></li>
+                        </ul></li>
+                        <li>info</li>
+                        <li>profile</li>
+                        <li>ugc</li>
+                        <li><ul>
+                            <li>&lt;stream&gt;</li>
+                            <li><ul>
+                                <li>&lt;item&gt;</li>
+                                <li><ul>
+                                    <li>ratings</li>
+                                </ul></li>
+                                <li><ul>
+                                    <li>comments</li>
+                                </ul></li>
+                            </ul></li>
+                        </ul></li>
+                    </ul></li>
+                </ul></li>
+            </ul></li>
+        </ul>
+    </body>
+</html>
\ No newline at end of file

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/docs/content-model2.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/docs/content-model2.html
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1.json Tue Mar 15 08:00:24 2016
@@ -1,5 +1,5 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/User",
     "description":"This is the user space of slingshot1!",
     "title":"Welcome to my World"

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/info.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/info.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/info.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/info.json Tue Mar 15 08:00:24 2016
@@ -1,3 +1,4 @@
 {
-    "jcr:primaryType":"sling:Folder"
+    "jcr:primaryType":"sling:Folder",
+    "sling:resourceType":"slingshot/Userinfo"
 }
\ No newline at end of file

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/profile.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/profile.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/profile.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/profile.json Tue Mar 15 08:00:24 2016
@@ -1,3 +1,4 @@
 {
-    "jcr:primaryType":"sling:Folder"
+    "jcr:primaryType":"sling:Folder",
+    "sling:resourceType":"slingshot/Userprofile"
 }
\ No newline at end of file

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel.json?rev=1735035&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel.json Tue Mar 15 08:00:24 2016
@@ -0,0 +1,6 @@
+{
+    "jcr:primaryType":"sling:Folder",
+    "sling:resourceType":"slingshot/Category",
+    "title":"Travel",
+    "description":"Stuff related to travel."
+}
\ No newline at end of file

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel.json
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel.json
------------------------------------------------------------------------------
    svn:keywords = Id

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home.json?rev=1735035&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home.json Tue Mar 15 08:00:24 2016
@@ -0,0 +1,6 @@
+{
+    "jcr:primaryType":"sling:Folder",
+    "sling:resourceType":"slingshot/Item",
+    "title":"Home Sweet Home",
+    "description":"This is the place where I live..."
+}
\ No newline at end of file

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home.json
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home.json
------------------------------------------------------------------------------
    svn:keywords = Id

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home/images/home.jpg
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home/images/home.jpg?rev=1735035&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/home/images/home.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/info.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/info.json?rev=1735035&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/info.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/info.json Tue Mar 15 08:00:24 2016
@@ -0,0 +1,6 @@
+{
+    "jcr:primaryType":"sling:Folder",
+    "sling:resourceType":"slingshot/Streaminfo",
+    "title":"Travel",
+    "description":"Stuff related to travel."
+}
\ No newline at end of file

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/info.json
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/info.json
------------------------------------------------------------------------------
    svn:keywords = Id

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet.json?rev=1735035&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet.json Tue Mar 15 08:00:24 2016
@@ -0,0 +1,6 @@
+{
+    "jcr:primaryType":"sling:Folder",
+    "sling:resourceType":"slingshot/Item",
+    "title":"My Pet",
+    "description":"Always hungry...but never gets fat"
+}

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet.json
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet.json
------------------------------------------------------------------------------
    svn:keywords = Id

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet/images/pet.jpg
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet/images/pet.jpg?rev=1735035&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/pet/images/pet.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea.json?rev=1735035&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea.json Tue Mar 15 08:00:24 2016
@@ -0,0 +1,6 @@
+{
+    "jcr:primaryType":"sling:Folder",
+    "sling:resourceType":"slingshot/Item",
+    "title":"The Sea",
+    "description":"You can see my boat in the distance"
+}
\ No newline at end of file

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea.json
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea.json
------------------------------------------------------------------------------
    svn:keywords = Id

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea/images/see.jpg
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea/images/see.jpg?rev=1735035&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/sea/images/see.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view.json?rev=1735035&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view.json (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view.json Tue Mar 15 08:00:24 2016
@@ -0,0 +1,6 @@
+{
+    "jcr:primaryType":"sling:Folder",
+    "sling:resourceType":"slingshot/Item",
+    "title":"Nice View",
+    "description":"A view from the top of my home"
+}
\ No newline at end of file

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view.json
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view.json
------------------------------------------------------------------------------
    svn:keywords = Id

Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view/images/view.jpg
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view/images/view.jpg?rev=1735035&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot1/travel/view/images/view.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2.json Tue Mar 15 08:00:24 2016
@@ -1,5 +1,5 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/User",
     "description":"This is the user space of slingshot2!",
     "title":"The Truth Is Out There"

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens.json Tue Mar 15 08:00:24 2016
@@ -1,5 +1,5 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/Category",
     "title":"Aliens",
     "description":"Strange creatures from outer space."

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/strange.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/strange.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/strange.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/strange.json Tue Mar 15 08:00:24 2016
@@ -1,15 +1,15 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/Item",
     "title":"Strange",
     "description":"This guy looks really strange...",
     
     comments : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Comments"
     },
     ratings : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Ratings"
     }
 }
\ No newline at end of file

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/underwater.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/underwater.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/underwater.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/underwater.json Tue Mar 15 08:00:24 2016
@@ -1,15 +1,15 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/Item",
     "title":"Underwater",
     "description":"Surprise down under...",
     
     comments : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Comments"
     },
     ratings : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Ratings"
     }
 }
\ No newline at end of file

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/welcome.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/welcome.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/welcome.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/aliens/welcome.json Tue Mar 15 08:00:24 2016
@@ -1,15 +1,15 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/Item",
     "title":"Welcome",
     "description":"This guy looks charming",
     
     comments : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Comments"
     },
     ratings : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Ratings"
     }
 }
\ No newline at end of file

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places.json Tue Mar 15 08:00:24 2016
@@ -1,5 +1,5 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/Category",
     "title":"Places",
     "description":"Mysterious places around the globe."

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/flight.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/flight.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/flight.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/flight.json Tue Mar 15 08:00:24 2016
@@ -1,15 +1,15 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/Item",
     "title":"Flight Route",
     "description":"Looks different from above...",
     
     comments : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Comments"
     },
     ratings : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Ratings"
     }
 }
\ No newline at end of file

Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/landing.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/landing.json?rev=1735035&r1=1735034&r2=1735035&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/landing.json (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/users/slingshot2/places/landing.json Tue Mar 15 08:00:24 2016
@@ -1,15 +1,15 @@
 {
-    "jcr:primaryType":"sling:OrderedFolder",
+    "jcr:primaryType":"sling:Folder",
     "sling:resourceType":"slingshot/Item",
     "title":"Landing Place",
     "description":"Something happened here long time ago!",
     
     comments : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Comments"
     },
     ratings : {
-      "jcr:primaryType":"sling:OrderedFolder",
+      "jcr:primaryType":"sling:Folder",
       "sling:resourceType":"slingshot/Ratings"
     }
 }
\ No newline at end of file