Author: buildbot
Date: Tue Dec 6 09:28:07 2016
New Revision: 1002257
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
websites/staging/sling/trunk/content/documentation/development/getting-and-building-sling.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec 6 09:28:07 2016
@@ -1 +1 @@
-1771822
+1772848
Modified:
websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
(original)
+++
websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
Tue Dec 6 09:28:07 2016
@@ -148,7 +148,7 @@ h2:hover > .headerlink, h3:hover > .head
<h4 id="slingmessageentry-based"><code>sling:MessageEntry</code> based<a
class="headerlink" href="#slingmessageentry-based" title="Permanent
link">¶</a></h4>
<p>The (direct) child nodes of the <code>mix:language</code> node must have
the <code>jcr:primaryType</code> set to <code>sling:MessageEntry</code> and
must contain two special properties naming the key string and the message:</p>
<ul>
-<li><code>sling:key</code> -- The <code>sling:key</code> property is a string
property being the key for which the node contains the message(s). This
property is optional. If it is not set the key is determined by the resource
name of the parent <code>sling:messageEntry</code>.</li>
+<li><code>sling:key</code> -- The <code>sling:key</code> property is a string
property being the key for which the node contains the message(s). This
property is optional. If it is not set the key is determined by the name of
this <code>sling:messageEntry</code> resource.</li>
<li><code>sling:message</code> -- The <code>sling:message</code> property
represents the resource for the key.</li>
</ul>
<p>It is only required that the message nodes are located below
<code>mix:language</code> nodes. Such structures may also be scattered in the
repository to allow storing message resources next to where they are most
likely used, such as request scripts.</p>
@@ -277,7 +277,7 @@ The parser will take any "key":"value" p
<p>In case there is a resource bundle requested for a locale without country
or variant, there is only 1 fallback (i.e. the default locale).
The last resort (root resource bundle in all hierarchies) is always the bundle
which returns the requested key as the value.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1750490 by kwin on Tue, 28 Jun 2016 11:58:51 +0000
+ Rev. 1772848 by kwin on Tue, 6 Dec 2016 09:27:47 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified:
websites/staging/sling/trunk/content/documentation/development/getting-and-building-sling.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/development/getting-and-building-sling.html
(original)
+++
websites/staging/sling/trunk/content/documentation/development/getting-and-building-sling.html
Tue Dec 6 09:28:07 2016
@@ -219,12 +219,13 @@ rarely be needed and it's almost always
you're working on at the moment.</p>
<h3 id="with-the-maven-command-line-tool">With the Maven command line tool<a
class="headerlink" href="#with-the-maven-command-line-tool" title="Permanent
link">¶</a></h3>
<ol>
-<li>
-<p>Enter the directory, then do a build and local install of the launchpad
(below are unix/linux commands, slightly different under windows)</p>
-<p>$ cd sling
-$ cd launchpad/builder # you are now in the Sling SVN checkout
-$ mvn --update-snapshots clean install
-$ java -jar target/org.apache.sling.launchpad-*.jar -c test -f -</p>
+<li>Enter the directory, then do a build and local install of the launchpad
(below are unix/linux commands, slightly different under windows)<div
class="codehilite"><pre>$ <span class="n">cd</span> <span class="n">sling</span>
+$ <span class="n">cd</span> <span class="n">launchpad</span><span
class="o">/</span><span class="n">builder</span> # <span class="n">you</span>
<span class="n">are</span> <span class="n">now</span> <span class="n">in</span>
<span class="n">the</span> <span class="n">Sling</span> <span
class="n">SVN</span> <span class="n">checkout</span>
+$ <span class="n">mvn</span> <span class="o">--</span><span
class="n">update</span><span class="o">-</span><span class="n">snapshots</span>
<span class="n">clean</span> <span class="n">install</span>
+$ <span class="n">java</span> <span class="o">-</span><span
class="n">jar</span> <span class="n">target</span><span class="o">/</span><span
class="n">org</span><span class="p">.</span><span class="n">apache</span><span
class="p">.</span><span class="n">sling</span><span class="p">.</span><span
class="n">launchpad</span><span class="o">-*</span><span
class="p">.</span><span class="n">jar</span> <span class="o">-</span><span
class="n">c</span> <span class="n">test</span> <span class="o">-</span><span
class="n">f</span> <span class="o">-</span>
+</pre></div>
+
+
</li>
</ol>
<div class="note">
@@ -240,11 +241,12 @@ When starting Sling inside the `launchpa
<p>After all messages have been printed you should be able to open the Sling
Management Console by pointing your web browser at <a
href="http://localhost:8080/system/console";>http://localhost:8080/system/console</a>.
You will be prompted for a user name and password. Enter <code>admin</code>
for both the user name and the password (this may be set on the
<em>Configuration</em> page later). From this console, you can manage the
installed bundles, modify configuration objects, dump a configuration status
and see some system information.</p>
<p>To stop Sling, just hit <code>Ctrl-C</code> in the console or click the
<em>Stop</em> button on the <em>System Information</em> page of the Sling
Management Console.</p>
<ol>
-<li>
-<p>Enter the directory of the bundle you're working on, then do a build and
deploy the bundle to the running launchpad instance</p>
-<p>$ cd sling
-$ cd bundles/servlets/get
-$ mvn clean install sling:install</p>
+<li>Enter the directory of the bundle you're working on, then do a build and
deploy the bundle to the running launchpad instance<div
class="codehilite"><pre>$ <span class="n">cd</span> <span class="n">sling</span>
+$ <span class="n">cd</span> <span class="n">bundles</span><span
class="o">/</span><span class="n">servlets</span><span class="o">/</span><span
class="n">get</span>
+$ <span class="n">mvn</span> <span class="n">clean</span> <span
class="n">install</span> <span class="n">sling</span><span
class="p">:</span><span class="n">install</span>
+</pre></div>
+
+
</li>
</ol>
<p>The Maven build command ensure that:</p>
@@ -318,7 +320,7 @@ For more information on this see the <a
</ul>
<p>If adding dependencies to the poms, run mvn eclipse:eclipse again and
refresh the project in Eclipse. Debugging works as described above.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1771822 by rombert on Mon, 28 Nov 2016 22:28:05 +0000
+ Rev. 1771824 by rombert on Mon, 28 Nov 2016 22:30:03 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
