Revert the eager loading of the catalog items - Include the catalog items generation in the documentation build
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/642035ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/642035ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/642035ae Branch: refs/heads/master Commit: 642035ae4e409598f3c47e25d0473a6cfcc1e879 Parents: b2d3f33 Author: Valentin Aitken <[email protected]> Authored: Fri May 1 03:03:22 2015 +0300 Committer: Valentin Aitken <[email protected]> Committed: Tue Jul 14 10:28:05 2015 +0100 ---------------------------------------------------------------------- docs/.gitignore | 1 + docs/_build/build.sh | 12 + docs/_build/list-objects-logback.xml | 42 + docs/style/js/catalog/items.json | 24674 ----------------- .../website/learnmore/catalog/catalog-item.html | 12 +- docs/website/learnmore/catalog/index.html | 11 +- 6 files changed, 60 insertions(+), 24692 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/642035ae/docs/.gitignore ---------------------------------------------------------------------- diff --git a/docs/.gitignore b/docs/.gitignore index 3767b72..34ce063 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,3 +1,4 @@ _site _config_local.yml .sass-cache +./style/js/catalog/items.js \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/642035ae/docs/_build/build.sh ---------------------------------------------------------------------- diff --git a/docs/_build/build.sh b/docs/_build/build.sh index 2f7e395..2cdcffc 100755 --- a/docs/_build/build.sh +++ b/docs/_build/build.sh @@ -179,9 +179,21 @@ function test_site() { } function make_jekyll() { + BROOKLYN_BIN=../usage/dist/target/brooklyn-dist/brooklyn/bin/brooklyn + if [ -f $BROOKLYN_BIN ]; then + ITEMS_JS=style/js/catalog/items.js + echo "Generating catalog items in $ITEMS_JS" + echo -n "var items = " > "$ITEMS_JS" + JAVA_OPTS='-Dlogback.configurationFile=_build/list-objects-logback.xml' $BROOKLYN_BIN \ + list-objects >> "$ITEMS_JS" + echo ";" >> "$ITEMS_JS" + echo "Generating catalog items completed" + fi + echo JEKYLL running with: jekyll build $JEKYLL_CONFIG jekyll build --config $JEKYLL_CONFIG || return 1 echo JEKYLL completed + for DI in "${!DIRS_TO_MOVE[@]}"; do D=${DIRS_TO_MOVE[$DI]} DT=${DIRS_TO_MOVE_TARGET[$DI]} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/642035ae/docs/_build/list-objects-logback.xml ---------------------------------------------------------------------- diff --git a/docs/_build/list-objects-logback.xml b/docs/_build/list-objects-logback.xml new file mode 100644 index 0000000..4ce07ae --- /dev/null +++ b/docs/_build/list-objects-logback.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<configuration> + <property name="logging.basename" scope="context" value="brooklyn" /> + <property name="logging.dir" scope="context" value="./" /> + + <!-- this file defines the default logging configuration for brooklyn projects, + in a way which is intended to be friendly to downstream projects. + + downstream projects may be routed to this file in two situations: + + * running tests (via brooklyn-test-support) + * dependency on `brooklyn-logback-xml` and running in IDE + + this file may be overridden in downstream projects, as may any of the files incldued here. + + for an _assembly_ (i.e. a redistributable binary) a project must supply + a logback.xml. it can route to this file if they wish, or use some of + the files referenced herein, or ignore it altogether. (the reason for + this is that assemblies usually want to declare their own logging anyway.) + --> + + <!-- set default root logger threshhold to info; some categories may get debug --> + <root level="INFO"/> +</configuration> \ No newline at end of file
