Repository: sling-site Updated Branches: refs/heads/master e0d86f78c -> addaea8dd
Update build instructions Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/addaea8d Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/addaea8d Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/addaea8d Branch: refs/heads/master Commit: addaea8dd02802725c21ed21c6f24baf67ae45a4 Parents: e0d86f7 Author: Bertrand Delacretaz <[email protected]> Authored: Tue Sep 26 14:35:54 2017 +0200 Committer: Bertrand Delacretaz <[email protected]> Committed: Tue Sep 26 14:35:54 2017 +0200 ---------------------------------------------------------------------- README.md | 56 ++++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sling-site/blob/addaea8d/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index ff7ec17..e5cf27a 100644 --- a/README.md +++ b/README.md @@ -3,45 +3,33 @@ Experimenting with JBake for the Apache Sling website. See also https://issues.apache.org/jira/browse/SLING-6955 -##Â How to publish the website -Build the site as described below, and sync the `target/sling-site-*` folder to the asf-site branch -of this Git repository. The ASF's gitpubsub mechanism then synchronizes that content -on the http://sling.apache.org website. - -gitpubsub is active at https://sling.apache.org/ng/ for testing but as pages now contain some absolute links, navigation might lead back to the existing site (https://issues.apache.org/jira/browse/INFRA-14390) - ## How to build the site locally Clone this repository, run the below Maven command, http://localhost:8820/ and enjoy. mvn clean package jbake:inline -Djbake.port=8820 -Djbake.listenAddress=0.0.0.0 -##Â Publishing on the live website -The live content is synced from the `asf-site` branch of this repository. To publish, generate the content and sync the output folder at the root of that branch. - -We'll have a script for that, but for now the following works: - - ./bake.sh - - # verify locally staged content at http://localhost:8820/ - - #Â if ok, commit your changes to the master branch - - # if ok, set these values in jbake.properties - # and generate again - #Â (temporary, while testing on sling.apache.org/ng) - site.host=http://sling.apache.org - site.contextPath=/ng/ - - ./bake.sh - - git checkout -- jbake.properties - mv .target/sling-site-0.1-SNAPSHOT /tmp/output - git checkout asf-site - rsync -r /tmp/output/* . - git commit ... #Â do what's needed! - git push origin asf-site - - # content should appear at https://sling.apache.org/ng/ (for now) soone +##Â How to publish the website +Build the site using `mvn clean package` after changing the JBake settings using this patch: + +(TODO: automate this using Maven resource rewriting or something similar.) + + diff --git a/src/main/jbake/jbake.properties b/src/main/jbake/jbake.properties + index 3f7121e..df175e6 100644 + --- a/src/main/jbake/jbake.properties + +++ b/src/main/jbake/jbake.properties + @@ -1,6 +1,6 @@ + feed.id=localhost + -site.host=http://localhost + -site.contextPath=/ + +site.host=http://sling.apache.org + +site.contextPath=/ng/ + foundation.version=5.5.1 + blog.title=Apache Sling + blog.subtitle=Work in progress... + +and then sync the `target/sling-site-*` folder to the `asf-site` branch +of this Git repository. The ASF's gitpubsub mechanism then synchronizes that content +on the http://sling.apache.org website, usually within a few seconds. ## TODO
