You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2014/11/27 13:36:25 UTC
svn commit: r930762 - in /websites/staging/sling/trunk/content: ./
documentation/bundles/content-loading-jcr-contentloader.html
Author: buildbot
Date: Thu Nov 27 12:36:25 2014
New Revision: 930762
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Nov 27 12:36:25 2014
@@ -1 +1 @@
-1642078
+1642125
Modified: websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/content-loading-jcr-contentloader.html Thu Nov 27 12:36:25 2014
@@ -311,53 +311,54 @@ primary node type "nt:file". Underneath
<h3 id="json-descriptor-files">JSON Descriptor Files</h3>
<p>Nodes, Properties and in fact complete subtrees may be described in JSON files using the following skeleton structure (see <a href="http://www.json.org">http://www.json.org</a> or information on the syntax of JSON) :</p>
<div class="codehilite"><pre><span class="p">{</span>
- <span class="o">//</span> <span class="n">optional</span> <span class="n">node</span> <span class="n">name</span> <span class="n">on</span> <span class="n">top</span> <span class="n">level</span><span class="p">,</span> <span class="n">default</span> <span class="n">is</span> <span class="n">file</span> <span class="n">name</span> <span class="n">without</span> <span class="p">.</span><span class="n">json</span> <span class="n">ext</span><span class="p">.</span>
- "<span class="n">name</span>"<span class="p">:</span> "<span class="n">nodename</span>"<span class="p">,</span>
+ <span class="o">//</span> <span class="n">child</span> <span class="n">node</span> <span class="n">name</span>
+ "<span class="n">nodename</span>" <span class="p">:</span> <span class="p">{</span>
<span class="o">//</span> <span class="n">optional</span> <span class="n">primary</span> <span class="n">node</span> <span class="n">type</span><span class="p">,</span> <span class="n">default</span> "<span class="n">nt</span><span class="p">:</span><span class="n">unstructured</span>"
- "<span class="n">primaryNodeType</span>"<span class="p">:</span> "<span class="n">sling</span><span class="p">:</span><span class="n">ScriptedComponent</span>"<span class="p">,</span>
+ "<span class="n">jcr</span><span class="p">:</span><span class="n">primaryType</span>"<span class="p">:</span> "<span class="n">sling</span><span class="p">:</span><span class="n">ScriptedComponent</span>"<span class="p">,</span>
<span class="o">//</span> <span class="n">optional</span> <span class="n">mixin</span> <span class="n">node</span> <span class="n">types</span> <span class="n">as</span> <span class="n">array</span>
- "<span class="n">mixinNodeTypes</span>"<span class="p">:</span> <span class="p">[</span> <span class="p">],</span>
+ "<span class="n">jcr</span><span class="p">:</span><span class="n">mixinTypes</span>"<span class="p">:</span> <span class="p">[</span> <span class="p">],</span>
- <span class="o">//</span> <span class="n">the</span> "<span class="k">properties</span>" <span class="n">property</span> <span class="n">is</span> <span class="n">an</span> <span class="n">object</span> <span class="n">indexed</span> <span class="n">by</span> <span class="n">property</span> <span class="n">name</span> <span class="n">whose</span>
- <span class="o">//</span> <span class="n">value</span> <span class="n">is</span> <span class="n">either</span> <span class="n">the</span> <span class="n">string</span> <span class="n">property</span> <span class="n">value</span><span class="p">,</span> <span class="n">array</span> <span class="k">for</span> <span class="n">multi</span><span class="o">-</span><span class="n">values</span> <span class="n">or</span>
- <span class="o">//</span> <span class="n">an</span> <span class="n">object</span> <span class="n">whose</span> <span class="n">value</span><span class="p">[</span><span class="n">s</span><span class="p">]</span> <span class="n">property</span> <span class="n">denotes</span> <span class="n">the</span> <span class="n">property</span> <span class="n">value</span><span class="p">(</span><span class="n">s</span><span class="p">)</span> <span class="n">and</span>
- <span class="o">//</span> <span class="n">whose</span> <span class="n">type</span> <span class="n">property</span> <span class="n">denotes</span> <span class="n">the</span> <span class="n">property</span> <span class="n">type</span>
- "<span class="k">properties</span>"<span class="p">:</span> <span class="p">{</span>
- "<span class="n">sling</span><span class="p">:</span><span class="n">contentClass</span>"<span class="p">:</span> "<span class="n">com</span><span class="p">.</span><span class="n">day</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">jcr</span><span class="p">.</span><span class="n">test</span><span class="p">.</span><span class="n">Test</span>"<span class="p">,</span>
- "<span class="n">sampleMulti</span>"<span class="p">:</span> <span class="p">[</span> "<span class="n">v1</span>"<span class="p">,</span> "<span class="n">v2</span>" <span class="p">],</span>
- "<span class="n">sampleStruct</span>"<span class="p">:</span> <span class="p">{</span>
- "<span class="n">value</span>"<span class="p">:</span> 1<span class="p">,</span>
- "<span class="n">type</span>"<span class="p">:</span> "<span class="n">Long</span>"
- <span class="p">}</span>
- "<span class="n">sampleStructMulti</span>"<span class="p">:</span> <span class="p">{</span>
- "<span class="n">value</span>"<span class="p">:</span> <span class="p">[</span> 1<span class="p">,</span> 2<span class="p">,</span> 3 <span class="p">],</span>
- "<span class="n">type</span>"<span class="p">:</span> "<span class="n">Long</span>"
- <span class="p">}</span>
- <span class="p">},</span>
+ <span class="o">//</span> <span class="n">additional</span> <span class="k">properties</span> <span class="n">as</span> <span class="n">name</span> <span class="n">value</span> <span class="n">pairs</span><span class="p">.</span>
+ <span class="o">//</span> <span class="n">Multi</span><span class="o">-</span><span class="n">value</span> <span class="k">properties</span> <span class="n">are</span> <span class="n">defined</span> <span class="n">as</span> <span class="n">JSON</span> <span class="n">array</span><span class="p">.</span>
+ <span class="o">//</span> <span class="n">Property</span> <span class="n">type</span> <span class="n">is</span> <span class="n">derived</span> <span class="n">from</span> <span class="n">the</span> <span class="n">value</span>
+
+ <span class="o">//</span> <span class="n">String</span> <span class="n">value</span> <span class="p">(</span><span class="n">default</span><span class="p">)</span>
+ "<span class="n">sling</span><span class="p">:</span><span class="n">contentClass</span>"<span class="p">:</span> "<span class="n">com</span><span class="p">.</span><span class="n">day</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">jcr</span><span class="p">.</span><span class="n">test</span><span class="p">.</span><span class="n">Test</span>"<span class="p">,</span>
+
+ <span class="o">//</span> <span class="n">Multi</span><span class="o">-</span><span class="n">value</span> <span class="n">String</span>
+ "<span class="n">sampleMulti</span>"<span class="p">:</span> <span class="p">[</span> "<span class="n">v1</span>"<span class="p">,</span> "<span class="n">v2</span>" <span class="p">],</span>
+
+ <span class="o">//</span> <span class="n">Long</span> <span class="n">value</span><span class="p">,</span> <span class="n">single</span> <span class="n">and</span> <span class="n">multi</span>
+ "<span class="n">sampleStruct</span>"<span class="p">:</span> 1<span class="p">,</span>
+ "<span class="n">sampleStructMulti</span>"<span class="p">:</span> <span class="p">[</span> 1<span class="p">,</span> 2<span class="p">,</span> 3 <span class="p">],</span>
+
+ <span class="o">//</span> <span class="n">Date</span> <span class="n">follows</span> <span class="n">pattern</span> <span class="n">yyyy</span><span class="o">-</span><span class="n">mm</span><span class="o">-</span><span class="n">ddTHH</span><span class="p">:</span><span class="n">MM</span><span class="p">:</span><span class="n">SS</span><span class="p">.</span><span class="n">sss</span>±<span class="n">HH</span><span class="p">:</span><span class="n">MM</span>
+ "<span class="n">sampleDate</span>"<span class="p">:</span> "2014<span class="o">-</span>11<span class="o">-</span>27<span class="n">T13</span><span class="p">:</span>26<span class="p">:</span>00<span class="p">.</span>000<span class="o">+</span>01<span class="p">:</span>00"<span class="p">,</span>
+
+ <span class="o">//</span> <span class="n">JCR</span> <span class="n">Node</span> <span class="n">Reference</span> <span class="n">with</span> <span class="n">name</span> <span class="n">prefix</span> <span class="p">(</span><span class="n">removed</span> <span class="n">to</span> <span class="n">derive</span> <span class="n">node</span> <span class="n">name</span><span class="p">)</span>
+ "<span class="n">jcr</span><span class="p">:</span><span class="n">reference</span><span class="p">:</span><span class="n">sampleRef</span>"<span class="p">:</span> "386<span class="n">b0f48</span><span class="o">-</span>49<span class="n">c3</span><span class="o">-</span>4<span class="n">c58</span><span class="o">-</span>8735<span class="o">-</span><span class="n">ceee6bfc1933</span>"<span class="p">,</span>
+
+ <span class="o">//</span> <span class="n">JCR</span> <span class="n">Path</span> <span class="n">with</span> <span class="n">name</span> <span class="n">prefix</span> <span class="p">(</span><span class="n">removed</span> <span class="n">to</span> <span class="n">derive</span> <span class="n">node</span> <span class="n">name</span><span class="p">)</span>
+ "<span class="n">jcr</span><span class="p">:</span><span class="n">path</span><span class="p">:</span><span class="n">samplePath</span>"<span class="p">:</span> "<span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">data</span>"<span class="p">,</span>
+
+ <span class="o">//</span> <span class="n">JCR</span> <span class="n">Name</span> <span class="n">with</span> <span class="n">name</span> <span class="n">prefix</span> <span class="p">(</span><span class="n">removed</span> <span class="n">to</span> <span class="n">derive</span> <span class="n">node</span> <span class="n">name</span><span class="p">)</span>
+ "<span class="n">jcr</span><span class="p">:</span><span class="n">name</span><span class="p">:</span><span class="n">sampleName</span>"<span class="p">:</span> "<span class="n">data</span>"<span class="p">,</span>
+
+ <span class="o">//</span> <span class="n">URI</span> <span class="n">with</span> <span class="n">name</span> <span class="n">prefix</span> <span class="p">(</span><span class="n">removed</span> <span class="n">to</span> <span class="n">derive</span> <span class="n">node</span> <span class="n">name</span><span class="p">)</span>
+ "<span class="n">jcr</span><span class="p">:</span><span class="n">uri</span><span class="p">:</span><span class="n">sampleUri</span>"<span class="p">:</span> "<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">sling</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>"<span class="p">,</span>
- <span class="o">//</span> <span class="n">the</span> "<span class="n">nodes</span>" <span class="n">property</span> <span class="n">is</span> <span class="n">an</span> <span class="n">array</span> <span class="n">of</span> <span class="n">objects</span> <span class="n">denoting</span> <span class="n">child</span> <span class="n">nodes</span><span class="p">.</span> <span class="n">Nodes</span>
- <span class="o">//</span> <span class="n">may</span> <span class="n">be</span> <span class="n">further</span> <span class="n">nested</span><span class="p">.</span>
- "<span class="n">nodes</span>"<span class="p">:</span> <span class="p">[</span>
- <span class="p">{</span>
- <span class="o">//</span> <span class="n">the</span> <span class="n">name</span> <span class="n">property</span> <span class="n">is</span> <span class="n">required</span> <span class="n">on</span> <span class="p">(</span><span class="n">nested</span><span class="p">)</span> <span class="n">child</span> <span class="n">nodes</span>
- "<span class="n">name</span>"<span class="p">:</span> "<span class="n">sling</span><span class="p">:</span><span class="n">scripts</span>"<span class="p">,</span>
-
- "<span class="n">primaryNodeType</span>"<span class="p">:</span> "<span class="n">sling</span><span class="p">:</span><span class="n">ScriptList</span>"<span class="p">,</span>
-
- "<span class="n">nodes</span>"<span class="p">:</span> <span class="p">[</span>
- <span class="p">{</span>
- "<span class="n">primaryNodeType</span>"<span class="p">:</span> "<span class="n">sling</span><span class="p">:</span><span class="n">Script</span>"<span class="p">,</span>
- "<span class="k">properties</span>"<span class="p">:</span> <span class="p">{</span>
- "<span class="n">sling</span><span class="p">:</span><span class="n">name</span>"<span class="p">:</span> "<span class="o">/</span><span class="n">test</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">jsp</span><span class="o">/</span><span class="n">start</span><span class="p">.</span><span class="n">jsp</span>"<span class="p">,</span>
- "<span class="n">sling</span><span class="p">:</span><span class="n">type</span>"<span class="p">:</span> "<span class="n">jsp</span>"<span class="p">,</span>
- "<span class="n">sling</span><span class="p">:</span><span class="n">glob</span>"<span class="p">:</span> "<span class="o">*</span>"
- <span class="p">}</span>
- <span class="p">}</span>
- <span class="p">]</span>
+ <span class="o">//</span> <span class="n">Child</span> <span class="n">nodes</span> <span class="n">are</span> <span class="n">simple</span> <span class="n">JSON</span> <span class="n">objects</span>
+ "<span class="n">sling</span><span class="p">:</span><span class="n">scripts</span>"<span class="p">:</span> <span class="p">{</span>
+ "<span class="n">jcr</span><span class="p">:</span><span class="n">primaryType</span>"<span class="p">:</span> "<span class="n">sling</span><span class="p">:</span><span class="n">ScriptList</span>"<span class="p">,</span>
+ "<span class="n">sling</span><span class="p">:</span><span class="n">Script</span>"<span class="p">:</span> <span class="p">{</span>
+ "<span class="n">jcr</span><span class="p">:</span><span class="n">primaryType</span>"<span class="p">:</span> "<span class="n">sling</span><span class="p">:</span><span class="n">Script</span>"<span class="p">,</span>
+ "<span class="n">sling</span><span class="p">:</span><span class="n">name</span>"<span class="p">:</span> "<span class="o">/</span><span class="n">test</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">jsp</span><span class="o">/</span><span class="n">start</span><span class="p">.</span><span class="n">jsp</span>"<span class="p">,</span>
+ "<span class="n">sling</span><span class="p">:</span><span class="n">type</span>"<span class="p">:</span> "<span class="n">jsp</span>"<span class="p">,</span>
+ "<span class="n">sling</span><span class="p">:</span><span class="n">glob</span>"<span class="p">:</span> "<span class="o">*</span>"
<span class="p">}</span>
- <span class="p">]</span>
+ <span class="p">}</span>
<span class="p">}</span>
</pre></div>
@@ -381,7 +382,7 @@ Support for re-registration of node type
<p>The initial content found in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/content/src/main/resources/content/sling-test">sling-test folder of the launchpad initial content</a> is verified by the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java">InitialContentTest</a> when running the <em>launchpad/testing</em> integration tests.</p>
<p>Those tests can be used as verified examples of initial content loading. Contributions are welcome to improve the coverage of those tests.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1475804 by dklco on Thu, 25 Apr 2013 14:45:50 +0000
+ Rev. 1642125 by fmeschbe on Thu, 27 Nov 2014 12:36:14 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project