This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-content.git
The following commit(s) were added to refs/heads/master by this push:
new 28e0ae1 Moving content for SLING-7484 from /content and
/etc/clientlibs/launchpad to /content/starter
28e0ae1 is described below
commit 28e0ae123ef1069033a5e5a2aea0753290492810
Author: Dan Klco <daniel.k...@gmail.com>
AuthorDate: Mon Feb 12 11:33:35 2018 -0500
Moving content for SLING-7484 from /content and /etc/clientlibs/launchpad
to /content/starter
---
src/main/appended-resources/META-INF/LICENSE | 6 ++++++
src/main/appended-resources/META-INF/NOTICE | 3 +++
src/main/frontend/gulpfile.js | 4 ++--
src/main/resources/content/ROOT.json | 16 ++++++++++------
.../content/content/{ => starter}/gradient.png | Bin
.../resources/content/content/{ => starter}/index.html | 8 ++++----
.../content/content/{ => starter}/sling-logo.png | Bin
.../content/content/{ => starter}/sling-logo.svg | 0
.../resources/content/content/{ => starter}/sling.css | 0
9 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/main/appended-resources/META-INF/LICENSE
b/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..a6e3094
--- /dev/null
+++ b/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,6 @@
+APACHE SLING LAUNCHPAD CONTENT SUBCOMPONENTS:
+The Apache Sling Launchpad Content includes a subcomponent with separate
copyright notices.
+Your use of the source code for this subcomponent is subject to the terms and
conditions
+of the following licenses.
+
+For Open Sans: Apache License, Version 2.0
http://www.apache.org/licenses/LICENSE-2.0.html
\ No newline at end of file
diff --git a/src/main/appended-resources/META-INF/NOTICE
b/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..4034f6f
--- /dev/null
+++ b/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,3 @@
+This product includes software from http://www.google.com
+Copyright (C) 2011, Google Corporation
+Licensed under the Apache License, Version 2.0
http://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/src/main/frontend/gulpfile.js b/src/main/frontend/gulpfile.js
index fff545e..850cca0 100755
--- a/src/main/frontend/gulpfile.js
+++ b/src/main/frontend/gulpfile.js
@@ -46,11 +46,11 @@ gulp.task('styles', function() {
.pipe(cleanCSS())
.pipe(concatCss('bundle.css'))
.pipe(header(apache2License))
- .pipe(gulp.dest('./dist/content/etc/clientlibs/launchpad/css'));
+ .pipe(gulp.dest('./dist/content/content/starter/css'));
});
gulp.task('assets', function() {
-
gulp.src(['./src/{fonts,img}/**/*']).pipe(gulp.dest('./dist/content/etc/clientlibs/launchpad'));
+
gulp.src(['./src/{fonts,img}/**/*']).pipe(gulp.dest('./dist/content/content/starter'));
});
diff --git a/src/main/resources/content/ROOT.json
b/src/main/resources/content/ROOT.json
index d838475..b150cb5 100644
--- a/src/main/resources/content/ROOT.json
+++ b/src/main/resources/content/ROOT.json
@@ -1,14 +1,18 @@
{
"jcr:mixinTypes": [ "sling:Redirect" ],
"sling:resourceType": "sling:redirect",
- "sling:target": "/index.html",
+ "sling:target": "/starter/index.html",
"etc": {
- "sling:resourceType": "sling:Folder",
+ "jcr:primaryType": "sling:Folder",
"map": {
- "sling:resourceType": "sling:Folder",
- "localhost": {
- "sling:match": "localhost",
- "sling:internalRedirect": "/content"
+ "jcr:primaryType": "sling:Folder",
+ "http": {
+ "jcr:primaryType": "sling:Folder",
+ "localhost": {
+ "jcr:primaryType": "sling:Mapping",
+ "sling:match": "localhost\\.\\d*/$",
+ "sling:redirect": "/starter/index.html"
+ }
}
}
}
diff --git a/src/main/resources/content/content/gradient.png
b/src/main/resources/content/content/starter/gradient.png
similarity index 100%
rename from src/main/resources/content/content/gradient.png
rename to src/main/resources/content/content/starter/gradient.png
diff --git a/src/main/resources/content/content/index.html
b/src/main/resources/content/content/starter/index.html
similarity index 94%
rename from src/main/resources/content/content/index.html
rename to src/main/resources/content/content/starter/index.html
index c76c193..0ef5d10 100755
--- a/src/main/resources/content/content/index.html
+++ b/src/main/resources/content/content/starter/index.html
@@ -17,23 +17,22 @@
specific language governing permissions and limitations
under the License.
-->
-
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Welcome to the Apache Sling Launchpad</title>
- <link href="/etc/clientlibs/launchpad/css/bundle.css" rel="stylesheet">
+ <link href="/content/starter/css/bundle.css" rel="stylesheet">
</head>
<body>
<div class="Grid Fit-Medium Home-Grid">
<div class="Gradient"></div>
<header class="Cell Medium-35 Large-25 Align-Center Logos">
<a href="http://sling.apache.org"; target="_blank"
id="sling-logo" title="Visit the Apache Sling website">
- <img src="sling-logo.svg" alt="Apache Sling Logo"/>
+ <img src="/content/starter/sling-logo.svg" alt="Apache
Sling Logo"/>
</a>
<a href="http://apache.org"; target="_blank" id="asf-logo"
title="Visit the Apache Software Foundation website">
- <img src="/etc/clientlibs/launchpad/img/asf-logo.svg"
alt="Apache Software Foundation Logo"/>
+ <img src="/content/starter/img/asf-logo.svg" alt="Apache
Software Foundation Logo"/>
</a>
</header>
<div class="Cell Align-Center Main-Content">
@@ -89,5 +88,6 @@
logout.insertAdjacentHTML('beforeend', info.userID);
}
</script>
+ <!-- Do not remove this comment, used for Starter integration tests -->
</body>
</html>
diff --git a/src/main/resources/content/content/sling-logo.png
b/src/main/resources/content/content/starter/sling-logo.png
similarity index 100%
rename from src/main/resources/content/content/sling-logo.png
rename to src/main/resources/content/content/starter/sling-logo.png
diff --git a/src/main/resources/content/content/sling-logo.svg
b/src/main/resources/content/content/starter/sling-logo.svg
similarity index 100%
rename from src/main/resources/content/content/sling-logo.svg
rename to src/main/resources/content/content/starter/sling-logo.svg
diff --git a/src/main/resources/content/content/sling.css
b/src/main/resources/content/content/starter/sling.css
similarity index 100%
rename from src/main/resources/content/content/sling.css
rename to src/main/resources/content/content/starter/sling.css
--
To stop receiving notification emails like this one, please contact
dk...@apache.org.
