brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [49/50] [abbrv] incubator-brooklyn-site git commit: wipe everything and replace with a single README pointing at new merged location
Date Wed, 17 Dec 2014 17:54:26 GMT
wipe everything and replace with a single README pointing at new merged location


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/b1f4f76c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/b1f4f76c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/b1f4f76c

Branch: refs/heads/master
Commit: b1f4f76c4650eea09d4810c2efa9940e54006daa
Parents: 2a58e30
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Dec 17 02:06:09 2014 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Dec 17 02:06:09 2014 +0000

----------------------------------------------------------------------
 README.md                                       |   107 +-
 _build/Gemfile                                  |     8 -
 _build/Gemfile.lock                             |    87 -
 _build/production-build.sh                      |    15 -
 _build/production-config.yml                    |    10 -
 _config.yml                                     |    38 -
 _layouts/website-base.html                      |    76 -
 _layouts/website-landing.html                   |    30 -
 _layouts/website-normal.html                    |    41 -
 _plugins/brooklyn_metadata.rb                   |    60 -
 _plugins/dependency_url.rb                      |    31 -
 _plugins/read.rb                                |    60 -
 _plugins/site_structure.rb                      |    85 -
 index.md                                        |    12 -
 style/css/website.css                           |    49 -
 style/deps/README.md                            |     3 -
 .../glyphicons-halflings-regular.eot            |   Bin 20335 -> 0 bytes
 .../glyphicons-halflings-regular.svg            |   229 -
 .../glyphicons-halflings-regular.ttf            |   Bin 41280 -> 0 bytes
 .../glyphicons-halflings-regular.woff           |   Bin 23320 -> 0 bytes
 style/deps/bootstrap-theme.css                  |   346 -
 style/deps/bootstrap.css                        |  5784 ----
 style/deps/bootstrap.js                         |  1951 --
 style/deps/bootstrap.min.css                    |     7 -
 style/deps/bootstrap.min.js                     |     6 -
 style/deps/jquery.js                            |  9190 ------
 style/deps/jquery.min.js                        |     4 -
 style/deps/underscore-min.js                    |     6 -
 style/deps/underscore-min.map                   |     1 -
 style/img/apache-brooklyn-logo-244px-wide.png   |   Bin 4892 -> 0 bytes
 style/img/apache-brooklyn-logo-817px-wide.png   |   Bin 10688 -> 0 bytes
 style/img/bridge-large-no-title.png             |   Bin 66113 -> 0 bytes
 style/js/_readme.txt                            |     2 -
 style/js/underscore-min.js                      |     6 -
 style/js/underscore-min.map                     |     1 -
 website/community/committers.md                 |   119 -
 website/community/fork-after.png                |   Bin 134377 -> 0 bytes
 website/community/fork-before.png               |   Bin 131674 -> 0 bytes
 website/community/fork-new.png                  |   Bin 137626 -> 0 bytes
 website/community/how-to-contribute-docs.md     |   140 -
 website/community/how-to-contribute.md          |    85 -
 website/community/index.md                      |    86 -
 website/community/migrate-to-apache.md          |   117 -
 website/community/pull-request.png              |   Bin 94166 -> 0 bytes
 website/documentation.md                        |    19 -
 website/documentation/increase-entropy.md       |    31 -
 website/documentation/install-on-server.md      |   122 -
 website/documentation/passwordless-ssh.md       |    29 -
 website/documentation/ssh-key.md                |     9 -
 website/download.md                             |    70 -
 website/glossary.md                             |    92 -
 website/index.md                                |    71 -
 website/learnmore/catalog/common.js             |    94 -
 .../brooklyn.enricher.DeltaEnricher.html        |    59 -
 .../brooklyn.enricher.HttpLatencyDetector.html  |    59 -
 .../brooklyn.enricher.RollingMeanEnricher.html  |    59 -
 ....enricher.RollingTimeWindowMeanEnricher.html |    59 -
 ...klyn.enricher.TimeFractionDeltaEnricher.html |    59 -
 ...klyn.enricher.TimeWeightedDeltaEnricher.html |    59 -
 .../brooklyn.enricher.basic.Aggregator.html     |    59 -
 .../brooklyn.enricher.basic.Combiner.html       |    59 -
 .../brooklyn.enricher.basic.Propagator.html     |    59 -
 .../brooklyn.enricher.basic.Transformer.html    |    59 -
 ...ooklyn.policy.ha.ServiceFailureDetector.html |    59 -
 ...lyn.entity.basic.VanillaSoftwareProcess.html |    66 -
 ...ntity.brooklynnode.BrooklynEntityMirror.html |    66 -
 ...ooklyn.entity.brooklynnode.BrooklynNode.html |    66 -
 ...lyn.entity.database.mariadb.MariaDbNode.html |    66 -
 ...rooklyn.entity.database.mysql.MySqlNode.html |    66 -
 ...tity.database.postgresql.PostgreSqlNode.html |    66 -
 ...lyn.entity.database.rubyrep.RubyRepNode.html |    66 -
 .../brooklyn.entity.machine.MachineEntity.html  |    66 -
 ...ntity.messaging.activemq.ActiveMQBroker.html |    66 -
 ...lyn.entity.messaging.kafka.KafkaCluster.html |    66 -
 ...ooklyn.entity.messaging.qpid.QpidBroker.html |    66 -
 ...yn.entity.messaging.rabbit.RabbitBroker.html |    66 -
 .../brooklyn.entity.messaging.storm.Storm.html  |    66 -
 ....entity.messaging.storm.StormDeployment.html |    66 -
 ...oklyn.entity.monitoring.monit.MonitNode.html |    66 -
 ...oklyn.entity.network.bind.BindDnsServer.html |    66 -
 ...ity.nosql.cassandra.CassandraDatacenter.html |    66 -
 ....entity.nosql.cassandra.CassandraFabric.html |    66 -
 ...yn.entity.nosql.cassandra.CassandraNode.html |    66 -
 ...entity.nosql.couchbase.CouchbaseCluster.html |    66 -
 ...yn.entity.nosql.couchbase.CouchbaseNode.html |    66 -
 ...ooklyn.entity.nosql.couchdb.CouchDBNode.html |    66 -
 ...osql.elasticsearch.ElasticSearchCluster.html |    66 -
 ...y.nosql.elasticsearch.ElasticSearchNode.html |    66 -
 ...klyn.entity.nosql.mongodb.MongoDBServer.html |    66 -
 ...ty.nosql.mongodb.sharding.MongoDBRouter.html |    66 -
 ...ngodb.sharding.MongoDBShardedDeployment.html |    66 -
 ...rooklyn.entity.nosql.redis.RedisCluster.html |    66 -
 .../brooklyn.entity.nosql.redis.RedisStore.html |    66 -
 .../brooklyn.entity.nosql.riak.RiakCluster.html |    66 -
 .../brooklyn.entity.nosql.riak.RiakNode.html    |    66 -
 .../brooklyn.entity.nosql.solr.SolrServer.html  |    66 -
 ...ooklyn.entity.osgi.karaf.KarafContainer.html |    66 -
 .../brooklyn.entity.pool.ServerPool.html        |    66 -
 ...klyn.entity.proxy.nginx.NginxController.html |    66 -
 ...y.webapp.ControlledDynamicWebAppCluster.html |    66 -
 ...klyn.entity.webapp.DynamicWebAppCluster.html |    66 -
 ...ooklyn.entity.webapp.jboss.JBoss6Server.html |    66 -
 ...ooklyn.entity.webapp.jboss.JBoss7Server.html |    66 -
 ...ooklyn.entity.webapp.jetty.Jetty6Server.html |    66 -
 ...ntity.webapp.nodejs.NodeJsWebAppService.html |    66 -
 ...oklyn.entity.webapp.tomcat.TomcatServer.html |    66 -
 ...klyn.entity.zookeeper.ZooKeeperEnsemble.html |    66 -
 ...brooklyn.entity.zookeeper.ZooKeeperNode.html |    66 -
 website/learnmore/catalog/index.html            |   147 -
 website/learnmore/catalog/items.css             |   153 -
 website/learnmore/catalog/items.js              | 24674 -----------------
 website/learnmore/catalog/libs/js/bloodhound.js |   727 -
 ...brooklyn.entity.pool.ServerPoolLocation.html |    62 -
 .../brooklyn.location.AddressableLocation.html  |    62 -
 .../brooklyn.location.MachineLocation.html      |    62 -
 ...tMixins$RichMachineProvisioningLocation.html |    62 -
 ...yn.location.MachineProvisioningLocation.html |    62 -
 ...rooklyn.location.basic.AbstractLocation.html |    62 -
 ....AggregatingMachineProvisioningLocation.html |    62 -
 ...ic.FixedListMachineProvisioningLocation.html |    62 -
 ...neProvisioningLocation$LocalhostMachine.html |    62 -
 ...ic.LocalhostMachineProvisioningLocation.html |    62 -
 ...rooklyn.location.basic.LocationInternal.html |    62 -
 .../brooklyn.location.basic.MultiLocation.html  |    62 -
 ...ooklyn.location.basic.SimulatedLocation.html |    62 -
 ...basic.SingleMachineProvisioningLocation.html |    62 -
 ...oklyn.location.basic.SshMachineLocation.html |    62 -
 ...bstractCloudMachineProvisioningLocation.html |    62 -
 ...AbstractJcloudsSubnetSshMachineLocation.html |    62 -
 ...ooklyn.location.jclouds.JcloudsLocation.html |    62 -
 ...ation.jclouds.JcloudsSshMachineLocation.html |    62 -
 ...followthesun.DefaultFollowTheSunModel$1.html |    62 -
 ...lyn.policy.autoscaling.AutoScalerPolicy.html |    59 -
 ....policy.followthesun.FollowTheSunPolicy.html |    59 -
 ...lyn.policy.ha.ConnectionFailureDetector.html |    59 -
 .../brooklyn.policy.ha.ServiceReplacer.html     |    59 -
 .../brooklyn.policy.ha.ServiceRestarter.html    |    59 -
 ...olicy.loadbalancing.LoadBalancingPolicy.html |    59 -
 website/learnmore/index.md                      |    11 -
 website/learnmore/theory.md                     |   177 -
 website/learnmore/yaml-explained.md             |     9 -
 website/quickstart/_my-web-cluster.yaml         |    19 -
 website/quickstart/brooklyn.properties          |   266 -
 website/quickstart/catalog.xml                  |    22 -
 ...cation-catalog-web-cluster-with-db-large.png |   Bin 131618 -> 0 bytes
 ...talog-web-cluster-with-db-location-large.png |   Bin 152721 -> 0 bytes
 ...ion-catalog-web-cluster-with-db-location.png |   Bin 86425 -> 0 bytes
 ...-application-catalog-web-cluster-with-db.png |   Bin 76065 -> 0 bytes
 .../images/add-application-modal-yaml.png       |   Bin 68401 -> 0 bytes
 .../images/jboss7-cluster-policies-large.png    |   Bin 157883 -> 0 bytes
 .../images/jboss7-cluster-policies.png          |   Bin 94056 -> 0 bytes
 .../images/my-db-activities-large.png           |   Bin 208313 -> 0 bytes
 website/quickstart/images/my-db-activities.png  |   Bin 130262 -> 0 bytes
 .../images/my-web-cluster-starting.png          |   Bin 32948 -> 0 bytes
 .../my-web-cluster-stop-confirm-large.png       |   Bin 148155 -> 0 bytes
 .../images/my-web-cluster-stop-confirm.png      |   Bin 79280 -> 0 bytes
 .../quickstart/images/my-web-summary-large.png  |   Bin 178785 -> 0 bytes
 website/quickstart/images/my-web-summary.png    |   Bin 80583 -> 0 bytes
 website/quickstart/images/my-web.png            |   Bin 83081 -> 0 bytes
 website/quickstart/index.md                     |   215 -
 website/quickstart/policies-and-catalogs.md     |    67 -
 161 files changed, 3 insertions(+), 50960 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6cac8b0..1a1f2c0 100644
