brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [54/59] [abbrv] git commit: Updated various files following PR comments
Date Wed, 09 Jul 2014 09:33:58 GMT
Updated various files following PR comments


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

Branch: refs/heads/master
Commit: e6c3e6b21e920656e32d5f50a6db54b8dd926b81
Parents: c3fb331
Author: Martin Harris <github@nakomis.com>
Authored: Fri Jul 4 13:17:45 2014 +0100
Committer: Martin Harris <github@nakomis.com>
Committed: Fri Jul 4 13:39:18 2014 +0100

----------------------------------------------------------------------
 README.md                                       | 30 +++++++++-------
 docs/_javadoc/make-javadoc.sh                   | 18 ----------
 docs/_javadoc/quick-make-few-javadoc.sh         | 18 ----------
 docs/_scripts/build.sh                          | 17 ---------
 docs/_scripts/jekyll-debug.sh                   | 18 ----------
 .../smoothness/jquery-ui-1.8.18.custom.css      | 20 +----------
 examples/global-web-fabric/README.txt           | 38 ++++++++++----------
 examples/hadoop-and-whirr/README.txt            | 36 +++++++++----------
 examples/simple-messaging-pubsub/README.txt     | 36 +++++++++----------
 examples/simple-nosql-cluster/README.md         | 18 ++++++++++
 examples/simple-open-loop-policy/README.txt     | 35 +++++++++---------
 examples/simple-web-cluster/README.txt          | 35 +++++++++---------
 .../src/main/assembly/files/README.txt          | 36 +++++++++----------
 sandbox/nosql/README.md                         | 18 ++++++++++
 .../entity/messaging/kafka/server.properties    | 16 +--------
 .../quickstart/src/brooklyn-sample/README.md    | 27 +++++++++-----
 .../src/main/assembly/files/README.txt          | 36 +++++++++----------
 usage/cli/README.md                             | 18 ++++++++++
 18 files changed, 216 insertions(+), 254 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/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.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/docs/_javadoc/make-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_javadoc/make-javadoc.sh b/docs/_javadoc/make-javadoc.sh
index ed2c7dd..2f9da56 100755
--- a/docs/_javadoc/make-javadoc.sh
+++ b/docs/_javadoc/make-javadoc.sh
@@ -1,22 +1,4 @@
 #!/bin/bash
-#
-# 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.
-#
 
 if [ -z "$GROOVY_CMD" ] ; then
   if [ ! -z "$GROOVY_HOME" ] ; then

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/docs/_javadoc/quick-make-few-javadoc.sh
----------------------------------------------------------------------
diff --git a/docs/_javadoc/quick-make-few-javadoc.sh b/docs/_javadoc/quick-make-few-javadoc.sh
index aba9dad..e7b6ae7 100755
--- a/docs/_javadoc/quick-make-few-javadoc.sh
+++ b/docs/_javadoc/quick-make-few-javadoc.sh
@@ -1,22 +1,4 @@
 #!/bin/bash
-#
-# 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.
-#
 
 if [ -z "$GROOVY_CMD" ] ; then
   if [ ! -z "$GROOVY_HOME" ] ; then

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/docs/_scripts/build.sh
----------------------------------------------------------------------
diff --git a/docs/_scripts/build.sh b/docs/_scripts/build.sh
index 7ce5554..b8b7ed2 100755
--- a/docs/_scripts/build.sh
+++ b/docs/_scripts/build.sh
@@ -1,22 +1,5 @@
 #!/bin/bash
 #
-# 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.
-#
 # this generates the site in _site
 # override --url /myMountPoint  (as an argument to this script) if you don't like the default
set in /_config.yml
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/docs/_scripts/jekyll-debug.sh
----------------------------------------------------------------------
diff --git a/docs/_scripts/jekyll-debug.sh b/docs/_scripts/jekyll-debug.sh
index 93dabf4..4654098 100755
--- a/docs/_scripts/jekyll-debug.sh
+++ b/docs/_scripts/jekyll-debug.sh
@@ -1,23 +1,5 @@
 #!/bin/bash
 #
