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/01 18:31:22 UTC

[01/32] brooklyn git commit: Tweaks to Licence, Copyright and Readme for clarity.

Repository: brooklyn
Updated Branches:
  refs/heads/0.7.0-incubating [created] bb9c8004b


Tweaks to Licence, Copyright and Readme for clarity.


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

Branch: refs/heads/0.7.0-incubating
Commit: af839590455fdb1b450227408a7f7be3b8d66201
Parents: 99cce00
Author: David Toy <d...@vidtoy.co.uk>
Authored: Mon Dec 9 12:25:34 2013 +0000
Committer: David Toy <d...@vidtoy.co.uk>
Committed: Mon Dec 9 12:25:34 2013 +0000

----------------------------------------------------------------------
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/af839590/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 35bfb06..961c716 100644
--- a/README.md
+++ b/README.md
@@ -71,9 +71,13 @@ Thanks!
 
 ## Copyright and License
 
-Copyright 2013 Cloudsoft Corporation, ltd.
+© 2011 - 2013 Cloudsoft Corporation Limited.
 
-Licensed under the Apache License, Version 2.0:
-You may obtain a copy of the License in the LICENSE file, or at: [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. The licence is provided in LICENSE.md, and you may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
 brooklyn is a registered trademark of Cloudsoft Corporation.
+

[02/32] brooklyn git commit: Add brooklyn-persisted-state to .gitignore

Posted by he...@apache.org.

Add brooklyn-persisted-state to .gitignore


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

Branch: refs/heads/0.7.0-incubating
Commit: 4e2e24b80c618ac166fd93146e56911fe75cb159
Parents: af83959
Author: Aled Sage <al...@gmail.com>
Authored: Thu Feb 6 08:16:35 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Feb 10 22:40:15 2014 +0000

----------------------------------------------------------------------
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/4e2e24b8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 3a270a0..045e2de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,6 @@ prodDb.*
 *.log
 brooklyn*.log.*
 
+*brooklyn-persisted-state/
+
 ignored

[30/32] brooklyn git commit: address code review comments

Posted by he...@apache.org.

address code review comments

* add js-yaml to license
* ensure None location works (see below)
* fix iconUr mis-spelling

with the None location it was odd but the old pruneLocation / set("location", []) caused the same yaml parse errors Undefined. however unsetting it works fine.


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

Branch: refs/heads/0.7.0-incubating
Commit: b6f8e72a220e4e469c9d1c7f931d494ff7c2f351
Parents: bab58f8
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Apr 6 11:49:58 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Apr 6 11:51:19 2015 +0100

----------------------------------------------------------------------
 LICENSE | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/b6f8e72a/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 3adafea..c13cc54 100644
--- a/LICENSE
+++ b/LICENSE
@@ -230,9 +230,8 @@ ZeroClipboard.js
 Copyright (c) Jon Rohan, James M. Greene (2014).
 Licensed under the MIT license (see below).
 
-
-This product includes software developed at SpryMedia Ltd  (http://sprymedia.co.uk/):
-jquery.dataTables.js, dataTables.extensions.js.
+This product includes software developed at SpryMedia Ltd (http://sprymedia.co.uk/):
+jquery.dataTables.js, dataTables.extensions.js
 Copyright (c) Allan Jardine (2008-2012).
 Licensed under the New BSD license (see below).
 
@@ -241,6 +240,12 @@ URI.js.
 Copyright (c) js-uri contributors (2013).
 Licensed under the New BSD license (see below).
 
+This product includes software developed by Vitaly Puzrin (https://github.com/nodeca/):
+js-yaml.js
+Copyright (c) Vitaly Puzrin (2011-2015).
+Licensed under the MIT license (see below).
+
+
 
 The MIT License ("MIT")

[09/32] brooklyn git commit: Filter by blueprint type in catalogue list documentation page

Posted by he...@apache.org.

Filter by blueprint type in catalogue list documentation page


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

Branch: refs/heads/0.7.0-incubating
Commit: 9d371439f1752cd48b8798da6997a0a8a39a54bf
Parents: e59bdf2
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Sep 16 10:46:58 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Sep 24 11:06:58 2014 +0100

----------------------------------------------------------------------
 NOTICE | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/9d371439/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f05bca7..c17cee9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -43,6 +43,9 @@ This product includes software developed at Twitter, Inc (http://twitter.com):
 bootstrap.js.
 Copyright (c) Twitter, Inc (2012).
 Licensed under the Apache License 2.0.
+typeahead.js, bloodhound.js
+Copyright (c) Twitter, Inc (2013).
+Licensed under the MIT License
 
 This product includes software developed by Yehuda Katz (https://github.com/wycats/):
 handlebars*.js.

[20/32] brooklyn git commit: Fix Brooklyn logo link in README

Posted by he...@apache.org.

Fix Brooklyn logo link in README

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

Branch: refs/heads/0.7.0-incubating
Commit: a01f3168e700f1e979d6d7be57e1b738c99026f8
Parents: 1b1ad45
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Dec 23 10:56:39 2014 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Dec 23 10:56:39 2014 +0000

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/a01f3168/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 63425a7..190eae2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# [![**Brooklyn**](http://brooklyncentral.github.io/style/images/brooklyn.gif)](http://brooklyncentral.github.com)
+# [![**Brooklyn**](https://brooklyn.incubator.apache.org/style/img/brooklyn.gif)](http://brooklyncentral.github.com)
 
 Apache Brooklyn is a library and control plane for deploying and managing distributed applications.

[07/32] brooklyn git commit: include NOTICE file as per BROOKLYN-19 and DISCLAIMER as per BROOKLYN-22, both in root of source and included in binary distributable artifacts. Minor tweaks to README to increase visisbility of apache and podling status, and

Posted by he...@apache.org.

include NOTICE file as per BROOKLYN-19 and DISCLAIMER as per BROOKLYN-22,
both in root of source and included in binary distributable artifacts.
Minor tweaks to README to increase visisbility of apache and podling status,
and removal of old (out-of-date) COPYRIGHT.


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

Branch: refs/heads/0.7.0-incubating
Commit: 50559efb0b7bf9110ac298278c37009d307e7a9b
Parents: 00bae17
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 17 10:55:15 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 17 14:56:35 2014 +0100

----------------------------------------------------------------------
 LICENSE   | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NOTICE    |   7 +++
 README.md |  38 +++++++------
 3 files changed, 203 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/50559efb/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e885a7b
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,176 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

http://git-wip-us.apache.org/repos/asf/brooklyn/blob/50559efb/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..becdadf
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,7 @@
+
+Apache Brooklyn
+Copyright 2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+

http://git-wip-us.apache.org/repos/asf/brooklyn/blob/50559efb/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f7b4164..63425a7 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
+
 # [![**Brooklyn**](http://brooklyncentral.github.io/style/images/brooklyn.gif)](http://brooklyncentral.github.com)
 
-Brooklyn is a library and control plane for deploying and managing distributed applications.
+Apache Brooklyn is a library and control plane for deploying and managing distributed applications.
 
-See [brooklyncentral.github.com](http://brooklyncentral.github.com) for details and examples.
+See [brooklyn.incubator.apache.org](https://brooklyn.incubator.apache.org/) for details and examples.
 
 Brooklyn's main emphasis is managing live applications (e.g auto-scaling, exception handling, auto recovery from failure, and working across multiple clouds). Brooklyn considers deployment part of management, like the opening move in a game of chess. (Distributed-application-management-chess, no less).
 
@@ -69,19 +70,20 @@ See the [full guide to contributing](http://brooklyncentral.github.com/dev/how-t
 Thanks!
 
 ----
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  
+See the [NOTICE](NOTICE) file distributed with this work for additional information
+regarding copyright ownership and the [incubation disclaimer](DISCLAIMER) file regarding project status,
+as Apache Brooklyn is currently undergoing Incubation at the Apache Software Foundation.
+
+The ASF licenses this file to you under the Apache License, Version 2.0 
+(the "License"); you may not use this file except in compliance with the License.  
+
+You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+

[18/32] brooklyn git commit: Revise LICENSE and NOTICE following mentor feedback

Posted by he...@apache.org.

Revise LICENSE and NOTICE following mentor feedback

See:
https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201412.mbox/%3C20141211165910.GG36553%40Chips-MacBook-Air.local%3E

MIT/BSD licensed subcomponents now credited in LICENSE instead of
NOTICE. Reviewed ASL2 credits in NOTICE; determined that they do not
have their own NOTICE file, and therefore there is no need to mention
them, per https://www.apache.org/dev/licensing-howto.html#alv2-dep.
This meant that there were no credits remaining in NOTICE; replaced
NOTICE with boilerplate recommended by
https://www.apache.org/dev/licensing-howto.html#simple.


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

Branch: refs/heads/0.7.0-incubating
Commit: b6ec4c7d0fb5be214742fd8b38deb607e3712c9b
Parents: 506082e
Author: Richard Downer <ri...@apache.org>
Authored: Fri Dec 12 14:45:39 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Dec 12 14:45:39 2014 +0000

----------------------------------------------------------------------
 LICENSE | 72 +++++++++++++++++++++++++++++++++++++++++++++--------
 NOTICE  | 81 ++----------------------------------------------------------
 2 files changed, 64 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/b6ec4c7d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7694da5..df7b30f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -177,18 +177,73 @@ http://www.apache.org/licenses/
 
 
 
+---------------------------------------------------
 
-OTHER LICENSES
+This distribution contains third party resources.
 
-This software incorporates minor components developed elsewhere, as described in 
-the accompanying NOTICE file. In addition to the Apache License 2.0 (above),
-the other licenses referenced there under which those components are used are:
+This product includes software developed at The jQuery Foundation (http://jquery.org/):
+jquery.js, selected jquery*.js.
+Copyright (c) John Resig (2011).
+Licensed under the MIT license (see below).
 
+This product includes software developed at The Dojo Foundation (http://dojofoundation.org/):
+require.js, text.js, sizzle.js in jquery.js.
+Copyright (c) The Dojo Foundation (2011, 2012).
+Licensed under the MIT license (see below).
 
+This product includes software developed at DocumentCloud Inc (http://www.documentcloud.org/):
+backbone.js, underscore.js.
+Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013).
+Licensed under the MIT license (see below).
 
-The MIT License ("MIT")
+This product includes software developed by Miller Medeiros (https://github.com/millermedeiros/):
+async.js.
+Copyright (c) Miller Medeiros (2011).
+Licensed under the MIT license (see below).
+
+This product includes software developed at Twitter, Inc (http://twitter.com):
+typeahead.js, bloodhound.js
+Copyright (c) Twitter, Inc (2013).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Yehuda Katz (https://github.com/wycats/):
+handlebars*.js.
+Copyright (c) Yehuda Katz (2012).
+Licensed under the MIT license (see below).
+
+This product includes software developed by "Cowboy" Ben Alman (http://benalman.com/).
+jquery.ba-bbq*.js
+Copyright (c) "Cowboy" Ben Alman (2010).
+Licensed under the MIT license (see below).
+
+This product includes software developed by WonderGroup and Jordan Thomas (http://labs.wondergroup.com/demos/mini-ui/index.html):
+jquery.wiggle.js.
+Copyright (c) WonderGroup and Jordan Thomas (2010).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Tim Wood (http://momentjs.com):
+moment.js
+Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014).
+Licensed under the MIT license (see below).
+
+This product includes software developed by ZeroClipboard contributors (https://github.com/zeroclipboard):
+ZeroClipboard.js
+Copyright (c) Jon Rohan, James M. Greene (2014).
+Licensed under the MIT license (see below).
 
-Copyright (c) <year> <copyright holders>
+
+This product includes software developed at SpryMedia Ltd  (http://sprymedia.co.uk/):
+jquery.dataTables.js, dataTables.extensions.js.
+Copyright (c) Allan Jardine (2008-2012).
+Licensed under the New BSD license (see below).
+
+This product includes software developed by js-uri contributors (https://code.google.com/js-uri):
+URI.js.
+Copyright (c) js-uri contributors (2013).
+Licensed under the New BSD license (see below).
+
+
+The MIT License ("MIT")
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -212,10 +267,7 @@ THE SOFTWARE.
 
 The BSD 3-Clause License ("New BSD")
 
-Copyright (c) <YEAR>, <OWNER>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
+Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, 

http://git-wip-us.apache.org/repos/asf/brooklyn/blob/b6ec4c7d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 08039f7..6f99615 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,82 +1,5 @@
 Apache Brooklyn
 Copyright 2014 The Apache Software Foundation
 
-
-This product includes software developed at The Apache Software Foundation (http://www.apache.org/):
-All code unless otherwise specified.
-Copyright (c) The Apache Software Foundation
-Licensed under the Apache License 2.0.
-
-This product includes software developed at The OSGi Alliance (http://www.osgi.org/):
-Java sources in org.osgi.*.
-Copyright (c) The OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at The jQuery Foundation (http://jquery.org/):
-jquery.js, selected jquery*.js.
-Copyright (c) John Resig (2011).
-Licensed under the MIT license (also available under GPLv2).
-
-This product includes software developed at The Dojo Foundation (http://dojofoundation.org/):
-require.js, text.js, sizzle.js in jquery.js.
-Copyright (c) The Dojo Foundation (2011, 2012).
-require.js and text.js licensed under the MIT license (also available under New BSD).
-sizzle.js portions of jquery.js licensed under the MIT license (also available under New BSD and GPL).
-
-This product includes software developed at SpryMedia Ltd  (http://sprymedia.co.uk/):
-jquery.dataTables.js, dataTables.extensions.js.
-Copyright (c) Allan Jardine (2008-2012).
-Licensed under the New BSD license (also available under GPLv2 and newer versions under Apache License 2.0).
-
-This product includes software developed at DocumentCloud Inc (http://www.documentcloud.org/):
-backbone.js, underscore.js.
-Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013).
-Licensed under the MIT license.
-
-This product includes software developed by Miller Medeiros (https://github.com/millermedeiros/):
-async.js.
-Copyright (c) Miller Medeiros (2011).
-Licensed under the MIT license.
-
-This product includes software developed at Twitter, Inc (http://twitter.com):
-bootstrap.js.
-Copyright (c) Twitter, Inc (2012).
-Licensed under the Apache License 2.0.
-typeahead.js, bloodhound.js
-Copyright (c) Twitter, Inc (2013).
-Licensed under the MIT License.
-
-This product includes software developed by Yehuda Katz (https://github.com/wycats/):
-handlebars*.js.
-Copyright (c) Yehuda Katz (2012).
-Licensed under the MIT license.
-
-This product includes software developed by "Cowboy" Ben Alman (http://benalman.com/).
-jquery.ba-bbq*.js
-Copyright (c) "Cowboy" Ben Alman (2010).
-Licensed under the MIT license (also available under GPL).
-
-This product includes software developed by WonderGroup and Jordan Thomas (http://labs.wondergroup.com/demos/mini-ui/index.html):
-jquery.wiggle.js.
-Copyright (c) WonderGroup and Jordan Thomas (2010).
-Licensed under the MIT license.
-
-This product includes software developed by Tim Wood (http://momentjs.com):
-moment.js
-Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014). 
-Licensed under the MIT license.
-
-This product includes software developed at Wordnik, Inc (https://github.com/wordnik/):
-swagger*.js.
-Copyright (c) Wordnik, Inc (2011-2014).
-Licensed under the Apache License 2.0.
-
-This product includes software developed by js-uri contributors (https://code.google.com/js-uri):
-URI.js.
-Copyright (c) js-uri contributors (2013).
-Licensed under the New BSD License.
-
-This product includes software developed by ZeroClipboard contributors (https://github.com/zeroclipboard):
-ZeroClipboard.{js,swf}
-Copyright (c) Jon Rohan, James M. Greene (2014).
-Licensed under the MIT license.
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

[32/32] brooklyn git commit: Adds MSSQL (YAML-based) blueprint

Posted by he...@apache.org.

Adds MSSQL (YAML-based) blueprint


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

Branch: refs/heads/0.7.0-incubating
Commit: bb9c8004b359334a10457461fe9844f0e0bd049e
Parents: e697d11
Author: Martin Harris <gi...@nakomis.com>
Authored: Thu May 21 13:07:32 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu May 28 17:27:35 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/bb9c8004/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index 21ceeba..7920d0e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,4 +3,4 @@
 *.sh text eol=lf
 *.bat text eol=crlf
 *.ps1 text eol=crlf
-
+*.ini text eol=crlf

[06/32] brooklyn git commit: Force UNIX style line endings for shell scripts.

Posted by he...@apache.org.

Force UNIX style line endings for shell scripts.

Shell scripts must have UNIX style endings even on Windows so that when the projects is built, packaged and run on Linux they work without errors.


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

Branch: refs/heads/0.7.0-incubating
Commit: 00bae1777a6bc35a60823594f8ceddd105fd7274
Parents: 6733d59
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Aug 28 21:10:58 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Aug 28 21:10:58 2014 +0300

----------------------------------------------------------------------
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/00bae177/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..2bca294
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+#Don't auto-convert line endings for shell scripts on Windows (breaks the scripts)
+*.sh text eol=lf

[10/32] brooklyn git commit: For “install config files”, add to NOTICE

Posted by he...@apache.org.

For “install config files”, add to NOTICE

- for config files we’ve copied from other projects, add a reference
  to each in NOTICE

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

Branch: refs/heads/0.7.0-incubating
Commit: eca5e8a4657857979f01ec1134cd03d25293d788
Parents: 9d37143
Author: Aled Sage <al...@gmail.com>
Authored: Fri Oct 3 15:29:27 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Oct 3 15:29:27 2014 +0100

----------------------------------------------------------------------
 NOTICE | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/eca5e8a4/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index c17cee9..4466310 100644
--- a/NOTICE
+++ b/NOTICE
@@ -81,3 +81,71 @@ This product includes software developed by ZeroClipboard contributors (https://
 ZeroClipboard.{js,swf}
 Copyright (c) Jon Rohan, James M. Greene (2014).
 Licensed under the MIT license.
+
+This product includes configuation files developed at MariaDB (https://mariadb.org/):
+Configuration file in software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
+Copyright (c) The MariaDB Foundation
+Licensed under GNU General Public License, version 2
+
+This product includes configuation files developed at MySQL (http://www.mysql.com/):
+Configuration file in software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
+Copyright (c) The Oracle Corporation
+Licensed under Oracle’s Free and Open Source Software ("FOSS") License Exception
+
+This product includes configuation files developed at PostgreSQL (http://www.postgresql.org/):
+Configuration file in software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
+Copyright (c) PostgreSQL Global Development Group
+Licensed under The PostgreSQL Licence (http://opensource.org/licenses/postgresql)
+
+This product includes configuation files developed at rubyrep (http://www.rubyrep.org/):
+Configuration file in software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
+Licensed under MIT License
+
+This product includes configuation files developed at Apache ActiveMQ (http://activemq.apache.org/):
+Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
+Copyright (c) The Apache Software Foundation
+Licensed under the Apache License 2.0.
+
+This product includes configuation files developed at Apache Kafka (http://kafka.apache.org/):
+Configuration files in software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/*
+Copyright (c) The Apache Software Foundation
+Licensed under the Apache License 2.0.
+
+This product includes configuation files developed at Apache Storm (https://storm.incubator.apache.org/):
+Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
+Copyright (c) The Apache Software Foundation
+Licensed under the Apache License 2.0.
+
+This product includes configuation files developed at Apache Cassandra (http://cassandra.apache.org/):
+Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/*
+Copyright (c) The Apache Software Foundation
+Licensed under the Apache License 2.0.
+
+This product includes configuation files developed at Apache CouchDB (http://couchdb.apache.org/):
+Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
+Copyright (c) The Apache Software Foundation
+Licensed under the Apache License 2.0.
+
+This product includes configuation files developed at MongoDB (http://www.mongodb.org/):
+Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf
+Copyright (c) MongoDB, Inc.
+Licensed under the Apache License 2.0.
+
+This product includes configuation files developed at Redis (http://redis.io/):
+Configuration files in software/nosql/src/main/resources/brooklyn/entity/nosql/redis/*.conf
+Licensed under the Three Clause BSD license
+
+This product includes configuation files developed at Basho (http://basho.com/riak/):
+Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
+Copyright (c) Basho.
+Licensed under the Apache License 2.0.
+
+This product includes configuation files developed at Apache Solr (http://lucene.apache.org/solr/):
+Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
+Copyright (c) Apache Software Foundation
+Licensed under the Apache License 2.0.
+
+This product includes configuation files developed at Apache Solr (http://jbossas.jboss.org/):
+Configuration file in software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/*.xml
+Copyright (c) JBoss
+Licensed under LGPL

[22/32] brooklyn git commit: Minor Documentation fixes

Posted by he...@apache.org.

Minor Documentation fixes


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

Branch: refs/heads/0.7.0-incubating
Commit: d139785a26a030efcc170deac33aa561e6263677
Parents: a01f316
Author: Duncan Grant <du...@cloudsoftcorp.com>
Authored: Tue Jan 6 11:15:00 2015 +0000
Committer: Duncan Grant <du...@cloudsoftcorp.com>
Committed: Tue Jan 6 11:27:40 2015 +0000

----------------------------------------------------------------------
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/d139785a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 190eae2..2de161b 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,9 @@ Alternatively, use Brooklyn as an integrated-stand-alone management node for you
 
 Three quick start options are available:
 
-* The [getting started guide](http://brooklyncentral.github.io/use/guide/quickstart/index.html) will step you through downloading and installing Brooklyn and running the examples.
+* The [getting started guide](https://brooklyn.incubator.apache.org/quickstart/) will step you through downloading and installing Brooklyn and running the examples.
 * Alternatively, [download the latest release](https://github.com/brooklyncentral/brooklyn/tarball/master) (tgz),
-* or, fork or clone the repo: `git clone git://github.com/brooklyncentral/brooklyn.git` then `mvn clean install`.
+* or, fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `mvn clean install`.
 
 ## Community

[23/32] brooklyn git commit: Add cd to path to build instructions

Posted by he...@apache.org.

Add cd to path to build instructions


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

Branch: refs/heads/0.7.0-incubating
Commit: b4ee6b34d994820520b6b36d3e749df05d908b4f
Parents: d139785
Author: Duncan Grant <du...@cloudsoftcorp.com>
Authored: Tue Jan 6 11:37:20 2015 +0000
Committer: Duncan Grant <du...@cloudsoftcorp.com>
Committed: Tue Jan 6 11:37:20 2015 +0000

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/b4ee6b34/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2de161b..db11401 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Three quick start options are available:
 
 * The [getting started guide](https://brooklyn.incubator.apache.org/quickstart/) will step you through downloading and installing Brooklyn and running the examples.
 * Alternatively, [download the latest release](https://github.com/brooklyncentral/brooklyn/tarball/master) (tgz),
-* or, fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `mvn clean install`.
+* or, fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `cd incubator-brooklyn; mvn clean install`.
 
 ## Community

[04/32] brooklyn git commit: Revert "Merge and close PR #43"

Posted by he...@apache.org.

Revert "Merge and close PR #43"

This reverts commit f6b5e90f09ec6eee622e62dc8a97ef94eda19fd7, reversing
changes made to 35dce9b92bc92d3221c2142f73b6ab8d04132e5e.


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

Branch: refs/heads/0.7.0-incubating
Commit: 78b0196ca005c53f1876dedfbc557f01e8674b8d
Parents: d0b28fc
Author: Richard Downer <ri...@apache.org>
Authored: Wed Jul 9 14:30:38 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Wed Jul 9 14:30:38 2014 +0100

----------------------------------------------------------------------
 README.md | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/78b0196c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f7b4164..961c716 100644
--- a/README.md
+++ b/README.md
@@ -68,20 +68,16 @@ See the [full guide to contributing](http://brooklyncentral.github.com/dev/how-t
 
 Thanks!
 
-----
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
+
+## Copyright and License
+
+© 2011 - 2013 Cloudsoft Corporation Limited.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. The licence is provided in LICENSE.md, and you may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+brooklyn is a registered trademark of Cloudsoft Corporation.
+

[05/32] brooklyn git commit: Revert "Revert "Merge and close PR #43""

Posted by he...@apache.org.

Revert "Revert "Merge and close PR #43""

This reverts commit b03200dbfc9acb5030633d7cd4326a50f2c3918a.

Re-open #43


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

Branch: refs/heads/0.7.0-incubating
Commit: 6733d5944f8fc64d3a8be9638925ad70ec592247
Parents: 78b0196
Author: Andrew Kennedy <gr...@apache.org>
Authored: Wed Jul 9 14:58:06 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Wed Jul 9 14:58:06 2014 +0100

----------------------------------------------------------------------
 README.md | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/6733d594/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 961c716..f7b4164 100644
--- a/README.md
+++ b/README.md
@@ -68,16 +68,20 @@ See the [full guide to contributing](http://brooklyncentral.github.com/dev/how-t
 
 Thanks!
 
-
-## Copyright and License
-
-© 2011 - 2013 Cloudsoft Corporation Limited.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. The licence is provided in LICENSE.md, and you may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-brooklyn is a registered trademark of Cloudsoft Corporation.
-
+----
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.

[11/32] brooklyn git commit: Instruct git to do eol normalization on text files (in case core.autocrlf is not set in git config)

Posted by he...@apache.org.

Instruct git to do eol normalization on text files (in case core.autocrlf is not set in git config)


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

Branch: refs/heads/0.7.0-incubating
Commit: 1354449d10d53e59c6a2fa8269b9567273e4669c
Parents: 9d37143
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Oct 6 21:46:39 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Oct 6 21:46:39 2014 +0300

----------------------------------------------------------------------
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/1354449d/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index 2bca294..dc165f0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 #Don't auto-convert line endings for shell scripts on Windows (breaks the scripts)
+* text=auto
 *.sh text eol=lf

[14/32] brooklyn git commit: fix mis-attribution in notice, and other tidies there (punctuation mainly)

Posted by he...@apache.org.

fix mis-attribution in notice, and other tidies there (punctuation mainly)


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

Branch: refs/heads/0.7.0-incubating
Commit: b92832663abaed38cae3a2f5acfe37cc6d0dfaf5
Parents: 48ab9d9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 11 12:29:52 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 11 12:43:09 2014 +0000

----------------------------------------------------------------------
 NOTICE | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/b9283266/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 4466310..dd496d3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -45,7 +45,7 @@ Copyright (c) Twitter, Inc (2012).
 Licensed under the Apache License 2.0.
 typeahead.js, bloodhound.js
 Copyright (c) Twitter, Inc (2013).
-Licensed under the MIT License
+Licensed under the MIT License.
 
 This product includes software developed by Yehuda Katz (https://github.com/wycats/):
 handlebars*.js.
@@ -84,46 +84,46 @@ Licensed under the MIT license.
 
 This product includes configuation files developed at MariaDB (https://mariadb.org/):
 Configuration file in software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
-Copyright (c) The MariaDB Foundation
-Licensed under GNU General Public License, version 2
+Copyright (c) The MariaDB Foundation.
+Licensed under GNU General Public License, version 2.
 
 This product includes configuation files developed at MySQL (http://www.mysql.com/):
 Configuration file in software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
-Copyright (c) The Oracle Corporation
-Licensed under Oracle’s Free and Open Source Software ("FOSS") License Exception
+Copyright (c) The Oracle Corporation.
+Licensed under Oracle’s Free and Open Source Software ("FOSS") License Exception.
 
 This product includes configuation files developed at PostgreSQL (http://www.postgresql.org/):
 Configuration file in software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
-Copyright (c) PostgreSQL Global Development Group
-Licensed under The PostgreSQL Licence (http://opensource.org/licenses/postgresql)
+Copyright (c) PostgreSQL Global Development Group.
+Licensed under the PostgreSQL Licence (http://opensource.org/licenses/postgresql).
 
 This product includes configuation files developed at rubyrep (http://www.rubyrep.org/):
 Configuration file in software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
-Licensed under MIT License
+Licensed under the MIT License.
 
 This product includes configuation files developed at Apache ActiveMQ (http://activemq.apache.org/):
 Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache Kafka (http://kafka.apache.org/):
 Configuration files in software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/*
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache Storm (https://storm.incubator.apache.org/):
 Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache Cassandra (http://cassandra.apache.org/):
 Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/*
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache CouchDB (http://couchdb.apache.org/):
 Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at MongoDB (http://www.mongodb.org/):
@@ -133,19 +133,20 @@ Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Redis (http://redis.io/):
 Configuration files in software/nosql/src/main/resources/brooklyn/entity/nosql/redis/*.conf
-Licensed under the Three Clause BSD license
+Copyright (c) Salvatore Sanfilippo, Pieter Noordhuis, and other contributors as listed in the git history.
+Licensed under the Three Clause BSD license.
 
 This product includes configuation files developed at Basho (http://basho.com/riak/):
 Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
-Copyright (c) Basho.
+Copyright (c) Basho Technologies.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache Solr (http://lucene.apache.org/solr/):
 Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
-Copyright (c) Apache Software Foundation
+Copyright (c) Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
-This product includes configuation files developed at Apache Solr (http://jbossas.jboss.org/):
+This product includes configuation files developed at Red Hat JBoss (http://jbossas.jboss.org/):
 Configuration file in software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/*.xml
-Copyright (c) JBoss
-Licensed under LGPL
+Copyright (c) Red Hat, Inc.
+Licensed under the Lesser GNU Public License 2.1.

[21/32] brooklyn git commit: Update copyright date for 2015 in NOTICE

Posted by he...@apache.org.

Update copyright date for 2015 in NOTICE

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

Branch: refs/heads/0.7.0-incubating
Commit: 2f5cf1e3b3e198442ad1a8adfb87e4d7e2a7e6fc
Parents: a01f316
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jan 5 13:05:57 2015 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jan 5 13:05:57 2015 +0000

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


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

[13/32] brooklyn git commit: Preserve CRLF line endings for Windows batch files

Posted by he...@apache.org.

Preserve CRLF line endings for Windows batch files


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

Branch: refs/heads/0.7.0-incubating
Commit: 48ab9d9f34fc9339eaa3eaf7fe56031c759d4e51
Parents: bd20c23
Author: Svetoslav Neykov <sv...@neykov.name>
Authored: Wed Oct 15 21:31:50 2014 +0300
Committer: Svetoslav Neykov <sv...@neykov.name>
Committed: Wed Oct 15 21:33:09 2014 +0300

----------------------------------------------------------------------
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/48ab9d9f/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index dc165f0..21ceeba 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
 #Don't auto-convert line endings for shell scripts on Windows (breaks the scripts)
 * text=auto
 *.sh text eol=lf
+*.bat text eol=crlf
+*.ps1 text eol=crlf
+

[08/32] brooklyn git commit: expand NOTICE for all included software and include license text in LICENSE

Posted by he...@apache.org.

expand NOTICE for all included software and include license text in LICENSE


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

Branch: refs/heads/0.7.0-incubating
Commit: e59bdf28708f323e9622429effbb2ea32026afc9
Parents: 50559ef
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Sep 19 10:42:55 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 19 11:14:57 2014 +0100

----------------------------------------------------------------------
 LICENSE | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 NOTICE  | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 140 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/e59bdf28/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index e885a7b..7694da5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -174,3 +174,68 @@ http://www.apache.org/licenses/
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
+
+
+
+
+OTHER LICENSES
+
+This software incorporates minor components developed elsewhere, as described in 
+the accompanying NOTICE file. In addition to the Apache License 2.0 (above),
+the other licenses referenced there under which those components are used are:
+
+
+
+The MIT License ("MIT")
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+The BSD 3-Clause License ("New BSD")
+
+Copyright (c) <YEAR>, <OWNER>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation 
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors 
+may be used to endorse or promote products derived from this software without 
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.

http://git-wip-us.apache.org/repos/asf/brooklyn/blob/e59bdf28/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index becdadf..f05bca7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,6 +2,79 @@
 Apache Brooklyn
 Copyright 2014 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software developed at The Apache Software Foundation (http://www.apache.org/):
+All code unless otherwise specified.
+Copyright (c) The Apache Software Foundation
+Licensed under the Apache License 2.0.
+
+This product includes software developed at The OSGi Alliance (http://www.osgi.org/):
+Java sources in org.osgi.*.
+Copyright (c) The OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at The jQuery Foundation (http://jquery.org/):
+jquery.js, selected jquery*.js.
+Copyright (c) John Resig (2011).
+Licensed under the MIT license (also available under GPLv2).
+
+This product includes software developed at The Dojo Foundation (http://dojofoundation.org/):
+require.js, text.js, sizzle.js in jquery.js.
+Copyright (c) The Dojo Foundation (2011, 2012).
+require.js and text.js licensed under the MIT license (also available under New BSD).
+sizzle.js portions of jquery.js licensed under the MIT license (also available under New BSD and GPL).
+
+This product includes software developed at SpryMedia Ltd  (http://sprymedia.co.uk/):
+jquery.dataTables.js, dataTables.extensions.js.
+Copyright (c) Allan Jardine (2008-2012).
+Licensed under the New BSD license (also available under GPLv2 and newer versions under Apache License 2.0).
+
+This product includes software developed at DocumentCloud Inc (http://www.documentcloud.org/):
+backbone.js, underscore.js.
+Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013).
+Licensed under the MIT license.
+
+This product includes software developed by Miller Medeiros (https://github.com/millermedeiros/):
+async.js.
+Copyright (c) Miller Medeiros (2011).
+Licensed under the MIT license.
+
+This product includes software developed at Twitter, Inc (http://twitter.com):
+bootstrap.js.
+Copyright (c) Twitter, Inc (2012).
+Licensed under the Apache License 2.0.
+
+This product includes software developed by Yehuda Katz (https://github.com/wycats/):
+handlebars*.js.
+Copyright (c) Yehuda Katz (2012).
+Licensed under the MIT license.
+
+This product includes software developed by "Cowboy" Ben Alman (http://benalman.com/).
+jquery.ba-bbq*.js
+Copyright (c) "Cowboy" Ben Alman (2010).
+Licensed under the MIT license (also available under GPL).
+
+This product includes software developed by WonderGroup and Jordan Thomas (http://labs.wondergroup.com/demos/mini-ui/index.html):
+jquery.wiggle.js.
+Copyright (c) WonderGroup and Jordan Thomas (2010).
+Licensed under the MIT license.
+
+This product includes software developed by Tim Wood (http://momentjs.com):
+moment.js
+Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014). 
+Licensed under the MIT license.
+
+This product includes software developed at Wordnik, Inc (https://github.com/wordnik/):
+swagger*.js.
+Copyright (c) Wordnik, Inc (2011-2014).
+Licensed under the Apache License 2.0.
+
+This product includes software developed by js-uri contributors (https://code.google.com/js-uri):
+URI.js.
+Copyright (c) js-uri contributors (2013).
+Licensed under the New BSD License.
+
+This product includes software developed by ZeroClipboard contributors (https://github.com/zeroclipboard):
+ZeroClipboard.{js,swf}
+Copyright (c) Jon Rohan, James M. Greene (2014).
+Licensed under the MIT license.

[03/32] brooklyn git commit: Updated various files following PR comments

Posted by he...@apache.org.

Updated various files following PR comments


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

Branch: refs/heads/0.7.0-incubating
Commit: d0b28fc1be64efc8bd442be3edfc5413e5479a35
Parents: 4e2e24b
Author: Martin Harris <gi...@nakomis.com>
Authored: Fri Jul 4 13:17:45 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Fri Jul 4 13:39:18 2014 +0100

----------------------------------------------------------------------
 README.md | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/d0b28fc1/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 961c716..f7b4164 100644
--- a/README.md
+++ b/README.md
@@ -68,16 +68,20 @@ See the [full guide to contributing](http://brooklyncentral.github.com/dev/how-t
 
 Thanks!
 
-
-## Copyright and License
-
-© 2011 - 2013 Cloudsoft Corporation Limited.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. The licence is provided in LICENSE.md, and you may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-brooklyn is a registered trademark of Cloudsoft Corporation.
-
+----
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.

[17/32] brooklyn git commit: Remove unnecessary config files from NOTICE

Posted by he...@apache.org.

Remove unnecessary config files from NOTICE

These config files are just starting points supplied by the
various projects in docs + blogs + default installs. The files
in Brooklyn are templated versions of the common install
configurations. These are files "without any degree of creativity".

e.g. see https://developer.jboss.org/message/909912 for an example
response from the community on licensing config files.


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

Branch: refs/heads/0.7.0-incubating
Commit: 506082ebc89a26fe1eace3106e7554e02f9fe7c4
Parents: 99f10c4
Author: Aled Sage <al...@gmail.com>
Authored: Thu Nov 13 09:44:42 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Nov 13 11:04:17 2014 +0000

----------------------------------------------------------------------
 NOTICE | 60 ------------------------------------------------------------
 1 file changed, 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/506082eb/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 55b920f..08039f7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,3 @@
-
 Apache Brooklyn
 Copyright 2014 The Apache Software Foundation
 
@@ -81,62 +80,3 @@ This product includes software developed by ZeroClipboard contributors (https://
 ZeroClipboard.{js,swf}
 Copyright (c) Jon Rohan, James M. Greene (2014).
 Licensed under the MIT license.
-
-This product includes configuation files developed at MySQL (http://www.mysql.com/):
-Configuration file in software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
-Copyright (c) The Oracle Corporation.
-Licensed under Oracle’s Free and Open Source Software ("FOSS") License Exception.
-
-This product includes configuation files developed at PostgreSQL (http://www.postgresql.org/):
-Configuration file in software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
-Copyright (c) PostgreSQL Global Development Group.
-Licensed under the PostgreSQL Licence (http://opensource.org/licenses/postgresql).
-
-This product includes configuation files developed at rubyrep (http://www.rubyrep.org/):
-Configuration file in software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
-Licensed under the MIT License.
-
-This product includes configuation files developed at Apache ActiveMQ (http://activemq.apache.org/):
-Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
-Copyright (c) The Apache Software Foundation.
-Licensed under the Apache License 2.0.
-
-This product includes configuation files developed at Apache Kafka (http://kafka.apache.org/):
-Configuration files in software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/*
-Copyright (c) The Apache Software Foundation.
-Licensed under the Apache License 2.0.
-
-This product includes configuation files developed at Apache Storm (https://storm.incubator.apache.org/):
-Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
-Copyright (c) The Apache Software Foundation.
-Licensed under the Apache License 2.0.
-
-This product includes configuation files developed at Apache Cassandra (http://cassandra.apache.org/):
-Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/*
-Copyright (c) The Apache Software Foundation.
-Licensed under the Apache License 2.0.
-
-This product includes configuation files developed at Apache CouchDB (http://couchdb.apache.org/):
-Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
-Copyright (c) The Apache Software Foundation.
-Licensed under the Apache License 2.0.
-
-This product includes configuation files developed at MongoDB (http://www.mongodb.org/):
-Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf
-Copyright (c) MongoDB, Inc.
-Licensed under the Apache License 2.0.
-
-This product includes configuation files developed at Redis (http://redis.io/):
-Configuration files in software/nosql/src/main/resources/brooklyn/entity/nosql/redis/*.conf
-Copyright (c) Salvatore Sanfilippo, Pieter Noordhuis, and other contributors as listed in the git history.
-Licensed under the Three Clause BSD license.
-
-This product includes configuation files developed at Basho (http://basho.com/riak/):
-Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
-Copyright (c) Basho Technologies.
-Licensed under the Apache License 2.0.
-
-This product includes configuation files developed at Apache Solr (http://lucene.apache.org/solr/):
-Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
-Copyright (c) Apache Software Foundation.
-Licensed under the Apache License 2.0.

[31/32] brooklyn git commit: Different LICENSE/NOTICE for usage/jsgui

Posted by he...@apache.org.

Different LICENSE/NOTICE for usage/jsgui


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

Branch: refs/heads/0.7.0-incubating
Commit: e697d1127b41bdeb8c1ab748e95bc843e998f2b6
Parents: b6f8e72
Author: Richard Downer <ri...@apache.org>
Authored: Thu Apr 16 14:24:41 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Apr 16 16:01:01 2015 +0100

----------------------------------------------------------------------
 usage/jsgui/src/main/license/LICENSE | 292 ++++++++++++++++++++++++++++++
 usage/jsgui/src/test/license/NOTICE  |   5 +
 2 files changed, 297 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/e697d112/usage/jsgui/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/LICENSE b/usage/jsgui/src/main/license/LICENSE
new file mode 100644
index 0000000..d9f5bc7
--- /dev/null
+++ b/usage/jsgui/src/main/license/LICENSE
@@ -0,0 +1,292 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+
+
+---------------------------------------------------
+
+This distribution contains third party resources.
+
+This product includes software developed at The jQuery Foundation (http://jquery.org/):
+jquery.js, selected jquery*.js.
+Copyright (c) John Resig (2011).
+Licensed under the MIT license (see below).
+
+This product includes software developed at The Dojo Foundation (http://dojofoundation.org/):
+require.js, text.js, sizzle.js in jquery.js.
+Copyright (c) The Dojo Foundation (2011, 2012).
+Licensed under the MIT license (see below).
+
+This product includes software developed at DocumentCloud Inc (http://www.documentcloud.org/):
+backbone.js, underscore.js.
+Copyright (c) Jeremy Ashkenas, DocumentCloud Inc (2010-2013).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Miller Medeiros (https://github.com/millermedeiros/):
+async.js.
+Copyright (c) Miller Medeiros (2011).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Yehuda Katz (https://github.com/wycats/):
+handlebars*.js.
+Copyright (c) Yehuda Katz (2012).
+Licensed under the MIT license (see below).
+
+This product includes software developed by "Cowboy" Ben Alman (http://benalman.com/).
+jquery.ba-bbq*.js
+Copyright (c) "Cowboy" Ben Alman (2010).
+Licensed under the MIT license (see below).
+
+This product includes software developed by WonderGroup and Jordan Thomas (http://labs.wondergroup.com/demos/mini-ui/index.html):
+jquery.wiggle.js.
+Copyright (c) WonderGroup and Jordan Thomas (2010).
+Licensed under the MIT license (see below).
+
+This product includes software developed by Tim Wood (http://momentjs.com):
+moment.js
+Copyright (c) Tim Wood, Iskren Chernev, Moment.js contributors (2011-2014).
+Licensed under the MIT license (see below).
+
+This product includes software developed by ZeroClipboard contributors (https://github.com/zeroclipboard):
+ZeroClipboard.js
+Copyright (c) Jon Rohan, James M. Greene (2014).
+Licensed under the MIT license (see below).
+
+This product includes software developed at SpryMedia Ltd (http://sprymedia.co.uk/):
+jquery.dataTables.js, dataTables.extensions.js
+Copyright (c) Allan Jardine (2008-2012).
+Licensed under the New BSD license (see below).
+
+This product includes software developed by js-uri contributors (https://code.google.com/js-uri):
+URI.js.
+Copyright (c) js-uri contributors (2013).
+Licensed under the New BSD license (see below).
+
+This product includes software developed by Vitaly Puzrin (https://github.com/nodeca/):
+js-yaml.js
+Copyright (c) Vitaly Puzrin (2011-2015).
+Licensed under the MIT license (see below).
+
+
+
+The MIT License ("MIT")
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+The BSD 3-Clause License ("New BSD")
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation 
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors 
+may be used to endorse or promote products derived from this software without 
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.

http://git-wip-us.apache.org/repos/asf/brooklyn/blob/e697d112/usage/jsgui/src/test/license/NOTICE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/license/NOTICE b/usage/jsgui/src/test/license/NOTICE
new file mode 100644
index 0000000..f790f13
--- /dev/null
+++ b/usage/jsgui/src/test/license/NOTICE
@@ -0,0 +1,5 @@
+Apache Brooklyn
+Copyright 2014-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

[15/32] brooklyn git commit: fix mis-attribution in notice, and other tidies there (punctuation mainly)

Posted by he...@apache.org.

fix mis-attribution in notice, and other tidies there (punctuation mainly)


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

Branch: refs/heads/0.7.0-incubating
Commit: 7d464a72d98ae326e385099fce9bc9a0ee6a192a
Parents: 48ab9d9
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 11 12:29:52 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 11 13:54:55 2014 +0000

----------------------------------------------------------------------
 NOTICE | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/7d464a72/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 4466310..dd496d3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -45,7 +45,7 @@ Copyright (c) Twitter, Inc (2012).
 Licensed under the Apache License 2.0.
 typeahead.js, bloodhound.js
 Copyright (c) Twitter, Inc (2013).
-Licensed under the MIT License
+Licensed under the MIT License.
 
 This product includes software developed by Yehuda Katz (https://github.com/wycats/):
 handlebars*.js.
@@ -84,46 +84,46 @@ Licensed under the MIT license.
 
 This product includes configuation files developed at MariaDB (https://mariadb.org/):
 Configuration file in software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
-Copyright (c) The MariaDB Foundation
-Licensed under GNU General Public License, version 2
+Copyright (c) The MariaDB Foundation.
+Licensed under GNU General Public License, version 2.
 
 This product includes configuation files developed at MySQL (http://www.mysql.com/):
 Configuration file in software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
-Copyright (c) The Oracle Corporation
-Licensed under Oracle’s Free and Open Source Software ("FOSS") License Exception
+Copyright (c) The Oracle Corporation.
+Licensed under Oracle’s Free and Open Source Software ("FOSS") License Exception.
 
 This product includes configuation files developed at PostgreSQL (http://www.postgresql.org/):
 Configuration file in software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
-Copyright (c) PostgreSQL Global Development Group
-Licensed under The PostgreSQL Licence (http://opensource.org/licenses/postgresql)
+Copyright (c) PostgreSQL Global Development Group.
+Licensed under the PostgreSQL Licence (http://opensource.org/licenses/postgresql).
 
 This product includes configuation files developed at rubyrep (http://www.rubyrep.org/):
 Configuration file in software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
-Licensed under MIT License
+Licensed under the MIT License.
 
 This product includes configuation files developed at Apache ActiveMQ (http://activemq.apache.org/):
 Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache Kafka (http://kafka.apache.org/):
 Configuration files in software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/*
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache Storm (https://storm.incubator.apache.org/):
 Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache Cassandra (http://cassandra.apache.org/):
 Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/*
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache CouchDB (http://couchdb.apache.org/):
 Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at MongoDB (http://www.mongodb.org/):
@@ -133,19 +133,20 @@ Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Redis (http://redis.io/):
 Configuration files in software/nosql/src/main/resources/brooklyn/entity/nosql/redis/*.conf
-Licensed under the Three Clause BSD license
+Copyright (c) Salvatore Sanfilippo, Pieter Noordhuis, and other contributors as listed in the git history.
+Licensed under the Three Clause BSD license.
 
 This product includes configuation files developed at Basho (http://basho.com/riak/):
 Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
-Copyright (c) Basho.
+Copyright (c) Basho Technologies.
 Licensed under the Apache License 2.0.
 
 This product includes configuation files developed at Apache Solr (http://lucene.apache.org/solr/):
 Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
-Copyright (c) Apache Software Foundation
+Copyright (c) Apache Software Foundation.
 Licensed under the Apache License 2.0.
 
-This product includes configuation files developed at Apache Solr (http://jbossas.jboss.org/):
+This product includes configuation files developed at Red Hat JBoss (http://jbossas.jboss.org/):
 Configuration file in software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/*.xml
-Copyright (c) JBoss
-Licensed under LGPL
+Copyright (c) Red Hat, Inc.
+Licensed under the Lesser GNU Public License 2.1.

[26/32] brooklyn git commit: fixed the getting started URL

Posted by he...@apache.org.

fixed the getting started URL


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

Branch: refs/heads/0.7.0-incubating
Commit: 36d037556e83a4bba7ae29ce09ef02b4b8ba6bfd
Parents: 8bb6b2d
Author: jadelus <jo...@jadelus.com>
Authored: Thu Feb 19 20:29:42 2015 -0800
Committer: jadelus <jo...@jadelus.com>
Committed: Thu Feb 19 20:29:42 2015 -0800

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/36d03755/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f2d828c..9dccf68 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Alternatively, use Brooklyn as an integrated-stand-alone management node for you
 
 Three quick start options are available:
 
-* The [getting started guide](https://brooklyn.incubator.apache.org/quickstart/) will step you through downloading and installing Brooklyn and running the examples.
+* The [getting started guide](https://brooklyn.incubator.apache.org/v/latest/start/running.html) will step you through downloading and installing Brooklyn and running the examples.
 * Alternatively, [download the latest release](https://github.com/brooklyncentral/brooklyn/tarball/master) (tgz),
 * or, fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `cd incubator-brooklyn; mvn clean install; cd usage/dist/target/brooklyn-dist; bin/brooklyn launch`
 `.

[28/32] brooklyn git commit: Changed the 'how-to-contrib' URL to point to apache.org

Posted by he...@apache.org.

Changed the 'how-to-contrib' URL to point to apache.org


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

Branch: refs/heads/0.7.0-incubating
Commit: 963f9faa84720e04e13e2808f05e63ca4e5c95dd
Parents: 3d62a19
Author: jadelus <jo...@jadelus.com>
Authored: Fri Feb 20 09:31:53 2015 -0800
Committer: jadelus <jo...@jadelus.com>
Committed: Fri Feb 20 09:31:53 2015 -0800

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/963f9faa/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index f95199d..b40d28e 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ Have a bug or a feature request? [Please open a new issue](https://issues.apache
 
 Your input will be welcomed.
 
-See the [full guide to contributing](http://brooklyncentral.github.com/dev/how-to-contrib.html) on brooklyncentral.github.com.
+See the [full guide to contributing](https://brooklyn.incubator.apache.org/community/how-to-contribute-docs.html) on brooklyn.incubator.apache.org.
 
 Thanks!

[24/32] brooklyn git commit: This closes #433

Posted by he...@apache.org.

This closes #433


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

Branch: refs/heads/0.7.0-incubating
Commit: f9aaa4d2975e19ece90b3c7492db4801df4f6428
Parents: 2f5cf1e b4ee6b3
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Jan 6 14:32:23 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Tue Jan 6 14:32:23 2015 +0000

----------------------------------------------------------------------
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------

[25/32] brooklyn git commit: Update the build instructions to include the launch command

Posted by he...@apache.org.

Update the build instructions to include the launch command


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

Branch: refs/heads/0.7.0-incubating
Commit: 8bb6b2d0b3d9e799614a47b64081c1dcac51f7b8
Parents: f9aaa4d
Author: Valentin Aitken <bo...@gmail.com>
Authored: Tue Feb 10 17:37:29 2015 +0200
Committer: Valentin Aitken <bo...@gmail.com>
Committed: Tue Feb 10 17:37:29 2015 +0200

----------------------------------------------------------------------
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/8bb6b2d0/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index db11401..f2d828c 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,8 @@ Three quick start options are available:
 
 * The [getting started guide](https://brooklyn.incubator.apache.org/quickstart/) will step you through downloading and installing Brooklyn and running the examples.
 * Alternatively, [download the latest release](https://github.com/brooklyncentral/brooklyn/tarball/master) (tgz),
-* or, fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `cd incubator-brooklyn; mvn clean install`.
+* or, fork or clone the repo: `git clone git://github.com/apache/incubator-brooklyn.git` then `cd incubator-brooklyn; mvn clean install; cd usage/dist/target/brooklyn-dist; bin/brooklyn launch`
+`.
 
 ## Community

[27/32] brooklyn git commit: Changed the open new issue URL from Brooklyn Central GitHub to Apache Jira

Posted by he...@apache.org.

Changed the open new issue URL from Brooklyn Central GitHub to Apache Jira


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

Branch: refs/heads/0.7.0-incubating
Commit: 3d62a19a7c35382c56e4bbe0d52f79da45d8d8ff
Parents: 36d0375
Author: jadelus <jo...@jadelus.com>
Authored: Thu Feb 19 21:35:34 2015 -0800
Committer: jadelus <jo...@jadelus.com>
Committed: Thu Feb 19 21:35:34 2015 -0800

----------------------------------------------------------------------
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/3d62a19a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9dccf68..f95199d 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,7 @@ Three quick start options are available:
 
 ## Bug Tracker
 
-Have a bug or a feature request? [Please open a new issue](https://github.com/brooklyncentral/brooklyn/issues).
-
+Have a bug or a feature request? [Please open a new issue](https://issues.apache.org/jira/browse/BROOKLYN/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
 
 ## Contributing

[16/32] brooklyn git commit: Remove from NOTICE MariaDB/JBoss config files

Posted by he...@apache.org.

Remove from NOTICE MariaDB/JBoss config files

- These are based on the defaults shipped with the given projects, 
  but just match snippets from the docs, and examples that are readily 
  available on a myriad of blogs. Our template config files are similar 
  to the default files, but unsurprisingly the defaults match docs and 
  thus match what one would write for a basic deployment.

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

Branch: refs/heads/0.7.0-incubating
Commit: 99f10c4e1ba8bcf756dadf41406e142fedc15718
Parents: 7d464a7 b928326
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 11 22:44:33 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 11 22:44:33 2014 +0000

----------------------------------------------------------------------
 NOTICE | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/99f10c4e/NOTICE
----------------------------------------------------------------------
diff --cc NOTICE
index dd496d3,dd496d3..55b920f
--- a/NOTICE
+++ b/NOTICE
@@@ -82,11 -82,11 +82,6 @@@ ZeroClipboard.{js,swf
  Copyright (c) Jon Rohan, James M. Greene (2014).
  Licensed under the MIT license.
  
--This product includes configuation files developed at MariaDB (https://mariadb.org/):
--Configuration file in software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
--Copyright (c) The MariaDB Foundation.
--Licensed under GNU General Public License, version 2.
--
  This product includes configuation files developed at MySQL (http://www.mysql.com/):
  Configuration file in software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
  Copyright (c) The Oracle Corporation.
@@@ -145,8 -145,8 +140,3 @@@ This product includes configuation file
  Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
  Copyright (c) Apache Software Foundation.
  Licensed under the Apache License 2.0.
--
--This product includes configuation files developed at Red Hat JBoss (http://jbossas.jboss.org/):
--Configuration file in software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/*.xml
--Copyright (c) Red Hat, Inc.
--Licensed under the Lesser GNU Public License 2.1.

[19/32] brooklyn git commit: Formatting tweak to LICENSE

Posted by he...@apache.org.

Formatting tweak to LICENSE

Hadrian Zbarcea noticed that the first lines of LICENSE are incorrectly
formatted - most likely due to copy-and-paste from the HTML page rather
than the text document.

No change to content.


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

Branch: refs/heads/0.7.0-incubating
Commit: 1b1ad459ed680f2e24a5ea6182f21d8c8374238f
Parents: b6ec4c7
Author: Richard Downer <ri...@apache.org>
Authored: Fri Dec 19 11:09:22 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Dec 19 11:09:22 2014 +0000

----------------------------------------------------------------------
 LICENSE | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/1b1ad459/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index df7b30f..3adafea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,7 @@
-Apache License
 
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

[29/32] brooklyn git commit: Ignore netbeans files

Posted by he...@apache.org.

Ignore netbeans files


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

Branch: refs/heads/0.7.0-incubating
Commit: bab58f848d201565aa04ad83b3c6c7747381e19b
Parents: 963f9fa
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Fri Nov 28 15:22:25 2014 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Fri Mar 13 23:27:42 2015 +0200

----------------------------------------------------------------------
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn/blob/bab58f84/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 045e2de..ed439f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ test-output/
 .idea/
 *.iml
 
+nbactions.xml
+nb-configuration.xml
+
 prodDb.*
 
 *.log

[12/32] brooklyn git commit: This closes #222

Posted by he...@apache.org.

This closes #222


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

Branch: refs/heads/0.7.0-incubating
Commit: bd20c232b7b20f925ba10f1d94597572a5c14168
Parents: eca5e8a 1354449
Author: Aled Sage <al...@gmail.com>
Authored: Wed Oct 15 12:41:12 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Oct 15 12:41:12 2014 +0100

----------------------------------------------------------------------
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------