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 2017/10/01 09:14:59 UTC
sling-site git commit: Minor changes to getting started and avoid
duplication in tutorial
Repository: sling-site
Updated Branches:
refs/heads/master 8b39fe9d6 -> b636fda1e
Minor changes to getting started and avoid duplication in tutorial
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/b636fda1
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/b636fda1
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/b636fda1
Branch: refs/heads/master
Commit: b636fda1e126c1324f5be289de5ff63d6154ab2e
Parents: 8b39fe9
Author: Carsten Ziegeler <cz...@adobe.com>
Authored: Sun Oct 1 11:14:54 2017 +0200
Committer: Carsten Ziegeler <cz...@adobe.com>
Committed: Sun Oct 1 11:14:54 2017 +0200
----------------------------------------------------------------------
.../content/documentation/getting-started.md | 13 +++++--
.../discover-sling-in-15-minutes.md | 36 +++++++++++---------
src/main/jbake/templates/menu.tpl | 2 +-
3 files changed, 31 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/b636fda1/src/main/jbake/content/documentation/getting-started.md
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/documentation/getting-started.md b/src/main/jbake/content/documentation/getting-started.md
index cc4ca12..9880043 100644
--- a/src/main/jbake/content/documentation/getting-started.md
+++ b/src/main/jbake/content/documentation/getting-started.md
@@ -4,7 +4,10 @@ status=published
tags=tutorials
~~~~~~
-# Run Apache Sling
+# Run the Sling Application
+
+There are different ways to get Apache Sling running. You can either use Docker, download a
+ distribution or build it from source.
## Sling Docker Image
@@ -18,7 +21,7 @@ The simplest command to launch Sling is:
docker run -p 8080:8080 apachesling/sling
-This will start the latest Apache Sling distribution and you can access Sling at [http://localhost:8080](http://localhost:8080).
+This will start the latest Apache Sling distribution.
## Sling Download
@@ -30,7 +33,11 @@ The other option is to download the latest released Apache Sling standalone appl
java -jar org.apache.sling.launchpad-N.jar
-Again, once this is started have a look at http://localhost:8080](http://localhost:8080).
+# Explore Sling
+
+Once Sling is started, you can access Sling at [http://localhost:8080](http://localhost:8080).
+ Starting Sling might take some seconds, so if you get an error in your browser that some
+ service is missing, simply reload the page a little bit later.
# Where to head from here
http://git-wip-us.apache.org/repos/asf/sling-site/blob/b636fda1/src/main/jbake/content/documentation/getting-started/discover-sling-in-15-minutes.md
----------------------------------------------------------------------
diff --git a/src/main/jbake/content/documentation/getting-started/discover-sling-in-15-minutes.md b/src/main/jbake/content/documentation/getting-started/discover-sling-in-15-minutes.md
index bfa193e..f7cb5d8 100644
--- a/src/main/jbake/content/documentation/getting-started/discover-sling-in-15-minutes.md
+++ b/src/main/jbake/content/documentation/getting-started/discover-sling-in-15-minutes.md
@@ -4,11 +4,16 @@ status=published
tags=tutorials
~~~~~~
-The Sling Launchpad is a ready-to-run Sling configuration, providing an embedded JCR content repository and web server, a selection of Sling components, documentation and examples. The Launchpad makes it easy to get started with Sling and to develop script-based applications.
+The Sling Launchpad is a ready-to-run Sling configuration, providing an embedded content
+ repository, a web server, a selection of Sling modules, documentation and examples. The
+ Launchpad makes it easy to get started with Sling and to develop script-based applications.
-This page will help you get started with the Launchpad. Fifteen minutes should be enough to get an overview of what Sling does.
+This page will help you get started with the Launchpad. Fifteen minutes should be enough
+ to get an overview of what Sling does.
-While simple to run and understand, the Launchpad is a full-featured instance of Sling, an example configuration that we have created with the most common modules and configurations. The full functionality of Sling is available by loading additional Sling (or custom) OSGi bundles as needed, using the Launchpad's web-based OSGi management console.
+While simple to run and understand, the Launchpad is a full-featured instance of Sling,
+ an example configuration that we have created with the most common modules and configurations.
+ The full functionality of Sling is available by loading additional Sling modules as needed.
[TOC]
@@ -23,24 +28,23 @@ Once you grok the basic examples of this page, we recommend studying the
## Prerequisites
-We'll start with the self-runnable jar from the Sling distribution, you only need a Java 7 JDK. Download the latest release from the Sling [Downloads](/downloads.cgi) page or by clicking this link: [org.apache.sling.launchpad-8.jar](http://www.apache.org/dyn/closer.lua/sling/org.apache.sling.launchpad-8.jar). Alternatively you can deploy the [Sling Web application](http://www.apache.org/dyn/closer.lua/sling/org.apache.sling.launchpad-8-webapp.war) into any decent Servlet Container such as Jetty or Tomcat or you can [build the current source yourself](/documentation/development/getting-and-building-sling.html).
+You'll need a running Sling application. If you haven't started Sling yet, have a look at
+ the [Getting Started](/documentation/getting-started.html) page on how to run Sling. If
+ you follow the instructions on that page, you should have Sling running on port 8080. If
+ you choose a different port, replace the port 8080 in the examples below with your port.
+
-To show the simplicity of the REST-style approach taken by Sling the examples below will be using [cURL](http://curl.haxx.se/). Any HTTP client would do, but cURL is the easiest to document in a reproducible way.
+To show the simplicity of the REST-style approach taken by Sling the examples below will be
+ using [cURL](http://curl.haxx.se/). Any HTTP client would do, but cURL is the easiest to
+ document in a reproducible way.
-A WebDAV client makes editing server-side scripts much more convenient, but to make our examples easy to reproduce, we're using cURL below to create and update files in the JCR repository, via the Sling WebDAV server.
-## Start the Launchpad
+## Getting Started
-After downloading the Sling Launchpad self-runnable jar just start it as follows:
-
-
- $ java -jar org.apache.sling.launchpad-8.jar
-
-
-This starts the Sling embedded Web Server on port 8080 and writes application files into the `sling` folder found in the current working directory.
-
-Once started, look at [http://localhost:8080/system/console/bundles](http://localhost:8080/system/console/bundles) with your browser. Use *admin* with password *admin* if Sling asks you for a login. Sling then displays the *Felix Web Management Console* page.
+Once started, look at [http://localhost:8080/system/console/bundles](http://localhost:8080/system/console/bundles)
+ with your browser. Use *admin* with password *admin* if Sling asks you for a login.
+ Sling then displays the *Felix Web Management Console* page.
On the bundles page, all bundles should be marked *Active*. They're all [OSGi](http://www.osgi.org/) bundles powered by [Apache Felix](http://felix.apache.org), but that doesn't really matter to us right now.
http://git-wip-us.apache.org/repos/asf/sling-site/blob/b636fda1/src/main/jbake/templates/menu.tpl
----------------------------------------------------------------------
diff --git a/src/main/jbake/templates/menu.tpl b/src/main/jbake/templates/menu.tpl
index ce36afa..eed8728 100644
--- a/src/main/jbake/templates/menu.tpl
+++ b/src/main/jbake/templates/menu.tpl
@@ -27,7 +27,7 @@ div(class:"menu"){
}
p(){
- strong("Project info") br() newLine()
+ strong("Project Info") br() newLine()
a(href:"${config.site_contextPath}downloads.cgi", "Downloads") br() newLine()
a(href:"http://www.apache.org/licenses/", "License") br() newLine()
a(href:"${config.site_contextPath}contributing.html", "Contributing") br() newLine()