Update to new repo names - remove âincubatingâ - fix broken links
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/b5652a95 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/b5652a95 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/b5652a95 Branch: refs/heads/master Commit: b5652a9562b220c42b13c0e2bdf96679e4d910d0 Parents: 4554118 Author: Aled Sage <[email protected]> Authored: Tue Feb 2 17:50:05 2016 +0000 Committer: Aled Sage <[email protected]> Committed: Wed Feb 3 16:32:49 2016 +0000 ---------------------------------------------------------------------- _extra/big_examples/before-begin.include.md | 4 ++-- _extra/highlevel1.md | 2 +- _extra/simple_java_examples/examples.md | 6 +++--- _extra/update-docs.md | 2 +- _plugins/brooklyn_metadata.rb | 2 +- guide/dev/env/maven-build.md | 6 +++--- guide/dev/index.md | 2 +- guide/java/defining-and-deploying.md | 2 +- guide/misc/download.md | 2 +- guide/ops/gui/policies.md | 2 +- guide/ops/server-cli-reference.md | 19 ------------------- guide/yaml/creating-yaml.md | 2 +- .../appserver-clustered-w-db-concise.yaml | 2 +- .../example_yaml/appserver-clustered-w-db.yaml | 2 +- .../appserver-w-db-other-flavor.yaml | 2 +- guide/yaml/example_yaml/appserver-w-db.yaml | 2 +- guide/yaml/example_yaml/appserver-w-policy.yaml | 2 +- .../entities/simpleshellcommandtest-entity.yaml | 2 +- .../committers/release-process/publish.md | 2 +- .../release-process/verify-release-artifacts.md | 6 +++--- website/developers/links.md | 2 +- 21 files changed, 27 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/_extra/big_examples/before-begin.include.md ---------------------------------------------------------------------- diff --git a/_extra/big_examples/before-begin.include.md b/_extra/big_examples/before-begin.include.md index 5170c64..66738ac 100644 --- a/_extra/big_examples/before-begin.include.md +++ b/_extra/big_examples/before-begin.include.md @@ -39,8 +39,8 @@ Grab a copy of the Brooklyn distribution and set up `BROOKLYN_HOME`: Grab a copy of the brooklyn-examples source code and build it with Maven: {% highlight bash %} -% git clone https://github.com/apache/incubator-brooklyn.git -% cd incubator-brooklyn/examples +% git clone https://github.com/apache/brooklyn-library.git +% cd brooklyn-library/examples % mvn clean install {% endhighlight %} http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/_extra/highlevel1.md ---------------------------------------------------------------------- diff --git a/_extra/highlevel1.md b/_extra/highlevel1.md index 3dfafb4..ae992d6 100644 --- a/_extra/highlevel1.md +++ b/_extra/highlevel1.md @@ -44,7 +44,7 @@ We're still near the beginning of figuring this out: [concepts]({{site.path.guide}}/use/guide/defining-applications/basic-concepts.html) and including a [tutorial]({{site.path.guide}}/use/guide/quickstart/) * Or dive straight in to the code, either [reading]({{site.path.guide}}/dev/code/) about it - or [gitting](http://github.com/apache/incubator-brooklyn/) it + or [gitting](http://github.com/apache/brooklyn/) it If you like it, or if you have ideas how it could be better, [join the discussion]({{site.path.guide}}/meta/contact.html). http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/_extra/simple_java_examples/examples.md ---------------------------------------------------------------------- diff --git a/_extra/simple_java_examples/examples.md b/_extra/simple_java_examples/examples.md index 334b2ec..32487b7 100644 --- a/_extra/simple_java_examples/examples.md +++ b/_extra/simple_java_examples/examples.md @@ -115,7 +115,7 @@ Examples Source Source code for (more up-to-date!) examples is available for download from GitHub. To retrieve the source, execute the following command: - git clone [email protected]:apache/incubator-brooklyn.git - cd incubator-brooklyn/examples + git clone [email protected]:apache/brooklyn-library.git + cd brooklyn-library/examples -You can also [browse the code](https://github.com/apache/incubator-brooklyn/tree/examples) on the web. +You can also [browse the code](https://github.com/apache/brooklyn-library/tree/examples) on the web. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/_extra/update-docs.md ---------------------------------------------------------------------- diff --git a/_extra/update-docs.md b/_extra/update-docs.md index 5abb056..f7e1b7e 100644 --- a/_extra/update-docs.md +++ b/_extra/update-docs.md @@ -11,4 +11,4 @@ It's built using standard jekyll/markdown with a few extensions. Instructions for building and working with docs are in a `README.md` file in that folder; for the most recent version of instructions click -[here](https://github.com/apache/incubator-brooklyn/tree/master/docs/README.md). +[here](https://github.com/apache/brooklyn-docs/tree/master/README.md). http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/_plugins/brooklyn_metadata.rb ---------------------------------------------------------------------- diff --git a/_plugins/brooklyn_metadata.rb b/_plugins/brooklyn_metadata.rb index ee0ba7b..303a671 100644 --- a/_plugins/brooklyn_metadata.rb +++ b/_plugins/brooklyn_metadata.rb @@ -44,7 +44,7 @@ module BrooklynMetadata } end - url_set["git"] = "https://github.com/apache/incubator-brooklyn/tree/#{ git_branch }" + url_set["git"] = "https://github.com/apache/brooklyn/tree/#{ git_branch }" site.config['brooklyn'] = { "version" => BrooklynMetadata::BROOKLYN_VERSION, http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/dev/env/maven-build.md ---------------------------------------------------------------------- diff --git a/guide/dev/env/maven-build.md b/guide/dev/env/maven-build.md index 275cea2..50534e9 100644 --- a/guide/dev/env/maven-build.md +++ b/guide/dev/env/maven-build.md @@ -85,12 +85,12 @@ although we'd love to if anyone can help!): [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] +[INFO] Brooklyn REST JavaScript Web GUI +[INFO] Brooklyn Server Root [INFO] Brooklyn Parent Project -[INFO] Brooklyn Utilities to Support Testing (listeners etc) +[INFO] Brooklyn Test Support Utilities [INFO] Brooklyn Logback Includable Configuration [INFO] Brooklyn Common Utilities -[INFO] Brooklyn Groovy Utilities -[INFO] Brooklyn API ... http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/dev/index.md ---------------------------------------------------------------------- diff --git a/guide/dev/index.md b/guide/dev/index.md index 3fb28dd..4239544 100644 --- a/guide/dev/index.md +++ b/guide/dev/index.md @@ -14,7 +14,7 @@ children: - tips/ - tips/logging.md - tips/debugging-remote-brooklyn.md -- { link: "http://github.com/apache/incubator-brooklyn";, title: "GitHub" } +- { link: "http://github.com/apache/brooklyn";, title: "GitHub" } - { link: "https://brooklyn.apache.org/v/latest/misc/javadoc";, title: "Javadoc" } --- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/java/defining-and-deploying.md ---------------------------------------------------------------------- diff --git a/guide/java/defining-and-deploying.md b/guide/java/defining-and-deploying.md index be1fa65..59c0947 100644 --- a/guide/java/defining-and-deploying.md +++ b/guide/java/defining-and-deploying.md @@ -113,7 +113,7 @@ Alternatively you can just add a ``main`` method to the application class as fol Compile and run this with the [``brooklyn-all`` jar]({{site.path.guide}}/start/download.html) on the classpath, pointing at your favourite WAR on your filesystem. (If the ``import`` packages aren't picked up correctly, -you can cheat by looking at [the file in Github](https://github.com/apache/incubator-brooklyn/blob/master/examples/simple-web-cluster/src/main/java/brooklyn/demo/WebClusterDatabaseExample.java); +you can cheat by looking at [the file in Github](https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java); and you'll find a sample WAR which uses the database as configured above [here](http://search.maven.org/remotecontent?filepath=org/apache/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.8.0-incubating/brooklyn-example-hello-world-sql-webapp-0.8.0-incubating.war).) TODO example webapp url http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/misc/download.md ---------------------------------------------------------------------- diff --git a/guide/misc/download.md b/guide/misc/download.md index 21f201b..6005a6d 100644 --- a/guide/misc/download.md +++ b/guide/misc/download.md @@ -149,7 +149,7 @@ you must either have Brooklyn built locally or one of these snapshot repositorie ## Source Code -Source code is hosted at [github.com/apache/incubator-brooklyn](http://github.com/apache/incubator-brooklyn), +Source code is hosted at [github.com/apache/brooklyn](http://github.com/apache/brooklyn), with this version in branch [{{ site.brooklyn.git_branch }}]({{ site.brooklyn.url.git }}). Information on working with the source is [here]({{ site.path.guide }}/dev/code). http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/ops/gui/policies.md ---------------------------------------------------------------------- diff --git a/guide/ops/gui/policies.md b/guide/ops/gui/policies.md index e35c6f2..eec033a 100644 --- a/guide/ops/gui/policies.md +++ b/guide/ops/gui/policies.md @@ -22,7 +22,7 @@ This policy automatically scales the cluster up or down to be the right size for The loadbalancer's `targets` policy ensures that the loadbalancer is updated as the cluster size changes. -Sitting idle, this cluster will only contain one server, but you can use a tool like [jmeter](http://jmeter.apache.org/) pointed at the nginx endpoint to create load on the cluster. Download a jmeter test plan [here](https://github.com/apache/incubator-brooklyn/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx). +Sitting idle, this cluster will only contain one server, but you can use a tool like [jmeter](http://jmeter.apache.org/) pointed at the nginx endpoint to create load on the cluster. Download a jmeter test plan [here](https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/resources/jmeter-test-plan.jmx). As load is added, Apache Brooklyn requests a new cloud machine, creates a new app server, and adds it to the cluster. As load is removed, servers are removed from the cluster, and the infrastructure is handed back to the cloud. http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/ops/server-cli-reference.md ---------------------------------------------------------------------- diff --git a/guide/ops/server-cli-reference.md b/guide/ops/server-cli-reference.md index cd8668b..17c4ba0 100644 --- a/guide/ops/server-cli-reference.md +++ b/guide/ops/server-cli-reference.md @@ -183,22 +183,3 @@ or Swift. It has the following options: * `blob --container <containerName> --blob <blobName>`: retrieves the given blob (i.e. object), including metadata and its contents. - - -## Running from a Source Build - -Here is an example of the commands you might run to get the Brooklyn code, -compile it and launch an application: - -{% highlight bash %} -git clone https://github.com/apache/incubator-brooklyn.git -cd brooklyn -mvn clean install -DskipTests -BROOKLYN_HOME=$(pwd) -export PATH=${PATH}:${BROOKLYN_HOME}/usage/dist/target/brooklyn-dist/bin/ -export BROOKLYN_CLASSPATH=${BROOKLYN_HOME}/examples/simple-web-cluster/target/classes -nohup brooklyn launch --app brooklyn.demo.SingleWebServerExample --location localhost & -{% endhighlight %} - - - http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/yaml/creating-yaml.md ---------------------------------------------------------------------- diff --git a/guide/yaml/creating-yaml.md b/guide/yaml/creating-yaml.md index ffb1e36..34a0d29 100644 --- a/guide/yaml/creating-yaml.md +++ b/guide/yaml/creating-yaml.md @@ -66,7 +66,7 @@ by dropping to the JVM. For more information on Java: * start with a [Maven archetype]({{site.path.guide}}/java/archetype.html) * see all [Brooklyn Java guide]({{site.path.guide}}/java/) topics -* look at test cases in the [codebase](https://github.com/apache/incubator-brooklyn) +* look at test cases in the [codebase](https://github.com/apache/brooklyn) <!-- TODO http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml ---------------------------------------------------------------------- diff --git a/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml b/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml index e60e35b..2199be3 100644 --- a/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml +++ b/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml @@ -12,4 +12,4 @@ services: id: db name: DB HelloWorld Visitors brooklyn.config: - datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql + datastore.creation.script.url: https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/yaml/example_yaml/appserver-clustered-w-db.yaml ---------------------------------------------------------------------- diff --git a/guide/yaml/example_yaml/appserver-clustered-w-db.yaml b/guide/yaml/example_yaml/appserver-clustered-w-db.yaml index fc24125..003a4af 100644 --- a/guide/yaml/example_yaml/appserver-clustered-w-db.yaml +++ b/guide/yaml/example_yaml/appserver-clustered-w-db.yaml @@ -15,4 +15,4 @@ services: id: db name: DB HelloWorld Visitors brooklyn.config: - datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql + datastore.creation.script.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml ---------------------------------------------------------------------- diff --git a/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml b/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml index 9556071..9b648d8 100644 --- a/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml +++ b/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml @@ -12,6 +12,6 @@ services: id: db name: DB HelloWorld Visitors brooklyn.config: - datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql + datastore.creation.script.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql provisioning.properties: minRam: 8192 http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/yaml/example_yaml/appserver-w-db.yaml ---------------------------------------------------------------------- diff --git a/guide/yaml/example_yaml/appserver-w-db.yaml b/guide/yaml/example_yaml/appserver-w-db.yaml index 53621e9..d4bc706 100644 --- a/guide/yaml/example_yaml/appserver-w-db.yaml +++ b/guide/yaml/example_yaml/appserver-w-db.yaml @@ -12,4 +12,4 @@ services: id: db name: DB HelloWorld Visitors brooklyn.config: - datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql + datastore.creation.script.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/yaml/example_yaml/appserver-w-policy.yaml ---------------------------------------------------------------------- diff --git a/guide/yaml/example_yaml/appserver-w-policy.yaml b/guide/yaml/example_yaml/appserver-w-policy.yaml index dd7cd1a..2d3d0db 100644 --- a/guide/yaml/example_yaml/appserver-w-policy.yaml +++ b/guide/yaml/example_yaml/appserver-w-policy.yaml @@ -23,4 +23,4 @@ services: id: db name: DB HelloWorld Visitors brooklyn.config: - datastore.creation.script.url: https://github.com/apache/incubator-brooklyn/raw/master/usage/launcher/src/test/resources/visitors-creation-script.sql + datastore.creation.script.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml ---------------------------------------------------------------------- diff --git a/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml b/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml index 3e14aa5..09b8339 100644 --- a/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml +++ b/guide/yaml/test/example_yaml/entities/simpleshellcommandtest-entity.yaml @@ -15,7 +15,7 @@ isEmpty: true - type: org.apache.brooklyn.test.framework.SimpleShellCommandTest - downloadUrl: https://raw.githubusercontent.com/apache/incubator-brooklyn/master/docs/guide/yaml/test/entities/script1.sh + downloadUrl: https://github.com/apache/brooklyn-docs/raw/master/guide/yaml/test/example_yaml/entities/script1.sh assertStatus: equals: 0 assertOut: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/website/developers/committers/release-process/publish.md ---------------------------------------------------------------------- diff --git a/website/developers/committers/release-process/publish.md b/website/developers/committers/release-process/publish.md index 436dbc4..6b3e1b0 100644 --- a/website/developers/committers/release-process/publish.md +++ b/website/developers/committers/release-process/publish.md @@ -83,7 +83,7 @@ Update the website ------------------ *Instructions on uploading to the website are beyond the scope of these instructions. Refer to the -[appropriate instructions](https://github.com/apache/incubator-brooklyn/tree/master/brooklyn-docs).* +[appropriate instructions](https://github.com/apache/brooklyn-docs/tree/master/README.md).* ### Publish documentation for the new release http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/website/developers/committers/release-process/verify-release-artifacts.md ---------------------------------------------------------------------- diff --git a/website/developers/committers/release-process/verify-release-artifacts.md b/website/developers/committers/release-process/verify-release-artifacts.md index af7c5ab..ffc6fd9 100644 --- a/website/developers/committers/release-process/verify-release-artifacts.md +++ b/website/developers/committers/release-process/verify-release-artifacts.md @@ -23,7 +23,7 @@ VERSION_NAME=0.9.0 RC_NUMBER=1 # A reference to your Git repository for Brooklyn -BASE_REPO=~/repos/apache-asf/incubator-brooklyn +BASE_REPO=~/repos/apache-asf/brooklyn # The Git commit hash from which the release was made - get this from the release script, or the Release Manager's announcement GIT_COMMIT=edcf928ee65cc29a84376c822759e468a9f016fe @@ -32,7 +32,7 @@ GIT_COMMIT=edcf928ee65cc29a84376c822759e468a9f016fe Import the PGP keys of the release Managers: {% highlight bash %} -curl https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS | gpg2 --import +curl https://dist.apache.org/repos/dist/release/brooklyn/KEYS | gpg2 --import {% endhighlight %} @@ -46,7 +46,7 @@ If you're verifying a build someone else has made, first download the files incl {% highlight bash %} TEMP_DIR=~/tmp/brooklyn/release/${VERSION_NAME}-rc${RC_NUMBER} BASE_NAME=apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER} -BASE_URL=https://dist.apache.org/repos/dist/dev/incubator/brooklyn/${BASE_NAME} +BASE_URL=https://dist.apache.org/repos/dist/dev/brooklyn/${BASE_NAME} mkdir -p ${TEMP_DIR} cd ${TEMP_DIR} http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/b5652a95/website/developers/links.md ---------------------------------------------------------------------- diff --git a/website/developers/links.md b/website/developers/links.md index d9dde26..ef0dbdc 100644 --- a/website/developers/links.md +++ b/website/developers/links.md @@ -16,5 +16,5 @@ Handy places: * [Apache releases]({{ apache_releases_repo_groupid_url }}) * [Apache snapshots]({{ apache_snapshots_repo_groupid_url }}) -* **CI server** is a jenkins server at: [https://builds.apache.org/job/incubator-brooklyn-master-build/](https://builds.apache.org/job/incubator-brooklyn-master-build/) +* **CI server** is a jenkins server at: [https://builds.apache.org/job/brooklyn-master-build/](https://builds.apache.org/job/brooklyn-master-build/)
