You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/06 11:40:38 UTC

[1/6] brooklyn-docs git commit: Remove reference to “incubator” and “incubating”

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master ea07b78d6 -> e6527eefd


Remove reference to “incubator” and “incubating”

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/45541181
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/45541181
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/45541181

Branch: refs/heads/master
Commit: 45541181d653484708856fef6f1a3698c730db1d
Parents: 2ea588d
Author: Aled Sage <al...@gmail.com>
Authored: Tue Feb 2 17:49:37 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 3 16:32:10 2016 +0000

----------------------------------------------------------------------
 _build/javadoc-overview.html                    |  7 -----
 _includes/base-head.html                        |  2 +-
 guide/dev/code/index.md                         |  2 +-
 guide/java/entity.md                            |  2 +-
 guide/ops/persistence/index.md                  |  2 +-
 website/community/mailing-lists.md              | 12 ++++++---
 .../committers/release-process/announce.md      | 28 +++++++-------------
 .../release-process/environment-variables.md    |  4 +--
 .../committers/release-process/index.md         |  1 +
 .../release-process/verify-release-artifacts.md |  4 +--
 website/developers/index.md                     |  2 +-
 website/meta/license.md                         |  2 --
 12 files changed, 27 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/_build/javadoc-overview.html
----------------------------------------------------------------------
diff --git a/_build/javadoc-overview.html b/_build/javadoc-overview.html
index ef4819a..b3f7192 100644
--- a/_build/javadoc-overview.html
+++ b/_build/javadoc-overview.html
@@ -4,13 +4,6 @@
 Javadoc for <a href="http://brooklyn.io"> Apache Brooklyn</a> 0.9.0-SNAPSHOT
 
 <p>
-                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.
-</p>
-<p>
                 Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>.
 </p>
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/_includes/base-head.html
----------------------------------------------------------------------
diff --git a/_includes/base-head.html b/_includes/base-head.html
index 3f79d02..35435d4 100644
--- a/_includes/base-head.html
+++ b/_includes/base-head.html
@@ -1,5 +1,5 @@
 
-<title>{{ page.title }} - Apache Brooklyn (incubating)</title>
+<title>{{ page.title }} - Apache Brooklyn</title>
 
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/guide/dev/code/index.md
----------------------------------------------------------------------
diff --git a/guide/dev/code/index.md b/guide/dev/code/index.md
index e72ab20..955658f 100644
--- a/guide/dev/code/index.md
+++ b/guide/dev/code/index.md
@@ -88,5 +88,5 @@ If you're interested in building and editing the code, you probably want to beco
 * [Remote Debugging](../tips/debugging-remote-brooklyn.html)
 
 Where things aren't documented **please ask us** at 
