Author: cziegeler
Date: Fri Dec 23 12:21:16 2016
New Revision: 1775824
URL: http://svn.apache.org/viewvc?rev=1775824&view=rev
Log:
SLING-6235 : Integrate slingshot sample
Modified:
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/launchpad/content/src/main/resources/content/index.html
Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1775824&r1=1775823&r2=1775824&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Fri Dec 23
12:21:16 2016
@@ -23,6 +23,8 @@
jackrabbit.version=2.13.5
[artifacts]
+ # Add the Slingshot Sample provisioning model
+
org.apache.sling/org.apache.sling.sample.slingshot/0.8.0/slingfeature/slingfeature
commons-collections/commons-collections/3.2.2
org.apache.commons/commons-collections4/4.1
commons-codec/commons-codec/1.9
Modified: sling/trunk/launchpad/content/src/main/resources/content/index.html
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/content/src/main/resources/content/index.html?rev=1775824&r1=1775823&r2=1775824&view=diff
==============================================================================
--- sling/trunk/launchpad/content/src/main/resources/content/index.html
(original)
+++ sling/trunk/launchpad/content/src/main/resources/content/index.html Fri Dec
23 12:21:16 2016
@@ -20,7 +20,7 @@
<!-- Do not remove this comment, used for Launchpad integration tests -->
<head>
- <title>Welcome to the Sling Launchpad</title>
+ <title>Welcome to the Apache Sling Launchpad</title>
<link rel="stylesheet" type="text/css" href="sling.css"/>
<script src="system/sling.js"></script>
</head>
@@ -43,7 +43,7 @@
</div>
<div class="main">
- <h1>Welcome to the Sling Launchpad</h1>
+ <h1>Welcome to the Apache Sling Launchpad</h1>
<p>
<a href="http://sling.apache.org";>Apache Sling</a> is a web
framework that uses a Java Content Repository,
@@ -66,7 +66,8 @@
<p>
To get started with Sling, see our
<a href="http://sling.apache.org";>website</a> and
- the
+ <a href="slingshot.html">the Slingshot sample application</a>
+ or the
<a
href="http://sling.apache.org/site/discover-sling-in-15-minutes.html";>
Sling in 15 minutes
</a>