-# 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.
-#
-
 # launches jekyll as a server at the / location, for easy debug
 
 jekyll --pygments --server --auto --url ""  $*

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/docs/style/js/jquery/smoothness/jquery-ui-1.8.18.custom.css
----------------------------------------------------------------------
diff --git a/docs/style/js/jquery/smoothness/jquery-ui-1.8.18.custom.css b/docs/style/js/jquery/smoothness/jquery-ui-1.8.18.custom.css
index 807d0f9..5236bb9 100644
--- a/docs/style/js/jquery/smoothness/jquery-ui-1.8.18.custom.css
+++ b/docs/style/js/jquery/smoothness/jquery-ui-1.8.18.custom.css
@@ -1,22 +1,4 @@
 /*
- * 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.
-*/
-/*
  * jQuery UI CSS Framework 1.8.18
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -580,4 +562,4 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset
extra pad
  * http://docs.jquery.com/UI/Progressbar#theming
  */
 .ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/examples/global-web-fabric/README.txt
----------------------------------------------------------------------
diff --git a/examples/global-web-fabric/README.txt b/examples/global-web-fabric/README.txt
index a28930c..81f8f9e 100644
--- a/examples/global-web-fabric/README.txt
+++ b/examples/global-web-fabric/README.txt
@@ -1,21 +1,3 @@
-/*
- * 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.
-*/
 Instructions for running examples
 =================================
 
@@ -35,4 +17,22 @@ This file should contain something like:
   brooklyn.jclouds.aws-ec2.identity=AKA50M30N3S1DFR0MAW55
   brooklyn.jclouds.aws-ec2.credential=aT0Ps3cr3tC0D3wh1chAW5w1llG1V3y0uTOus333
 
-Brooklyn defaults to using ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub.
\ No newline at end of file
+Brooklyn defaults to using ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub.
+
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/examples/hadoop-and-whirr/README.txt
----------------------------------------------------------------------
diff --git a/examples/hadoop-and-whirr/README.txt b/examples/hadoop-and-whirr/README.txt
index 3bee42a..abdb166 100644
--- a/examples/hadoop-and-whirr/README.txt
+++ b/examples/hadoop-and-whirr/README.txt
@@ -1,21 +1,3 @@
-/*
- * 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.
-*/
 Instructions for running examples
 =================================
 
@@ -49,3 +31,21 @@ Brooklyn defaults to using ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub
 ---
 
 For more information, please visit: http://brooklyncentral.github.com/use/examples/whirrhadoop/
+
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/examples/simple-messaging-pubsub/README.txt
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/README.txt b/examples/simple-messaging-pubsub/README.txt
index 89ae0a8..5b14552 100644
--- a/examples/simple-messaging-pubsub/README.txt
+++ b/examples/simple-messaging-pubsub/README.txt
@@ -1,21 +1,3 @@
-/*
- * 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.
-*/
 Instructions for running examples
 =================================
 
@@ -45,3 +27,21 @@ To test a Kafka distributed messaging cluster example, use the following
command
 ---
 
 For more information, please visit: http://brooklyncentral.github.com/use/examples/messaging/
+
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/examples/simple-nosql-cluster/README.md
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/README.md b/examples/simple-nosql-cluster/README.md
index 7a4e724..a932807 100644
--- a/examples/simple-nosql-cluster/README.md
+++ b/examples/simple-nosql-cluster/README.md
@@ -21,3 +21,21 @@ The commands below assume that the `brooklyn` script is already on your
$PATH, a
 --------
 
 For more information, please visit the (http://brooklyncentral.github.com/use/examples/nosql/)[NoSQL
examples page]
+
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/examples/simple-open-loop-policy/README.txt
----------------------------------------------------------------------
diff --git a/examples/simple-open-loop-policy/README.txt b/examples/simple-open-loop-policy/README.txt
index ab502d5..85c9336 100644
--- a/examples/simple-open-loop-policy/README.txt
+++ b/examples/simple-open-loop-policy/README.txt
@@ -1,21 +1,3 @@
-/*
- * 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.
-*/
 Instructions for Running Examples
 =================================
 