-[the brooklyn mailing list](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/)
+[the brooklyn mailing list](https://mail-archives.apache.org/mod_mbox/brooklyn-dev/)
 so we can remedy this!

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/guide/java/entity.md
----------------------------------------------------------------------
diff --git a/guide/java/entity.md b/guide/java/entity.md
index 6828a17..ec06347 100644
--- a/guide/java/entity.md
+++ b/guide/java/entity.md
@@ -87,4 +87,4 @@ You might also find the following helpful:
 
 * **[Entity Design Tips]({{site.path.guide}}/dev/tips/index.html#EntityDesign)**
 * The **[User Guide]({{site.path.guide}})**
-* The **[Mailing List](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/)**
+* The **[Mailing List](https://mail-archives.apache.org/mod_mbox/brooklyn-dev/)**

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/guide/ops/persistence/index.md
----------------------------------------------------------------------
diff --git a/guide/ops/persistence/index.md b/guide/ops/persistence/index.md
index 02c05ff..58b5915 100644
--- a/guide/ops/persistence/index.md
+++ b/guide/ops/persistence/index.md
@@ -219,7 +219,7 @@ The meaning of the configuration options is:
 
 ### Seek Help
 
-Help can be found at `dev@brooklyn.incubator.apache.org`, where folk will be able to investigate 
+Help can be found at `dev@brooklyn.apache.org`, where folk will be able to investigate 
 issues and suggest work-arounds.
 
 By sharing the persisted state (with credentials removed), Brooklyn developers will be able to 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/website/community/mailing-lists.md
----------------------------------------------------------------------
diff --git a/website/community/mailing-lists.md b/website/community/mailing-lists.md
index 40cb72b..6d62d7b 100644
--- a/website/community/mailing-lists.md
+++ b/website/community/mailing-lists.md
@@ -8,10 +8,10 @@ help with issues, ranging from basic getting started through to detailed
 questions about Brooklyn's internals.
 
 To subscribe, send an email to:
-[dev-subscribe@brooklyn.incubator.apache.org](mailto:dev-subscribe@brooklyn.incubator.apache.org)
+[dev-subscribe@brooklyn.apache.org](mailto:dev-subscribe@brooklyn.apache.org)
 
 You can also [read and search the dev list
-archives](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/) on
+archives](https://mail-archives.apache.org/mod_mbox/brooklyn-dev/) on
 Apache's list archiver.
 
 
@@ -19,12 +19,16 @@ Apache's list archiver.
 
 We also have a *commits* list - a read-only list which automatically posts as
 commits are made to our source repositories. Subscribe by sending an email to
-[commits-subscribe@brooklyn.incubator.apache.org](mailto:commits-subscribe@brooklyn.incubator.apache.org),
-and [read the archives here](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-commits/).
+[commits-subscribe@brooklyn.apache.org](mailto:commits-subscribe@brooklyn.apache.org),
+and [read the archives here](https://mail-archives.apache.org/mod_mbox/brooklyn-commits/).
 
 
 ### Historical lists
 
+Before Brooklyn graduated from the Apache Incubator, the lists included the word
+"incubator" (e.g. dev@brooklyn.incubator.apache.org). These were automatically
+migrated upon graduation; the old lists should not be used.
+
 Before Brooklyn joined the Apache Incubator, we had lists hosted on Google
 Groups. These lists are now deprecated and it's no longer possible to subscribe
 or post, but you may find useful information in the archives.

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/website/developers/committers/release-process/announce.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/announce.md b/website/developers/committers/release-process/announce.md
index f982631..128fa7d 100644
--- a/website/developers/committers/release-process/announce.md
+++ b/website/developers/committers/release-process/announce.md
@@ -4,21 +4,21 @@ title: Announce the release
 navgroup: developers
 ---
 
-After svnpubsub has updated, the artifacts will be visible at https://www.apache.org/dist/incubator/brooklyn/, and distributed to Apache mirrors around the world shortly after.
+After svnpubsub has updated, the artifacts will be visible at https://www.apache.org/dist/brooklyn/, and distributed to Apache mirrors around the world shortly after.
 
 An announcement email can then be made:
 
-### Subject: [ANNOUNCE] Apache Brooklyn 0.7.0-incubating released
+### Subject: [ANNOUNCE] Apache Brooklyn 0.9.0 released
 {% highlight text %}
 The Apache Brooklyn team is proud to announce the latest release of Apache
-Brooklyn 0.7.0-incubating.
+Brooklyn 0.9.0.
 
-Apache Brooklyn is a framework for modelling, monitoring, and managing
+Apache Brooklyn is a framework for modelling, deploying, and managing
 applications through autonomic blueprints. More details on Apache Brooklyn
 can be found at https://brooklyn.apache.org/
 
-Version 0.7.0 is a major step for Apache Brooklyn. It is the first full
-release of the project as part of the Apache incubator.
+Version 0.9.0 is a major step for Apache Brooklyn, including many new features
+and fixes.
 
 Thanks go to our community for their improvements, feedback and guidance, and
 to Brooklyn’s commercial users for funding much of this development.
@@ -27,29 +27,19 @@ As well as a source code release, we offer a full binary distribution
 download, and a full set of Maven artifacts for developers.
 
 Release notes:
-https://brooklyn.apache.org/v/0.7.0-incubating/misc/release-notes.html
+https://brooklyn.apache.org/v/0.9.0/misc/release-notes.html
 
 Download:
 https://brooklyn.apache.org/download/
 
 User guide:
-https://brooklyn.apache.org/v/0.7.0-incubating/
+https://brooklyn.apache.org/v/0.9.0/
 
 Maven artifacts have also been made available on repository.apache.org and
 Maven Central.
 
-Disclaimer:
-Apache Brooklyn is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by 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.
-
 Thanks
 Richard Downer
-release manager for 0.7.0-incubating
+release manager for 0.9.0
 on behalf of the Brooklyn PPMC
 {% endhighlight %}

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/website/developers/committers/release-process/environment-variables.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/environment-variables.md b/website/developers/committers/release-process/environment-variables.md
index 886d3c7..4ee295d 100644
--- a/website/developers/committers/release-process/environment-variables.md
+++ b/website/developers/committers/release-process/environment-variables.md
@@ -13,8 +13,8 @@ OLD_MASTER_VERSION=0.9.0-SNAPSHOT
 # The next version to be set on the master branch
 NEW_MASTER_VERSION=0.NNN+1.0-SNAPSHOT
 
-# The version we are releasing now. While Brooklyn is in the Apache Incubator, this must be suffixed `-incubating`.
-VERSION_NAME=0.NNN.0-incubating
+# The version we are releasing now.
+VERSION_NAME=0.NNN.0
 
 # The release candidate number we are making now.
 RC_NUMBER=1

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/website/developers/committers/release-process/index.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/index.md b/website/developers/committers/release-process/index.md
index 0e09c0b..9d67965 100644
--- a/website/developers/committers/release-process/index.md
+++ b/website/developers/committers/release-process/index.md
@@ -15,6 +15,7 @@ children:
 - { path: publish.md }
 - { path: announce.md }
 ---
+0. Review and update these instructions, post-graduation from incubation!
 1. [Prerequisites](prerequisites.html) - steps that a new release manager must do (but which only need to be done once)
 2. [Set environment variables](environment-variables.html) - many example snippets here use environment variables to
    avoid repetition - this page describes what they are

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/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 40c8b20..af7c5ab 100644
--- a/website/developers/committers/release-process/verify-release-artifacts.md
+++ b/website/developers/committers/release-process/verify-release-artifacts.md
@@ -16,8 +16,8 @@ The scripts below use several environment variables to cut out repetition and en
 release. You should determine the following information and set your environment:
 
 {% highlight bash %}
-# The version we are releasing now. While Brooklyn is in the Apache Incubator, this must be suffixed `-incubating`.
-VERSION_NAME=0.7.0-incubating
+# The version we are releasing now.
+VERSION_NAME=0.9.0
 
 # The release candidate number we are making now.
 RC_NUMBER=1

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/website/developers/index.md
----------------------------------------------------------------------
diff --git a/website/developers/index.md b/website/developers/index.md
index eb74497..14dba00 100644
--- a/website/developers/index.md
+++ b/website/developers/index.md
@@ -6,7 +6,7 @@ children:
 - /guide/dev/
 - committers/
 - code-standards.md
-- { link: 'http://github.com/apache/incubator-brooklyn', title: 'GitHub' }
+- { link: 'http://github.com/apache/brooklyn', title: 'GitHub' }
 - { link: 'https://issues.apache.org/jira/browse/BROOKLYN', title: 'Bug Tracker (JIRA)' }
 ---
 

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/45541181/website/meta/license.md
----------------------------------------------------------------------
diff --git a/website/meta/license.md b/website/meta/license.md
index c7f5366..02d05f4 100644
--- a/website/meta/license.md
+++ b/website/meta/license.md
@@ -15,8 +15,6 @@ 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.
 
-Apache Brooklyn is currently undergoing Incubation at the Apache Software Foundation.
-
 
 ## Trademark
 


[3/6] brooklyn-docs git commit: Update copyright year in NOTICE

Posted by he...@apache.org.
Update copyright year in NOTICE

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/8cd474af
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/8cd474af
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/8cd474af

Branch: refs/heads/master
Commit: 8cd474af4642775ad733b4ac1fa74fcecebf72b1
Parents: b5652a9
Author: Aled Sage <al...@gmail.com>
Authored: Tue Feb 2 17:53:27 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 3 16:32:49 2016 +0000

----------------------------------------------------------------------
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/8cd474af/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f790f13..6d1f608 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Brooklyn
-Copyright 2014-2015 The Apache Software Foundation
+Copyright 2014-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).


[5/6] brooklyn-docs git commit: don’t use io.brooklyn

Posted by he...@apache.org.
don’t use io.brooklyn

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/25bf3bb9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/25bf3bb9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/25bf3bb9

Branch: refs/heads/master
Commit: 25bf3bb9e4059cff850040d50dd33ed0ae33d465
Parents: 8cd474a
Author: Aled Sage <al...@gmail.com>
Authored: Tue Feb 2 18:15:03 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 3 16:32:49 2016 +0000

----------------------------------------------------------------------
 guide/java/archetype.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/25bf3bb9/guide/java/archetype.md
----------------------------------------------------------------------
diff --git a/guide/java/archetype.md b/guide/java/archetype.md
index 3a87027..ba3bc0e 100644
--- a/guide/java/archetype.md
+++ b/guide/java/archetype.md
@@ -14,7 +14,7 @@ This can be done interactively using:
 $ mvn archetype:generate
 {% endhighlight %}
 
-The user will be prompted for the archetype to use (i.e. group "io.brooklyn" 
+The user will be prompted for the archetype to use (i.e. group "org.apache.brooklyn" 
 and artifact "brooklyn-archetype-quickstart"), as well as options for the project 
 to be created.
 


[6/6] brooklyn-docs git commit: This closes #6

Posted by he...@apache.org.
This closes #6


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/e6527eef
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/e6527eef
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/e6527eef

Branch: refs/heads/master
Commit: e6527eefd19cb3a6009e367101afdbef840e70f4
Parents: ea07b78 25bf3bb
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Feb 6 10:38:21 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Sat Feb 6 10:38:21 2016 +0000

----------------------------------------------------------------------
 NOTICE                                          |  2 +-
 _build/javadoc-overview.html                    |  7 -----
 _extra/big_examples/before-begin.include.md     |  4 +--
 _extra/highlevel1.md                            |  2 +-
 _extra/simple_java_examples/examples.md         |  6 ++---
 _extra/update-docs.md                           |  2 +-
 _includes/base-head.html                        |  2 +-
 _plugins/brooklyn_metadata.rb                   |  2 +-
 guide/dev/code/index.md                         |  2 +-
 guide/dev/env/maven-build.md                    |  6 ++---
 guide/dev/index.md                              |  2 +-
 guide/java/archetype.md                         |  2 +-
 guide/java/defining-and-deploying.md            |  4 +--
 guide/java/entity.md                            |  2 +-
 guide/misc/download.md                          |  2 +-
 guide/ops/cli/cli-usage-guide.md                |  2 +-
 guide/ops/externalized-configuration.md         |  2 +-
 guide/ops/gui/_my-web-cluster.yaml              |  2 +-
 guide/ops/gui/_my-web-cluster2.yaml             |  2 +-
 guide/ops/gui/policies.md                       |  2 +-
 guide/ops/persistence/index.md                  |  2 +-
 guide/ops/server-cli-reference.md               | 19 -------------
 guide/start/_my-web-cluster.yaml                |  2 +-
 guide/start/_my-web-cluster2.yaml               |  2 +-
 guide/yaml/creating-yaml.md                     |  2 +-
 .../appserver-clustered-w-db-concise.yaml       |  4 +--
 .../example_yaml/appserver-clustered-w-db.yaml  |  4 +--
 .../appserver-configured-in-config.yaml         |  2 +-
 .../yaml/example_yaml/appserver-configured.yaml |  2 +-
 .../appserver-w-db-other-flavor.yaml            |  4 +--
 guide/yaml/example_yaml/appserver-w-db.yaml     |  4 +--
 guide/yaml/example_yaml/appserver-w-policy.yaml |  4 +--
 .../entities/simpleshellcommandtest-entity.yaml |  2 +-
 .../entities/testeffector-entity.yaml           |  2 +-
 .../testcases/effector-test-snippet.yaml        |  2 +-
 .../testcases/getting-started-test-example.yaml |  4 +--
 website/community/mailing-lists.md              | 12 ++++++---
 .../committers/release-process/announce.md      | 28 +++++++-------------
 .../release-process/environment-variables.md    |  4 +--
 .../committers/release-process/index.md         |  1 +
 .../committers/release-process/publish.md       |  2 +-
 .../release-process/verify-release-artifacts.md | 10 +++----
 website/developers/index.md                     |  2 +-
 website/developers/links.md                     |  2 +-
 website/meta/license.md                         |  2 --
 45 files changed, 74 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e6527eef/_includes/base-head.html
----------------------------------------------------------------------


[2/6] brooklyn-docs git commit: WAR url examples: use 0.8.0-incubating instead of 0.6.0

Posted by he...@apache.org.
WAR url examples: use 0.8.0-incubating instead of 0.6.0


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2ea588de
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2ea588de
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2ea588de

Branch: refs/heads/master
Commit: 2ea588deb065f40e97082f1a176d43847a755f9c
Parents: 3dfa639
Author: Aled Sage <al...@gmail.com>
Authored: Tue Feb 2 17:17:48 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 3 16:32:10 2016 +0000

----------------------------------------------------------------------
 guide/java/defining-and-deploying.md                             | 2 +-
 guide/ops/cli/cli-usage-guide.md                                 | 2 +-
 guide/ops/externalized-configuration.md                          | 2 +-
 guide/ops/gui/_my-web-cluster.yaml                               | 2 +-
 guide/ops/gui/_my-web-cluster2.yaml                              | 2 +-
 guide/start/_my-web-cluster.yaml                                 | 2 +-
 guide/start/_my-web-cluster2.yaml                                | 2 +-
 guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml    | 2 +-
 guide/yaml/example_yaml/appserver-clustered-w-db.yaml            | 2 +-
 guide/yaml/example_yaml/appserver-configured-in-config.yaml      | 2 +-
 guide/yaml/example_yaml/appserver-configured.yaml                | 2 +-
 guide/yaml/example_yaml/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 +-
 guide/yaml/test/example_yaml/entities/testeffector-entity.yaml   | 2 +-
 .../yaml/test/example_yaml/testcases/effector-test-snippet.yaml  | 2 +-
 .../example_yaml/testcases/getting-started-test-example.yaml     | 4 ++--
 17 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/java/defining-and-deploying.md
----------------------------------------------------------------------
diff --git a/guide/java/defining-and-deploying.md b/guide/java/defining-and-deploying.md
index 8f56000..be1fa65 100644
--- a/guide/java/defining-and-deploying.md
+++ b/guide/java/defining-and-deploying.md
@@ -115,7 +115,7 @@ 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);
 and you'll find a sample WAR which uses the database as configured above 
-[here](https://http://ccweb.cloudsoftcorp.com/maven/libs-snapshot-local/io/brooklyn/).)
+[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 
  
 If you want to adventure beyond ``localhost`` (the default),

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/ops/cli/cli-usage-guide.md
----------------------------------------------------------------------
diff --git a/guide/ops/cli/cli-usage-guide.md b/guide/ops/cli/cli-usage-guide.md
index c8edf0d..593bb6b 100644
--- a/guide/ops/cli/cli-usage-guide.md
+++ b/guide/ops/cli/cli-usage-guide.md
@@ -458,7 +458,7 @@ services:
 - type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
   name: WebApp
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     java.sysprops:
       brooklyn.example.db.url: >
         $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/ops/externalized-configuration.md
----------------------------------------------------------------------
diff --git a/guide/ops/externalized-configuration.md b/guide/ops/externalized-configuration.md
index 24fd4eb..b0c85cd 100644
--- a/guide/ops/externalized-configuration.md
+++ b/guide/ops/externalized-configuration.md
@@ -27,7 +27,7 @@ services:
 - type: brooklyn.entity.webapp.jboss.JBoss7Server
   name: AppServer HelloWorld
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     http.port: 8080+
     java.sysprops:
       brooklyn.example.db.url: $brooklyn:formatString("jdbc:postgresql://%s/myappdb?user=%s\\&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/ops/gui/_my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster.yaml b/guide/ops/gui/_my-web-cluster.yaml
index a3295b9..220dc09 100644
--- a/guide/ops/gui/_my-web-cluster.yaml
+++ b/guide/ops/gui/_my-web-cluster.yaml
@@ -10,7 +10,7 @@ services:
   name: My Web
   id: webappcluster
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     java.sysprops:
       brooklyn.example.db.url: >
         $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/ops/gui/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster2.yaml b/guide/ops/gui/_my-web-cluster2.yaml
index 33723ab..2e4310f 100644
--- a/guide/ops/gui/_my-web-cluster2.yaml
+++ b/guide/ops/gui/_my-web-cluster2.yaml
@@ -7,7 +7,7 @@ services:
 - type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
   name: My Web
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     java.sysprops:
       brooklyn.example.db.url: >
         $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/start/_my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster.yaml b/guide/start/_my-web-cluster.yaml
index a3295b9..220dc09 100644
--- a/guide/start/_my-web-cluster.yaml
+++ b/guide/start/_my-web-cluster.yaml
@@ -10,7 +10,7 @@ services:
   name: My Web
   id: webappcluster
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     java.sysprops:
       brooklyn.example.db.url: >
         $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/start/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster2.yaml b/guide/start/_my-web-cluster2.yaml
index 33723ab..2e4310f 100644
--- a/guide/start/_my-web-cluster2.yaml
+++ b/guide/start/_my-web-cluster2.yaml
@@ -7,7 +7,7 @@ services:
 - type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
   name: My Web
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     java.sysprops:
       brooklyn.example.db.url: >
         $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/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 0fd8759..e60e35b 100644
--- a/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml
+++ b/guide/yaml/example_yaml/appserver-clustered-w-db-concise.yaml
@@ -3,7 +3,7 @@ services:
 - type: org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster
   initialSize: 2
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     http.port: 8080+
     java.sysprops: 
       brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/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 8bbb14f..fc24125 100644
--- a/guide/yaml/example_yaml/appserver-clustered-w-db.yaml
+++ b/guide/yaml/example_yaml/appserver-clustered-w-db.yaml
@@ -6,7 +6,7 @@ services:
     $brooklyn:entitySpec:
       type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
       brooklyn.config:
-        wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+        wars.root: 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
         http.port: 8080+
         java.sysprops: 
           brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-configured-in-config.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-configured-in-config.yaml b/guide/yaml/example_yaml/appserver-configured-in-config.yaml
index f817dd7..765a8c2 100644
--- a/guide/yaml/example_yaml/appserver-configured-in-config.yaml
+++ b/guide/yaml/example_yaml/appserver-configured-in-config.yaml
@@ -2,5 +2,5 @@ name: appserver-configured-in-config
 services:
 - type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     http.port: 8080

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/example_yaml/appserver-configured.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/example_yaml/appserver-configured.yaml b/guide/yaml/example_yaml/appserver-configured.yaml
index 58416ca..51bf3ca 100644
--- a/guide/yaml/example_yaml/appserver-configured.yaml
+++ b/guide/yaml/example_yaml/appserver-configured.yaml
@@ -1,5 +1,5 @@
 name: appserver-configured
 services:
 - type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
-  war: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+  war: 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
   httpPort: 8080

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/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 ac1106e..9556071 100644
--- a/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml
+++ b/guide/yaml/example_yaml/appserver-w-db-other-flavor.yaml
@@ -3,7 +3,7 @@ services:
 - type: org.apache.brooklyn.entity.webapp.tomcat.TomcatServer
   name: AppServer HelloWorld 
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     http.port: 8080+
     java.sysprops: 
       brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/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 0e9d959..53621e9 100644
--- a/guide/yaml/example_yaml/appserver-w-db.yaml
+++ b/guide/yaml/example_yaml/appserver-w-db.yaml
@@ -3,7 +3,7 @@ services:
 - type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
   name: AppServer HelloWorld 
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     http.port: 8080+
     java.sysprops: 
       brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/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 52bc3b8..dd7cd1a 100644
--- a/guide/yaml/example_yaml/appserver-w-policy.yaml
+++ b/guide/yaml/example_yaml/appserver-w-policy.yaml
@@ -6,7 +6,7 @@ services:
     $brooklyn:entitySpec:
       type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
       brooklyn.config:
-        wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+        wars.root: 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
         http.port: 8080+
         java.sysprops: 
           brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s\\&password=%s",

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml b/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml
index d86fe54..13e0ebf 100644
--- a/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml
+++ b/guide/yaml/test/example_yaml/entities/testeffector-entity.yaml
@@ -4,5 +4,5 @@
   effector: deploy
   timeout: 5m
   params:
-    url: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    url: 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
     targetName: newcontext
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml b/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml
index 469b54b..54e30da 100644
--- a/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml
+++ b/guide/yaml/test/example_yaml/testcases/effector-test-snippet.yaml
@@ -14,7 +14,7 @@
     effector: deploy
     timeout: 5m
     params:
-      url: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+      url: 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
       targetName: newcontext
   - type: org.apache.brooklyn.test.framework.TestHttpCall
     name: Check Deployed Webapp Status Code

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2ea588de/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml
----------------------------------------------------------------------
diff --git a/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml b/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml
index 25296e6..5f40abb 100644
--- a/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml
+++ b/guide/yaml/test/example_yaml/testcases/getting-started-test-example.yaml
@@ -10,7 +10,7 @@ services:
   name: My Web
   id: webappcluster
   brooklyn.config:
-    wars.root: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+    wars.root: 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
     java.sysprops:
       brooklyn.example.db.url: >
         $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s",
@@ -57,7 +57,7 @@ services:
     effector: deploy
     timeout: 5m
     params:
-      url: http://search.maven.org/remotecontent?filepath=io/brooklyn/example/brooklyn-example-hello-world-sql-webapp/0.6.0/brooklyn-example-hello-world-sql-webapp-0.6.0.war
+      url: 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
       targetName: newcontext
   - type: org.apache.brooklyn.test.framework.TestHttpCall
     name: Check Deployed Webapp Status Code


[4/6] brooklyn-docs git commit: Update to new repo names

Posted by he...@apache.org.
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 <al...@gmail.com>
Authored: Tue Feb 2 17:50:05 2016 +0000
Committer: Aled Sage <al...@gmail.com>
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 git@github.com:apache/incubator-brooklyn.git
-    cd incubator-brooklyn/examples
+    git clone git@github.com: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/)