--- a/README.md
+++ b/README.md
@@ -1,106 +1,5 @@
-Brooklyn Website source
+Legacy Brooklyn Website
 =======================
 
-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, and then to the `_scripts` subdirectory.
-
-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 these 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 inside `_scripts` to install all the required Gems 
-in the correct versions:
-
-    bundle install
-
-Anytime you need to reset your Ruby environment for jekyll to run correctly,
-return to the `_scripts` directory and re-run the above command.
-
-
-Building and previewing the website
------------------------------------
-
-### Using Jekyll's in-built server
-
-Run the command:
-
-    jekyll serve --watch
-    
-This will start up a local web server. The URL is printed by Jekyll when the server starts,
-e.g. http://localhost:4000/brooklyn/ . The server will continue to run until you press Ctrl+C.
-Modified files will be detected and regenerated (but that might take up to 1m).
-Leave off the `--watch` argument to abandon that behaviour, or use `jekyll build` instead
-to generate a site in `_site` without a server, for instance if your browser supports running
from disk.
-
-
-
-### Combining with Brooklyn user-manual / version docs
-
-TODO: Some links should come from the incubator-brooklyn/docs/ project.
-They can run in debug mode on a different port.
-
-
-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.
+The Brooklyn website is now combined with the version-specific docs at:
+https://github.com/apache/incubator-brooklyn/tree/master/docs 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_build/Gemfile
----------------------------------------------------------------------
diff --git a/_build/Gemfile b/_build/Gemfile
deleted file mode 100644
index bc46bf5..0000000
--- a/_build/Gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-#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/b1f4f76c/_build/Gemfile.lock
----------------------------------------------------------------------
diff --git a/_build/Gemfile.lock b/_build/Gemfile.lock
deleted file mode 100644
index cf69053..0000000
--- a/_build/Gemfile.lock
+++ /dev/null
@@ -1,87 +0,0 @@
-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/b1f4f76c/_build/production-build.sh
----------------------------------------------------------------------
diff --git a/_build/production-build.sh b/_build/production-build.sh
deleted file mode 100755
index 6e0fb18..0000000
--- a/_build/production-build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash -e
-
-function build() {
-  echo JEKYLL running with: jekyll build --config _config.yml,_build/production-config.yml
-  jekyll build --config _config.yml,_build/production-config.yml || return 1
-  echo JEKYLL completed, now promoting _site/website/ to _site/
-  # the generated files are already in _site/ due to url rewrites along the way, but images
etc are not
-  cp -r _site/website/* _site/
-  rm -rf _site/website 
-  echo FINISHED: website pages are in `pwd`/_site 
-}
-
-rm -rf _site
-build || echo ERROR: could not build docs in `pwd`
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_build/production-config.yml
----------------------------------------------------------------------
diff --git a/_build/production-config.yml b/_build/production-config.yml
deleted file mode 100644
index 38ade04..0000000
--- a/_build/production-config.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-url: https://brooklyn.incubator.apache.org
-
-path:
-  website: ""
-
-dependency_mode: remote
-
-# NB: should inherit (and override) the root _config.yml
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index 5e39e69..0000000
--- a/_config.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# Development mode jekyll configuration
-
-# This will be picked up and the docs should display with a simple:
-#
-#     jekyll serve --watch
-
-encoding: utf-8
-
-# See in _build/ for more advanced dev and prod considerations.
-
-# links should either be relative or use {{site.path.website}}
-
-url_root: http://0.0.0.0:4000
-
-path:
-  style: /style
-  website: /website 
-  v: /v
-# can insert a prefix above, for *all* paths, if we want to test in a subdirectory
-# TODO some hard links to /v/... currently
-
-# site.url is deprecated in favour of site.path.website, and in the few places that need
a server name, url_root
-# url: http://0.0.0.0:4000/website
-
-# no longer putting things under /website; there is a new website/ dir in the folder structure
for most things
-baseurl: ""
-
-# Use local copies of dependencies in dev build (switched to remote using URLs for prod build)
-dependency_mode: local
-dependency_urls:
-  bootstrap.css: https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css
-  bootstrap.js: https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js
-  jquery.js: https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js
-
-# These files should not be included in the final build (in addition to _* contents)
-
-exclude: ['README.md']

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_layouts/website-base.html
----------------------------------------------------------------------
diff --git a/_layouts/website-base.html b/_layouts/website-base.html
deleted file mode 100644
index 17cb459..0000000
--- a/_layouts/website-base.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-<title>{{ page.title }} - Apache Brooklyn (incubating)</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="{% dependency_url bootstrap.css %}" rel="stylesheet">
-<link href="{{site.path.style}}/deps/bootstrap-theme.css" rel="stylesheet">
-<link href="{{site.path.style}}/css/website.css" rel="stylesheet">
-</head>
-
-<body>
-
-<nav class="navbar navbar-default navbar-fixed-top" id="header" role="navigation">
-    <div class="container">
-        <div class="container-fluid">
-            <!-- Brand and toggle get grouped for better mobile display -->
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                {% if page.navgroup != 'home' %}<a class="navbar-brand" href="{{site.path.website}}/"><img
src="{{site.path.style}}/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>{%
endif %}
-            </div>
-
-            <!-- Collect the nav links, forms, and other content for toggling -->
-            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-                <ul class="nav navbar-nav navbar-right">
-                    {% for navgroup in site.data.navgroups %}
-                    {% if navgroup.page.menu2 %}
-                    <li class="dropdown{% if page.navgroup == navgroup.id %} active{%
endif %}">
-                        <a href="{{navgroup.page.url}}">{{navgroup.title}}</a>
-                        <ul class="dropdown-menu" role="menu">
-                            <li>
-                                <a href="{{navgroup.page.url}}">{{navgroup.title_in_menu}}</a>
-                            </li>
-                            <li class="divider"></li>
-                            {% for child in navgroup.page.menu2 %}
-                            <li>
-                                <a href="{{child.reference.url}}">{{child.reference.title}}</a>
-                            </li>
-                            {% endfor %}
-                        </ul>
-                    </li><!-- {{ navgroup.id }} -->
-                    {% else %}
-                    <li class="{% if page.navgroup == navgroup.id %}active{% endif %}"><a
href="{{navgroup.page.url}}">{{navgroup.title}}</a></li><!-- {{ navgroup.id
}} -->
-                    {% endif %}
-                    {% endfor %}
-                </ul>
-            </div><!-- /.navbar-collapse -->
-        </div><!-- /.container-fluid -->
-    </div>
-</nav>
-
-{{ content }}
-
-<script src="{% dependency_url jquery.js %}"></script>
-<script src="{% dependency_url bootstrap.js %}"></script>
-
-<script language="JavaScript" type="application/javascript">
-    $(window).resize(function () { 
-        $('body').css('padding-top', parseInt($('#header').css("height"))+10);
-        $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
-    });
-    
-    $(window).load(function () { 
-        $('body').css('padding-top', parseInt($('#header').css("height"))+10);        
-        $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
-    });</script>
-</body>
-
-</html>
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_layouts/website-landing.html
----------------------------------------------------------------------
diff --git a/_layouts/website-landing.html b/_layouts/website-landing.html
deleted file mode 100644
index 6049fb0..0000000
--- a/_layouts/website-landing.html
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# layout for front page, contianing only the footer, with a bit more text
-layout: website-base
----
-<div class="container slightlyNarrowContainer">
-    {{ content }}
-</div>
-
-<div id="footer">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-9 text-muted">
-                Apache Brooklyn is an effort undergoing incubation at The Apache Software
Foundation (ASF), sponsored by the 
-                Apache Incubator. Incubation is required of all newly accepted projects until
a further review indicates that the
-                infrastructure, communications, and decision making process have stabilized
in a manner consistent with other
-                successful ASF projects. While incubation status is not necessarily a reflection
of the completeness or stability of
-                the code, it does indicate that the project has yet to be fully endorsed
by the ASF.
-                Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License v2.0</a>.
-            </div>
-            <div class="col-md-3">
-                <p><img src="https://incubator.apache.org/images/egg-logo.png" alt="Apache
Incubator" /></p>
-                <p>
-                    <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/{{
page.path }}">Edit This Page</a>
-                    <br />
-                    <a href="https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html">help
with editing</a>
-                </p>
-            </div>
-        </div>
-    </div>
-</div>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_layouts/website-normal.html
----------------------------------------------------------------------
diff --git a/_layouts/website-normal.html b/_layouts/website-normal.html
deleted file mode 100644
index 2fb7110..0000000
--- a/_layouts/website-normal.html
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# layout for most website (non-guide) pages, inheriting base for the menu bar, and providing
a main column of content and a menu column
-layout: website-base
----
-<div class="container">
-    <div class="row">
-        <div class="col-md-9">
-            <h1>{{ page.title }}</h1>
-            {{ content }}
-        </div>
-        <div class="col-md-3">
-            {% if page.menu2 %}
-            <div class="list-group">
-                <h4><a href="{{page.menu2parent.url}}" class="list-group-item{%
if page.menu2parent.path == page.path %} active{% endif %}">{{ page.menu2parent.title }}</a></h4>
-                {% for child in page.menu2 %}
-                <a href="{{child.reference.url}}" class="list-group-item{% if child.reference.path
== page.path %} active{% endif %}">{{ child.reference.title }}</a>
-                {% endfor %}
-            </div>
-            {% endif %}
-        </div>
-    </div>
-</div>
-
-<div id="footer">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-10 text-muted">
-                Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
-                License v2.0</a>.
-                <br />
-                Apache Brooklyn is currently undergoing Incubation at The Apache Software
-                Foundation.
-            </div>
-            <div class="col-md-2">
-                <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn-site/edit/master/{{
page.path }}">Edit This Page</a>
-                <br />
-                <a href="{{ site.url_root }}{{ site.path.website }}/community/how-to-contribute-docs.html">help
with editing</a>
-            </div>
-        </div>
-    </div>
-</div>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_plugins/brooklyn_metadata.rb
----------------------------------------------------------------------
diff --git a/_plugins/brooklyn_metadata.rb b/_plugins/brooklyn_metadata.rb
deleted file mode 100644
index c0dcc3d..0000000
--- a/_plugins/brooklyn_metadata.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# Inserts several useful fields that can be referenced using {{ name }} syntax
-#
-# site.data.brooklyn.version: brooklyn version, such as 0.7.0-M1
-# site.data.brooklyn.is_snapshot: true if this is a snapshot version, otherwise false
-# site.data.brooklyn.url.userguide: URL of the user guide for this version
-#
-module BrooklynMetadata
-
-  BROOKLYN_VERSION = "0.7.0-M1" unless defined? BROOKLYN_VERSION
-
-  class Generator < Jekyll::Generator
-    def generate(site)
-      is_snapshot = BrooklynMetadata::BROOKLYN_VERSION.end_with?('-SNAPSHOT')
-      
-      if is_snapshot
-        url_set = {
-            "search" => {
-                "all" => "https://oss.sonatype.org/index.html#nexus-search;gav~io.brooklyn~~#{
BrooklynMetadata::BROOKLYN_VERSION }~~",
-                "dist" => "https://oss.sonatype.org/index.html#nexus-search;gav~io.brooklyn~brooklyn-dist~#{
BrooklynMetadata::BROOKLYN_VERSION }~~",
-                "alljar" => "https://oss.sonatype.org/index.html#nexus-search;gav~io.brooklyn~brooklyn-dist~#{
BrooklynMetadata::BROOKLYN_VERSION }~~"
-            },
-            "dist" => {
-                "base" => "https://oss.sonatype.org/content/groups/public/io/brooklyn/brooklyn-dist/#{
BrooklynMetadata::BROOKLYN_VERSION }/",
-                "zip" => "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn&v=#{
BrooklynMetadata::BROOKLYN_VERSION }&a=brooklyn-dist&c=dist&e=zip",
-                "tgz" => "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn&v=#{
BrooklynMetadata::BROOKLYN_VERSION }&a=brooklyn-dist&c=dist&e=tar.gz"
-            },
-            "alljar" => {
-                "base" => "https://oss.sonatype.org/content/groups/public/io/brooklyn/brooklyn-all/#{
BrooklynMetadata::BROOKLYN_VERSION }/",
-                "jar" => "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn&v=#{
BrooklynMetadata::BROOKLYN_VERSION }}&a=brooklyn-all&c=with-dependencies&e=jar"
-            }
-        }
-      else
-        url_set = {
-            "search" => {
-                "all" => "http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.brooklyn%22%20AND%20v%3A%22#{
BrooklynMetadata::BROOKLYN_VERSION }%22",
-                "dist" => "http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.brooklyn%22%20AND%20a%3A%22brooklyn-dist%22%20AND%20v%3A%22#{
BrooklynMetadata::BROOKLYN_VERSION }%22",
-                "alljar" => "http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.brooklyn%22%20AND%20a%3A%22brooklyn-all%22%20AND%20v%3A%22#{
BrooklynMetadata::BROOKLYN_VERSION }%22"
-            },
-            "dist" => {
-                "base" => "http://repo1.maven.org/maven2/io/brooklyn/brooklyn-dist/#{
BrooklynMetadata::BROOKLYN_VERSION }/",
-                "zip" => "http://repo1.maven.org/maven2/io/brooklyn/brooklyn-dist/#{ BrooklynMetadata::BROOKLYN_VERSION
}/brooklyn-dist-#{ BrooklynMetadata::BROOKLYN_VERSION }-dist.zip",
-                "tgz" => "http://repo1.maven.org/maven2/io/brooklyn/brooklyn-dist/#{ BrooklynMetadata::BROOKLYN_VERSION
}/brooklyn-dist-#{ BrooklynMetadata::BROOKLYN_VERSION }-dist.tar.gz"
-            },
-            "alljar" => {
-                "base" => "http://repo1.maven.org/maven2/io/brooklyn/brooklyn-all/#{ BrooklynMetadata::BROOKLYN_VERSION
}/",
-                "jar" => "http://repo1.maven.org/maven2/io/brooklyn/brooklyn-all/#{ BrooklynMetadata::BROOKLYN_VERSION
}/brooklyn-all-#{ BrooklynMetadata::BROOKLYN_VERSION }-with-dependencies.jar"
-            }
-        }
-      end
-      
-      url_set['userguide'] = "#{site.config['url']}/v/#{BrooklynMetadata::BROOKLYN_VERSION}"
-      
-      site.data['brooklyn'] = {
-          "version" => BrooklynMetadata::BROOKLYN_VERSION,
-          "is_snapshot" => is_snapshot,
-          "url" => url_set
-      }
-    end
-  end
-end

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_plugins/dependency_url.rb
----------------------------------------------------------------------
diff --git a/_plugins/dependency_url.rb b/_plugins/dependency_url.rb
deleted file mode 100644
index 8a72e17..0000000
--- a/_plugins/dependency_url.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# tag to write the correct URL depending whether we are running with dependencies local (for
offline) or remote (eg using a CDN)
-
-# specify a map of <basename>: <remote_url> in the key `dependency_urls` in your
`_config.yml`,
-# then, if `dependency_mode: local` is defined, the path `{{site.path.style}}/deps/<basename>`
will be used,
-# otherwise the <remote_url> will be used
-
-module JekyllDependencyUrl
-  class DependencyUrlTag < Liquid::Tag
-    def initialize(tag_name, text, tokens)
-      super
-      @text = text
-    end
-    def render(context)
-	jekyllSite = context.registers[:site]
-        mode = context['site']['dependency_mode']
-        if mode != 'local'
-          result = context['site']['dependency_urls'][@text.strip]
-          if result.to_s == ''
-            raise 'No value in dependency_urls specified for ' + @text.strip
-          end
-        end
-        if result.to_s == ''
-          result = context['site']['path']['style'] + "/deps/" + @text.strip
-        end
-        return result
-    end
-  end
-end
-
-Liquid::Template.register_tag('dependency_url', JekyllDependencyUrl::DependencyUrlTag)
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_plugins/read.rb
----------------------------------------------------------------------
diff --git a/_plugins/read.rb b/_plugins/read.rb
deleted file mode 100644
index e4058e5..0000000
--- a/_plugins/read.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# tag to read and insert a file relative to the current working directory
-# (like include, but in the dir where it is invoked)
-
-# there is also readj which reads a file and applies jekyll processing to it
-# handy if we want to include a toc.json file which itself calls {% readj child/toc.json
%}
-# (note however variables do not seem to be exported when use readj (TODO),
-# although they are exported if you have _includes/file.md and use the standard include file)
-
-# the argument can be a variable or a filename literal (not quoted)
-# TODO: figure out how to accept a quoted string as an argument
-
-module JekyllRead
-  class ReadTag < Liquid::Tag
-    def initialize(tag_name, text, tokens)
-      super
-      @text = text
-    end
-    def render(context)
-	jekyllSite = context.registers[:site]
-	dir = jekyllSite.source+'/'+File.dirname(context['page']['path'])
-	filename = @text.strip
-        filename = context[filename] || filename
-	if !filename.match(/^\/.*/) 
-		filename = dir + '/' + filename
-	else
-		filename = jekyllSite.source+'/'+filename
-	end
-	filename = filename.gsub(/\/\/+/,'/')
-	file = File.open(filename, "rb")
-	return file.read
-    end
-  end
-
-  class ReadjTag < Liquid::Tag
-    def initialize(tag_name, text, tokens)
-      super
-      @text = text
-    end
-    def render(context)
-	jekyllSite = context.registers[:site]
-	filename = @text.strip
-	filename = context[filename] || filename
-# support vars (above) and relative paths in filename (below - need the right path if there
is a subsequent link)
-        dir = filename
-	if !filename.match(/^\/.*/) 
-		dir = File.dirname(context['page']['path']) + '/' + filename
-	end
-	dir = dir.gsub(/\/\/+/,'/')
-	filename = dir.sub(/^.*\//, '')
-	dir = dir.gsub(/\/[^\/]*$/, '/')
-	targetPage = Jekyll::Page.new(jekyllSite, jekyllSite.source, dir, filename)
-	targetPage.render(jekyllSite.layouts, jekyllSite.site_payload)
-	targetPage.output
-    end
-  end
-end
-
-Liquid::Template.register_tag('read', JekyllRead::ReadTag)
-Liquid::Template.register_tag('readj', JekyllRead::ReadjTag)
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/_plugins/site_structure.rb
----------------------------------------------------------------------
diff --git a/_plugins/site_structure.rb b/_plugins/site_structure.rb
deleted file mode 100644
index 6cfe1f9..0000000
--- a/_plugins/site_structure.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# Builds a hierarchical structure for the site, based on the YAML front matter of each page
-# Starts from a page called "index.md", and follows "children" links in the YAML front matter
-module SiteStructure
- 
-  BROOKLYN_WEBSITE_ROOT = "/website/index.md" unless defined? BROOKLYN_WEBSITE_ROOT
-  
-  class Generator < Jekyll::Generator
-    def find_page_with_path_absolute_or_relative_to(site, path, referrent)
-      page = site.pages.detect { |page| "/"+page.path == path }
-      if !page && referrent
-        page = site.pages.detect { |page| "/"+page.path == "/"+File.dirname(referrent.path)+"/"+path
}
-      end
-      if !page
-        page = site.pages.detect { |page| page.path == path }
-        puts "WARNING: link to #{path} in #{referrent ? referrent.path : "root"} uses legacy
absolute syntax without leading slash" if page
-      end
-
-      throw "Could not find a page called: #{path} (referenced from #{referrent ? referrent.path
: "root"})" unless page
-
-      if (page.url.start_with?("/website"))
-        page.url.slice!("/website")
-        page.url.prepend(site.config['path']['website'])
-      end
- 
-      page     
-    end
-
-    def generate(site)
-      root_page = find_page_with_path_absolute_or_relative_to(site, SiteStructure::BROOKLYN_WEBSITE_ROOT,
nil)
-      navgroups = root_page.data['navgroups']
-      navgroups.each do |ng|
-        ng['page'] = find_page_with_path_absolute_or_relative_to(site, ng['page'], root_page)
-        if not ng['title_in_menu']
-          ng['title_in_menu'] = ng['title'].capitalize
-        end
-      end
-      site.data['navgroups'] = navgroups
-      site.data['structure'] = gen_structure(site, SiteStructure::BROOKLYN_WEBSITE_ROOT,
nil, navgroups)
-    end
-    
-    def gen_structure(site, pagename, parent, navgroups)
-      page = find_page_with_path_absolute_or_relative_to(site, pagename, parent)
-      
-      # My navgroup is (first rule matches):
-      # 1. what I have explicitly declared
-      # 2. if I find my path referred to in the global navgroup list
-      # 3. my parent's navgroup
-      unless page.data['navgroup']
-        match = navgroups.detect { |ng| ng['page'] == page }
-        if match
-          page.data['navgroup'] = match['id']
-        elsif parent
-          page.data['navgroup'] = parent.data['navgroup']
-        end
-      end
-      
-      # Figure out second level menu
-      # If there's no parent => I'm at the top level, so no action
-      # If there's a parent, but parent has no parent => I'm at second level, so set second-level
menu
-      # Otherwise, use the parent's second level menu
-      if parent && !parent.data['parent']
-        page.data['menu2parent'] = page
-        page.data['menu2'] = page.data['children']
-      elsif parent && parent.data['parent']
-        page.data['menu2parent'] = parent.data['menu2parent']
-        page.data['menu2'] = parent.data['menu2']
-      end
-      
-      page.data['parent'] = parent
-      if page.data['children']
-        page.data['children'].each do |c|
-          if c['path']
-            # links to another Jekyll site-structured page
-            c['reference'] = gen_structure(site, c['path'], page, navgroups)
-          elsif c['link']
-            # links to a non-site-structured page, on this site or elsewhere
-            c['reference'] = { 'url' => c['link'], 'title' => c['title'] }
-          end
-        end
-      end
-      
-      page
-    end
-  end
-end

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/index.md
----------------------------------------------------------------------
diff --git a/index.md b/index.md
deleted file mode 100644
index 021df26..0000000
--- a/index.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: website-normal
-title: Brooklyn Website and Docs (dev build)
----
-
-<i>This page is not copied into release builds. It is here as a convenience when doing
dev builds.</i>
-
-Consider looking at:
-
-* <a href="website/">the brooklyn website</a>
-
-Also see the file <code>README.md</code> in this directory.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/style/css/website.css
----------------------------------------------------------------------
diff --git a/style/css/website.css b/style/css/website.css
deleted file mode 100644
index 135c2b0..0000000
--- a/style/css/website.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Sticky footer styles
--------------------------------------------------- */
-html {
-    position: relative;
-    min-height: 100%;
-}
-
-@media (min-width: 1200px) {
-    .slightlyNarrowContainer {
-        width: 970px;
-    }
-}
-
-.navbar-brand {
-    margin-top: -4px;
-    margin-left: -30px !important;
-}
-
-ul.nav li.dropdown:hover > ul.dropdown-menu {
-    display: block;
-}
-
-#apachebrooklynbanner {
-    background-image: url("../img/apache-brooklyn-logo-817px-wide.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 817px;
-    height: 99px;
-    margin-bottom: 50px;
-}
-
-#brooklynbridge {
-    background-image: url("../img/bridge-large-no-title.png");
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 342px;
-    height: 242px;
-}
-
-#footer {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    /* Set the fixed height of the footer here */
-    padding-top: 1em;
-    padding-bottom: 1em;
-    background-color: #f5f5f5;
-    text-align: center;
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/style/deps/README.md
----------------------------------------------------------------------
diff --git a/style/deps/README.md b/style/deps/README.md
deleted file mode 100644
index 997e1ad..0000000
--- a/style/deps/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-
-This directory contains third-party dependencies.  Originals are downloaded from the locations
described in /_config.yml.
-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/b1f4f76c/style/deps/bootstrap-fonts/glyphicons-halflings-regular.eot
----------------------------------------------------------------------
diff --git a/style/deps/bootstrap-fonts/glyphicons-halflings-regular.eot b/style/deps/bootstrap-fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index 4a4ca86..0000000
Binary files a/style/deps/bootstrap-fonts/glyphicons-halflings-regular.eot and /dev/null differ


Mime
View raw message