@@ -71,3 +53,20 @@ And in the pom, this local repo is referenced:
     </repository>
   </repositories>
 
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/examples/simple-web-cluster/README.txt
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/README.txt b/examples/simple-web-cluster/README.txt
index d130d03..11c1588 100644
--- a/examples/simple-web-cluster/README.txt
+++ b/examples/simple-web-cluster/README.txt
@@ -1,21 +1,3 @@
-/*
- * 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.
-*/
 Instructions for Running Examples
 =================================
 
@@ -60,3 +42,20 @@ For more information, please visit:
 
   http://brooklyncentral.github.com/use/examples/webcluster/
 
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/examples/simple-web-cluster/src/main/assembly/files/README.txt
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/src/main/assembly/files/README.txt b/examples/simple-web-cluster/src/main/assembly/files/README.txt
index a318ac2..cf49ea5 100644
--- a/examples/simple-web-cluster/src/main/assembly/files/README.txt
+++ b/examples/simple-web-cluster/src/main/assembly/files/README.txt
@@ -1,21 +1,3 @@
-/*
- * 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.
-*/
 Brooklyn Example
 ================
 
@@ -47,3 +29,21 @@ Usage:
     ./start.sh [--port 8081+] location
 
 Where location might be `localhost` (the defaul), or `aws-ec2:us-east-1`, `openstack:endpoint`,
etc.
+
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/sandbox/nosql/README.md
----------------------------------------------------------------------
diff --git a/sandbox/nosql/README.md b/sandbox/nosql/README.md
index 4ca3197..034d49a 100644
--- a/sandbox/nosql/README.md
+++ b/sandbox/nosql/README.md
@@ -72,3 +72,21 @@ multiple nodes (subject to the data being written being fairly evenly
 distributed across nodes).
 
 See http://docs.mongodb.org/manual/sharding/
+
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
b/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
index dacb3b8..dbf5edb 100644
--- a/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
+++ b/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
@@ -1,3 +1,4 @@
+[#ftl]
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -16,21 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-[#ftl]
-# Copyright 2013 by Cloudsoft Corp.
-#
-# Licensed 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.
-
 ##
 # KafkaBroker configuration template for Brooklyn
 #

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/usage/archetypes/quickstart/src/brooklyn-sample/README.md
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/README.md b/usage/archetypes/quickstart/src/brooklyn-sample/README.md
index b7ab8b6..1cccd0d 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/README.md
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/README.md
@@ -69,13 +69,22 @@ For more information consider:
 * Forking the Brooklyn project at  http://github.com/brooklyncentral/brooklyn
 * Emailing  brooklyn-users@googlegroups.com 
 
-For commercial enquiries -- including bespoke development and paid support --
-contact Cloudsoft, the supporters of Brooklyn, at:
-
-* www.CloudsoftCorp.com
-* info@cloudsoftcorp.com
-
-Brooklyn is (c) 2014 Cloudsoft Corporation and released as open source under 
-the Apache License v2.0.
-
 A sample Brooklyn project should specify its license.
+
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/files/README.txt
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/files/README.txt
b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/files/README.txt
index 9dae847..2dec72a 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/files/README.txt
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/assembly/files/README.txt
@@ -1,21 +1,3 @@
-/*
- * 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.
-*/
 brooklyn-sample
 ===
 
@@ -111,3 +93,21 @@ Brooklyn is (c) 2014 Cloudsoft Corporation and released as open source
under
 the Apache License v2.0.
 
 A sample Brooklyn project should specify its license here.
+
+----
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6c3e6b2/usage/cli/README.md
----------------------------------------------------------------------
diff --git a/usage/cli/README.md b/usage/cli/README.md
index b7b363e..f7a07ec 100644
--- a/usage/cli/README.md
+++ b/usage/cli/README.md
@@ -69,3 +69,21 @@ $ PATH=$PATH:${BROOKLYN_HOME}/usage/dist/brooklyn-0.4.0-SNAPSHOT-dist/bin
 $ export BROOKLYN_CLASSPATH=${BROOKLYN_HOME}/examples/simple-web-cluster/target/classes/
  # point this to your app
 $ brooklyn launch --app brooklyn.demo.SingleWebServerExample            # --location is set
to localhost by default
 ```
+
+----
+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.
\ No newline at end of file


Mime
View raw message