You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/07/10 14:03:32 UTC
[1/6] git commit: Delete brooklyn-logo-150px.png
Repository: incubator-brooklyn-site
Updated Branches:
refs/heads/master 276eeba13 -> 6b184c5b7
Delete brooklyn-logo-150px.png
This has been replaced by newer "Apache Brooklyn" logos
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/fbc0a524
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/fbc0a524
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/fbc0a524
Branch: refs/heads/master
Commit: fbc0a5246d07f6296f9f9834b858a1b4b0bad2e6
Parents: 276eeba
Author: Richard Downer <ri...@cloudsoftcorp.com>
Authored: Thu Jul 10 10:35:48 2014 +0100
Committer: Richard Downer <ri...@cloudsoftcorp.com>
Committed: Thu Jul 10 10:35:48 2014 +0100
----------------------------------------------------------------------
style/img/brooklyn-logo-150px.png | Bin 2665 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/fbc0a524/style/img/brooklyn-logo-150px.png
----------------------------------------------------------------------
diff --git a/style/img/brooklyn-logo-150px.png b/style/img/brooklyn-logo-150px.png
deleted file mode 100644
index 10e47cf..0000000
Binary files a/style/img/brooklyn-logo-150px.png and /dev/null differ
[2/6] git commit: Add Gemfile with RVM config, and Gemfile.lock
Posted by ri...@apache.org.
Add Gemfile with RVM config, and Gemfile.lock
This will ensure a consistent environment for anybody who needs to get
started with the website generation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/3d2c0f1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/3d2c0f1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/3d2c0f1c
Branch: refs/heads/master
Commit: 3d2c0f1c2b4aa94576db133d2441e176bdeaf985
Parents: 276eeba
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jul 10 11:23:42 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 10 11:23:42 2014 +0000
----------------------------------------------------------------------
Gemfile | 8 +++++
Gemfile.lock | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
_config.yml | 2 +-
3 files changed, 96 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/3d2c0f1c/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..bc46bf5
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,8 @@
+#ruby=ruby-2.1.2
+#ruby-gemset=incubator-brooklyn-site
+
+source 'https://rubygems.org'
+
+gem 'jekyll'
+gem 'therubyracer'
+gem 'link-checker'
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/3d2c0f1c/Gemfile.lock
----------------------------------------------------------------------
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..cf69053
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,87 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ anemone (0.7.2)
+ nokogiri (>= 1.3.0)
+ robotex (>= 1.0.0)
+ blankslate (2.1.2.4)
+ celluloid (0.15.2)
+ timers (~> 1.1.0)
+ classifier (1.3.4)
+ fast-stemmer (>= 1.0.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.7.0)
+ colorator (0.1)
+ colorize (0.5.8)
+ execjs (2.2.1)
+ fast-stemmer (1.0.2)
+ ffi (1.9.3)
+ jekyll (2.1.0)
+ classifier (~> 1.3)
+ colorator (~> 0.1)
+ jekyll-coffeescript (~> 1.0)
+ jekyll-gist (~> 1.0)
+ jekyll-paginate (~> 1.0)
+ jekyll-sass-converter (~> 1.0)
+ jekyll-watch (~> 1.0)
+ kramdown (~> 1.3)
+ liquid (~> 2.6.1)
+ mercenary (~> 0.3.3)
+ pygments.rb (~> 0.6.0)
+ redcarpet (~> 3.1)
+ safe_yaml (~> 1.0)
+ toml (~> 0.1.0)
+ jekyll-coffeescript (1.0.0)
+ coffee-script (~> 2.2)
+ jekyll-gist (1.1.0)
+ jekyll-paginate (1.0.0)
+ jekyll-sass-converter (1.0.0)
+ sass (~> 3.2)
+ jekyll-watch (1.0.0)
+ listen (~> 2.7)
+ kramdown (1.4.0)
+ libv8 (3.16.14.3)
+ link-checker (0.7.2)
+ anemone (~> 0.7.2)
+ colorize (~> 0.5.8)
+ nokogiri (~> 1.5.5)
+ trollop (~> 2.0)
+ liquid (2.6.1)
+ listen (2.7.9)
+ celluloid (>= 0.15.2)
+ rb-fsevent (>= 0.9.3)
+ rb-inotify (>= 0.9)
+ mercenary (0.3.3)
+ nokogiri (1.5.11)
+ parslet (1.5.0)
+ blankslate (~> 2.0)
+ posix-spawn (0.3.8)
+ pygments.rb (0.6.0)
+ posix-spawn (~> 0.3.6)
+ yajl-ruby (~> 1.1.0)
+ rb-fsevent (0.9.4)
+ rb-inotify (0.9.5)
+ ffi (>= 0.5.0)
+ redcarpet (3.1.2)
+ ref (1.0.5)
+ robotex (1.0.0)
+ safe_yaml (1.0.3)
+ sass (3.3.9)
+ therubyracer (0.12.1)
+ libv8 (~> 3.16.14.0)
+ ref
+ timers (1.1.0)
+ toml (0.1.1)
+ parslet (~> 1.5.0)
+ trollop (2.0)
+ yajl-ruby (1.1.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ jekyll
+ link-checker
+ therubyracer
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/3d2c0f1c/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index ce7524b..eb92c57 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,2 +1,2 @@
-exclude: ['LICENSE.md', 'README.md']
+exclude: ['LICENSE.md', 'README.md', 'Gemfile', 'Gemfile.lock' ]
url: https://brooklyn.incubator.apache.org/
[5/6] git commit: Add README.md on building and publishing
Posted by ri...@apache.org.
Add README.md on building and publishing
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/81ad1051
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/81ad1051
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/81ad1051
Branch: refs/heads/master
Commit: 81ad105121c1e0fcde5831e544a3120e454da74e
Parents: 7afae86
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jul 10 11:58:36 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 10 11:58:36 2014 +0000
----------------------------------------------------------------------
README.md | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/81ad1051/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..31512ec
--- /dev/null
+++ b/README.md
@@ -0,0 +1,92 @@
+Brooklyn Website source
+=======================
+
+Contributor worflow
+-------------------
+
+The contributor workflow is identical to that used by the main project, with
+the exception of the different repository - `incubator-brooklyn-site` instead
+of `incubator-brooklyn`. Therefore you should familiarise yourself with the
+standard workflow for Apache Brooklyn:
+
+* [Guide for contributors][CONTRIB]
+* [Guide for committers][COMMIT]
+
+[CONTRIB]: https://brooklyn.incubator.apache.org/community/how-to-contribute.html
+[COMMIT]: https://brooklyn.incubator.apache.org/community/committers.html
+
+
+Workstation setup
+-----------------
+
+First, clone the `incubator-brooklyn-site` repository and set up the remotes as
+described in [Guide for committers][COMMIT].
+
+Install [RVM](http://rvm.io/); this manages Ruby installations and sets of Ruby
+gems.
+
+ \curl -sSL https://get.rvm.io | bash -s stable
+
+At this point, close your shell session and start a new one, to get the new
+environment that RVM has configured. Now change directory to the location where
+you checked out your repository; RVM should detect its configuration inside
+`Gemfile` and try to configure itself. Most likely it will report that the
+required version of Ruby is not installed; it will show the command that you
+need to run to install the correct version. Follow the instructions.
+
+Once the correct version of Ruby is installed, change to your home directory
+(`cd ~`) and then change back to the repository again (`cd -`). This will cause
+RVM to re-load configuration from `Gemfile` with the correct version of Ruby.
+
+If you are running Ubuntu, there is a further dependency that is required:
+
+ sudo apt-get install libxslt-dev libxml2-dev
+
+Finally, run this command to install all the required Gems in the correct
+versions:
+
+ bundle install
+
+
+Building and previewing the website
+-----------------------------------
+
+Run this script:
+
+ ./_scripts/build-preview
+
+This will run Jekyll using a base URL of type `file://` for the repository
+directory. This means that it is possible to browse the generated files,
+located in the `_site` directory, using a web browser pointed at your
+filesystem. Unfortunately it does mean that moving the files, or attempting to
+point a web server host at them, will not work.
+
+
+Building and publishing the website
+-----------------------------------
+
+Run this script:
+
+ ./_scripts/build-for-publication
+
+This will run Jekyll with the correct base URL for the live website and place
+the output in the `_site` directory.
+
+The Apache website publication process is based around the Subversion repository; the generated HTML files must be checked in to Subversion, whereupon an automated process will publish the files to the live website.
+
+Starting in a suitable directory, check out the website directory from the repository:
+
+ svn co https://svn.apache.org/repos/asf/incubator/brooklyn/site incubator-brooklyn-site-public
+ cd incubator-brooklyn-site-public
+
+Synchronise the generated site into the Subversion working copy - please amend this command to include the correct paths for your setup:
+
+ rsync -rv --delete --exclude .svn --exclude v ~/incubator-brooklyn-site/_site/ ~/incubator-brooklyn-site-public
+
+Review the changes using the usual `svn` commands - e.g., `status`, `diff`, `add`, `rm`, etc.
+
+Once you are ready to publish, commit the changes to Subversion:
+
+ svn ci -m 'Update Brooklyn (incubating) website'
+
+The changes will become live within a few minutes.
[4/6] git commit: Add build scripts
Posted by ri...@apache.org.
Add build scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/7afae865
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/7afae865
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/7afae865
Branch: refs/heads/master
Commit: 7afae8654c68063622f635e40a1754e60798eed7
Parents: 57c5f0b
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jul 10 11:24:29 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 10 11:24:29 2014 +0000
----------------------------------------------------------------------
_scripts/build-for-publication | 6 ++++++
_scripts/build-preview | 10 ++++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/7afae865/_scripts/build-for-publication
----------------------------------------------------------------------
diff --git a/_scripts/build-for-publication b/_scripts/build-for-publication
new file mode 100755
index 0000000..8ac5dce
--- /dev/null
+++ b/_scripts/build-for-publication
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+set -x
+
+rm -rf _site
+jekyll build
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/7afae865/_scripts/build-preview
----------------------------------------------------------------------
diff --git a/_scripts/build-preview b/_scripts/build-preview
new file mode 100755
index 0000000..832e449
--- /dev/null
+++ b/_scripts/build-preview
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+
+set -x
+
+sitedir=$( cd $( dirname $0 ); cd ..; pwd )/_site
+siteurl="file://${sitedir}/"
+echo > _config_local.yml "url: ${siteurl}"
+
+rm -rf _site
+jekyll build --config _config.yml,_config_local.yml
[3/6] git commit: Update .gitignore
Posted by ri...@apache.org.
Update .gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/57c5f0bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/57c5f0bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/57c5f0bb
Branch: refs/heads/master
Commit: 57c5f0bb8d2843ae86eff1e2def527e994a96439
Parents: 3d2c0f1
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jul 10 11:23:52 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 10 11:23:52 2014 +0000
----------------------------------------------------------------------
.gitignore | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/57c5f0bb/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ca35be0..37a3328 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
_site
+_config_local.yml
+*~
[6/6] git commit: Merge and close PR #2
Posted by ri...@apache.org.
Merge and close PR #2
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/6b184c5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/6b184c5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/6b184c5b
Branch: refs/heads/master
Commit: 6b184c5b779705abeca4da84af9aa5c37ab04e3f
Parents: 81ad105 fbc0a52
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jul 10 11:59:01 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 10 11:59:01 2014 +0000
----------------------------------------------------------------------
style/img/brooklyn-logo-150px.png | Bin 2665 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------