You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/07/27 18:58:34 UTC
[1/3] incubator-brooklyn git commit: Fix make-javadoc.sh to work
without brooklyn-all-with-dependencies (because it's been removed)
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master c2e55c0f0 -> bf5258b57
Fix make-javadoc.sh to work without brooklyn-all-with-dependencies (because it's been removed)
Conflicts:
docs/_build/make-javadoc.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e11a3a22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e11a3a22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e11a3a22
Branch: refs/heads/master
Commit: e11a3a226ec6f2bf178af888e6c1e0837c09ddf7
Parents: c2e55c0
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 27 15:10:57 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 27 15:19:35 2015 +0100
----------------------------------------------------------------------
docs/_build/make-javadoc.sh | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e11a3a22/docs/_build/make-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_build/make-javadoc.sh b/docs/_build/make-javadoc.sh
index 8af69e5..56e3bb5 100755
--- a/docs/_build/make-javadoc.sh
+++ b/docs/_build/make-javadoc.sh
@@ -24,13 +24,7 @@ export DATESTAMP=`date "+%Y-%m-%d"`
export SHA1STAMP=`git rev-parse HEAD`
# BROOKLYN_VERSION_BELOW
-export BROOKLYN_JAVADOC_CLASSPATH=../../usage/all/target/brooklyn-all-0.8.0-SNAPSHOT-with-dependencies.jar
-
-if [ \! -f ${BROOKLYN_JAVADOC_CLASSPATH} ]; then
- echo "Expected to find ${BROOKLYN_JAVADOC_CLASSPATH}"
- echo "Please run a full Maven build in the project root"
- exit 1
-fi
+export BROOKLYN_JAVADOC_CLASSPATH=$( mvn -f ../../pom.xml --projects :brooklyn-all dependency:build-classpath | grep -E -v '^\[[A-Z]+\]' )
echo "building javadoc at $DATESTAMP from:
$SOURCE_PATHS"
[2/3] incubator-brooklyn git commit: Fix broken links in guide
Posted by al...@apache.org.
Fix broken links in guide
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6df2f3a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6df2f3a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6df2f3a3
Branch: refs/heads/master
Commit: 6df2f3a3502ac008728c918d17b58b0fe55fc8cd
Parents: e11a3a2
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 27 15:11:14 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 27 15:19:36 2015 +0100
----------------------------------------------------------------------
docs/guide/ops/brooklyn_properties.md | 2 +-
docs/guide/ops/install-on-server.md | 2 +-
docs/guide/ops/locations/index.md | 2 +-
docs/guide/ops/requirements.md | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6df2f3a3/docs/guide/ops/brooklyn_properties.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/brooklyn_properties.md b/docs/guide/ops/brooklyn_properties.md
index a7cbbf3..450252a 100644
--- a/docs/guide/ops/brooklyn_properties.md
+++ b/docs/guide/ops/brooklyn_properties.md
@@ -15,7 +15,7 @@ children:
The file `~/.brooklyn/brooklyn.properties` is read when Brooklyn starts
to load server configuration values.
A different properties file can be specified either additionally or instead
-through [CLI options](cli.html#configuration).
+through [CLI options](launch.html#configuration-files).
A template [brooklyn.properties]({{brooklyn_properties_url_path}}) file is available,
with abundant comments.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6df2f3a3/docs/guide/ops/install-on-server.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/install-on-server.md b/docs/guide/ops/install-on-server.md
index 6c3455f..96c70a5 100644
--- a/docs/guide/ops/install-on-server.md
+++ b/docs/guide/ops/install-on-server.md
@@ -50,7 +50,7 @@ Before installing Apache Brooklyn, it is recommented to configure the host as fo
* enable [passwordless ssh login]({{ site.path.guide }}/ops/locations/ssh-keys.html)
* create a `~/.brooklyn` directory on the host with `$ mkdir ~/.brooklyn`
* check your `iptables` or other firewall service, making sure that incoming connections on port 8443 is not blocked
-* check that the [linux kernel entropy](increase-entropy.html) is sufficient
+* check that the [linux kernel entropy]({{ site.path.website }}/documentation/increase-entropy.html) is sufficient
### <a id="download"></a>Download Brooklyn
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6df2f3a3/docs/guide/ops/locations/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/locations/index.md b/docs/guide/ops/locations/index.md
index 28a238a..767ca72 100644
--- a/docs/guide/ops/locations/index.md
+++ b/docs/guide/ops/locations/index.md
@@ -432,4 +432,4 @@ provisioned. See `brooklyn.location.basic.FixedListMachineProvisioningLocation.M
* [More Locations](more-locations.html)
* [SSH Keys](ssh-keys.html)
-* [Cloud Credentials](cloud-credentials.md)
+* [Cloud Credentials](cloud-credentials.html)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6df2f3a3/docs/guide/ops/requirements.md
----------------------------------------------------------------------
diff --git a/docs/guide/ops/requirements.md b/docs/guide/ops/requirements.md
index b23fdd3..e86629e 100644
--- a/docs/guide/ops/requirements.md
+++ b/docs/guide/ops/requirements.md
@@ -43,7 +43,6 @@ The ports used by Brooklyn are:
Whether to use https rather than http is configurable using the CLI option `--https`;
the port to use is configurable using the CLI option `--port <port>`.
-See [CLI](cli.html) documentation for more details.
To enable remote Brooklyn access, ensure these ports are open in the firewall.
For example, to open port 8443 in iptables, ues the command:
@@ -68,4 +67,4 @@ It is normally recommended that Brooklyn run as a non-root user with keys instal
### Linux Kernel Entropy
-Check that the [linux kernel entropy](increase-entropy.html) is sufficient.
+Check that the [linux kernel entropy]({{ site.path.website }}/documentation/increase-entropy.html) is sufficient.
[3/3] incubator-brooklyn git commit: This closes #772
Posted by al...@apache.org.
This closes #772
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bf5258b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bf5258b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bf5258b5
Branch: refs/heads/master
Commit: bf5258b57607c856e3170809f997dca8b2801766
Parents: c2e55c0 6df2f3a
Author: Aled Sage <al...@gmail.com>
Authored: Mon Jul 27 17:50:40 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Jul 27 17:50:40 2015 +0100
----------------------------------------------------------------------
docs/_build/make-javadoc.sh | 8 +-------
docs/guide/ops/brooklyn_properties.md | 2 +-
docs/guide/ops/install-on-server.md | 2 +-
docs/guide/ops/locations/index.md | 2 +-
docs/guide/ops/requirements.md | 3 +--
5 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------