You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/05 09:06:01 UTC
[1/2] sling-site git commit: SLING-7178 - Allow publishing the Sling
site using Maven
Repository: sling-site
Updated Branches:
refs/heads/master f23d5dd64 -> 3e0a4672b
SLING-7178 - Allow publishing the Sling site using Maven
Move publishing to the actual live site, all issues are cleared out.
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/4900509b
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/4900509b
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/4900509b
Branch: refs/heads/master
Commit: 4900509b0b7ace37ab068c15362b10c183a56ec7
Parents: f23d5dd
Author: Robert Munteanu <ro...@apache.org>
Authored: Thu Oct 5 11:36:51 2017 +0300
Committer: Robert Munteanu <ro...@apache.org>
Committed: Thu Oct 5 11:45:13 2017 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/4900509b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 08d5bfc..0a9b072 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<content>target/${project.artifactId}-${project.version}</content>
<checkinComment>Automatic publish of sling site</checkinComment>
<pubScmUrl>scm:git:https://git-wip-us.apache.org/repos/asf/sling-site.git</pubScmUrl>
- <scmBranch>asf-site-staging</scmBranch>
+ <scmBranch>asf-site</scmBranch>
</configuration>
</plugin>
</plugins>
[2/2] sling-site git commit: Add back error pages
Posted by ro...@apache.org.
Add back error pages
Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/3e0a4672
Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/3e0a4672
Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/3e0a4672
Branch: refs/heads/master
Commit: 3e0a4672b9997d30bc9814b55c4ff62634e3b2f2
Parents: 4900509
Author: Robert Munteanu <ro...@apache.org>
Authored: Thu Oct 5 12:01:26 2017 +0300
Committer: Robert Munteanu <ro...@apache.org>
Committed: Thu Oct 5 12:02:54 2017 +0300
----------------------------------------------------------------------
src/main/jbake/assets/errors/403.html | 39 +++++++++++++++++++++++++++++
src/main/jbake/assets/errors/404.html | 40 ++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sling-site/blob/3e0a4672/src/main/jbake/assets/errors/403.html
----------------------------------------------------------------------
diff --git a/src/main/jbake/assets/errors/403.html b/src/main/jbake/assets/errors/403.html
new file mode 100644
index 0000000..cea2617
--- /dev/null
+++ b/src/main/jbake/assets/errors/403.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html><html lang="en">
+ <head>
+<meta charset="utf-8"/>
+ <title>Apache Sling</title>
+ <link rel="stylesheet" href="/res/css/site.css"/>
+ <link rel="icon" href="/res/favicon.ico"/>
+ <div class="title">
+ <div class="logo">
+ <a href="http://sling.apache.org">
+ <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+ </a>
+ </div><div class="header">
+ <a href="http://www.apache.org">
+ <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+ </a>
+ </div>
+ </div><h1 class="draft">DRAFT 2017 WEBSITE - SLING-6955</h1>
+ </head><body>
+<div class="menu">
+ <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials & How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+ </div> <div class="main">
+<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Forbidden (403)</h1></header><p>Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>
+<p>We're sorry, but the page you requested cannot be accessed. This may be because:</p>
+<ul>
+ <li>You typed the address incorrectly</li>
+ <li>You followed a link from another site that pointed to this page.</li>
+</ul>
+<p>If you came to this page by following a broken link on our site, you can report the <a href="https://issues.apache.org/jira/browse/SLING">problem</a>.</p></section></div></div>
+<div class="footer">
+ <div class="timestamp">
+ TODO display revision number here
+ </div><div class="trademarkFooter">
+ Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+ </div>
+ </div>
+
+ </div>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/sling-site/blob/3e0a4672/src/main/jbake/assets/errors/404.html
----------------------------------------------------------------------
diff --git a/src/main/jbake/assets/errors/404.html b/src/main/jbake/assets/errors/404.html
new file mode 100644
index 0000000..9f7cfb0
--- /dev/null
+++ b/src/main/jbake/assets/errors/404.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html><html lang="en">
+ <head>
+<meta charset="utf-8"/>
+ <title>Apache Sling</title>
+ <link rel="stylesheet" href="/res/css/site.css"/>
+ <link rel="icon" href="/res/favicon.ico"/>
+ <div class="title">
+ <div class="logo">
+ <a href="http://sling.apache.org">
+ <img border="0" alt="Apache Sling" src="/res/logos/sling.svg"/>
+ </a>
+ </div><div class="header">
+ <a href="http://www.apache.org">
+ <img border="0" alt="Apache" src="/res/logos/apache.png"/>
+ </a>
+ </div>
+ </div><h1 class="draft">DRAFT 2017 WEBSITE - SLING-6955</h1>
+ </head><body>
+<div class="menu">
+ <strong><a href="/documentation.html">Documentation</a></strong><br/><a href="/documentation/getting-started.html">Getting Started</a><br/><a href="/documentation/the-sling-engine.html">The Sling Engine</a><br/><a href="/documentation/development.html">Development</a><br/><a href="/documentation/bundles.html">Bundles</a><br/><a href="/documentation/tutorials-how-tos.html">Tutorials & How-Tos</a><br/><a href="/documentation/configuration.html">Configuration</a><p></p><a href="http://s.apache.org/sling.wiki">Wiki</a><br/><a href="http://s.apache.org/sling.faq">FAQ</a><br/><p></p><strong>API Docs</strong><br/><a href="/apidocs/sling9/index.html">Sling 9</a><br/><a href="/apidocs/sling8/index.html">Sling 8</a><br/><a href="/apidocs/sling7/index.html">Sling 7</a><br/><a href="/apidocs/sling6/index.html">Sling 6</a><br/><a href="/apidocs/sling5/index.html">Sling 5</a><br/><a href="/javadoc-io.html">Archive at javadoc.io</a><br/><p></p><strong>Project info</strong><br/><a h
ref="/downloads.cgi">Downloads</a><br/><a href="http://www.apache.org/licenses/">License</a><br/><a href="/contributing.html">Contributing</a><br/><a href="/news.html">News</a><br/><a href="/links.html">Links</a><br/><a href="/project-information.html">Project Information</a><br/><a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a><br/><a href="http://ci.apache.org/builders/sling-trunk">Build Server</a><br/><a href="/project-information/security.html">Security</a><br/><p></p><strong>Source</strong><br/><a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a><br/><a href="git://git.apache.org/sling.git">Git</a><br/><a href="https://github.com/apache/sling">Github Mirror</a><br/><p></p><strong>Sponsorship</strong><br/><a href="http://www.apache.org/foundation/thanks.html">Thanks</a><br/><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a><br/><a href="https://donate.apache.org/">Donate!</a><br/><a href="http://www.apache.org/foun
dation/buy_stuff.html">Buy Stuff</a><br/><p></p><strong><a href="/sitemap.html">Site Map</a></strong>
+ </div> <div class="main">
+<div class="row"><div class="small-12 columns"><section class="wrap"><header><h1>Page Not Found</h1></header><p>Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>
+<p>We're sorry, but the page you requested cannot be found. This may be because:</p>
+<ul>
+ <li>The page has moved, was outdated, or has not been created yet</li>
+ <li>You typed the address incorrectly</li>
+ <li>You followed a link from another site that pointed to this page.</li>
+</ul>
+<p>If you came to this page by following a broken link on our site, you can report the <a href="https://issues.apache.org/jira/browse/SLING">problem</a>.</p></section></div></div>
+<div class="footer">
+ <div class="timestamp">
+ TODO display revision number here
+ </div><div class="trademarkFooter">
+ Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+ </div>
+ </div>
+
+ </div>
+ </body>
+</html>