brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [44/59] [abbrv] git commit: Manually added apache copyright header to several misc files
Date Wed, 09 Jul 2014 09:33:48 GMT
Manually added apache copyright header to several misc files


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

Branch: refs/heads/master
Commit: 724615a8d3b9f8cada2fcf4c57e2ad4f4d082c60
Parents: aae30d3
Author: Martin Harris <github@nakomis.com>
Authored: Thu Jul 3 14:22:46 2014 +0100
Committer: Martin Harris <github@nakomis.com>
Committed: Fri Jul 4 13:39:12 2014 +0100

----------------------------------------------------------------------
 .../src/main/resources/passwd                   | 19 ++++++++++++++
 .../src/main/resources/mongodb.conf             | 19 ++++++++++++++
 .../org.marre.smsj-1.0.0-20051126.pom           | 18 +++++++++++++
 .../resources/jmeter-test-plan.jmx              | 18 +++++++++++++
 .../resources/jmeter-test-plan.jmx              | 18 +++++++++++++
 sandbox/dropwizard/brooklyn                     | 19 ++++++++++++++
 sandbox/dropwizard/brooklynd                    | 19 ++++++++++++++
 sandbox/dropwizard/config.sample.yml            | 19 ++++++++++++++
 .../brooklyn/rest/views/swagger-ui.ftl          | 20 +++++++++++++++
 .../resources/config/test-config-with-auth.yml  | 19 ++++++++++++++
 .../src/test/resources/config/test-config.yml   | 19 ++++++++++++++
 .../todo/WebClusterExampleNewDsl.groovyMock     | 19 ++++++++++++++
 .../main/resources/brooklyn/entity/salt/master  | 27 ++++++++++----------
 .../resources/brooklyn/entity/salt/masterless   | 26 +++++++++++--------
 .../main/resources/brooklyn/entity/salt/minion  | 27 +++++++++++---------
 .../hosted-chef-brooklyn-credentials/knife.rb   | 19 ++++++++++++++
 .../brooklyn/entity/database/mariadb/my.cnf     | 19 ++++++++++++++
 .../brooklyn/entity/database/mysql/mysql.conf   | 19 ++++++++++++++
 .../entity/database/postgresql/postgresql.conf  | 19 ++++++++++++++
 .../entity/database/rubyrep/rubyrep.conf        | 18 +++++++++++++
 .../brooklyn/entity/messaging/zookeeper/zoo.cfg | 25 ++++++++++--------
 .../entity/monitoring/monit/monit.monitrc       | 18 +++++++++++++
 .../entity/monitoring/monit/monitmysql.monitrc  | 19 ++++++++++++++
 .../monit/monitmysqlwithrestart.monitrc         | 19 ++++++++++++++
 .../brooklyn/entity/network/bind/domain.zone    | 19 ++++++++++++--
 .../brooklyn/entity/network/bind/ifcfg          | 20 ++++++++++++---
 .../brooklyn/entity/network/bind/named.conf     | 19 ++++++++++++--
 .../brooklyn/entity/network/bind/resolv.conf    | 19 ++++++++++++--
 .../brooklyn/entity/network/bind/reverse.zone   | 20 ++++++++++++---
 .../brooklyn/entity/nosql/couchdb/couch.ini     | 18 +++++++++++++
 .../entity/nosql/mongodb/default-mongodb.conf   | 19 ++++++++++++++
 .../brooklyn/entity/nosql/redis/redis.conf      | 19 ++++++++++++++
 .../brooklyn/entity/nosql/redis/slave.conf      | 19 ++++++++++++++
 .../brooklyn/entity/nosql/riak/app.config       | 19 ++++++++++++++
 .../nosql/src/test/resources/test-mongodb.conf  | 19 ++++++++++++++
 .../brooklyn/entity/dns/geoscaling/template.php | 18 +++++++++++++
 .../brooklyn/entity/proxy/nginx/server.conf     | 18 +++++++++++++
 .../entity/dns/geoscaling/expectedScript.php    | 18 +++++++++++++
 usage/dist/src/main/dist/bin/brooklyn           | 19 ++++++++++++--
 usage/dist/src/main/dist/bin/brooklyn.ps1       | 19 ++++++++++++--
 usage/scripts/buildAndTest                      | 17 ++++++++++++
 usage/scripts/release-branch-from-master        | 18 +++++++++++++
 usage/scripts/release-make                      | 18 +++++++++++++
 43 files changed, 774 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/examples/simple-messaging-pubsub/src/main/resources/passwd
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/src/main/resources/passwd b/examples/simple-messaging-pubsub/src/main/resources/passwd
index 814b1e6..f6e53d3 100644
--- a/examples/simple-messaging-pubsub/src/main/resources/passwd
+++ b/examples/simple-messaging-pubsub/src/main/resources/passwd
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # Custom password file
 guest:guest
 admin:password

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/examples/simple-nosql-cluster/src/main/resources/mongodb.conf
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/resources/mongodb.conf b/examples/simple-nosql-cluster/src/main/resources/mongodb.conf
index 4e7bf6b..5237a54 100644
--- a/examples/simple-nosql-cluster/src/main/resources/mongodb.conf
+++ b/examples/simple-nosql-cluster/src/main/resources/mongodb.conf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # MongoDB configuration file
 
 # Startup configuration.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom
----------------------------------------------------------------------
diff --git a/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom b/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom
index 7361303..520780e 100644
--- a/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom
+++ b/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/examples/simple-open-loop-policy/resources/jmeter-test-plan.jmx
----------------------------------------------------------------------
diff --git a/examples/simple-open-loop-policy/resources/jmeter-test-plan.jmx b/examples/simple-open-loop-policy/resources/jmeter-test-plan.jmx
index 5487b8f..b3fa9c3 100644
--- a/examples/simple-open-loop-policy/resources/jmeter-test-plan.jmx
+++ b/examples/simple-open-loop-policy/resources/jmeter-test-plan.jmx
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <jmeterTestPlan version="1.2" properties="2.1">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Brooklyn local webapp test - load for localhost:8000" enabled="true">

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/examples/simple-web-cluster/resources/jmeter-test-plan.jmx
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/resources/jmeter-test-plan.jmx b/examples/simple-web-cluster/resources/jmeter-test-plan.jmx
index 5487b8f..b3fa9c3 100644
--- a/examples/simple-web-cluster/resources/jmeter-test-plan.jmx
+++ b/examples/simple-web-cluster/resources/jmeter-test-plan.jmx
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <jmeterTestPlan version="1.2" properties="2.1">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Brooklyn local webapp test - load for localhost:8000" enabled="true">

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/dropwizard/brooklyn
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/brooklyn b/sandbox/dropwizard/brooklyn
index 348c36b..92bb4ea 100755
--- a/sandbox/dropwizard/brooklyn
+++ b/sandbox/dropwizard/brooklyn
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 #! /bin/bash
 #
 # Brooklyn cli client

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/dropwizard/brooklynd
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/brooklynd b/sandbox/dropwizard/brooklynd
index d670936..9b14df2 100755
--- a/sandbox/dropwizard/brooklynd
+++ b/sandbox/dropwizard/brooklynd
@@ -1,2 +1,21 @@
 #! /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.
+#
+
 java -jar target/brooklyn-rest-SANDBOX-*-SNAPSHOT.jar $@

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/dropwizard/config.sample.yml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/config.sample.yml b/sandbox/dropwizard/config.sample.yml
index 4da08e7..e7957cd 100644
--- a/sandbox/dropwizard/config.sample.yml
+++ b/sandbox/dropwizard/config.sample.yml
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # Config file for the Brooklyn REST endpoint
 
 stopApplicationsOnExit: true

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl b/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl
index badfb39..bf1540b 100644
--- a/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl
+++ b/sandbox/dropwizard/src/main/resources/brooklyn/rest/views/swagger-ui.ftl
@@ -1,5 +1,25 @@
 <#-- @ftlvariable name="" type="brooklyn.rest.views.SwaggerUiView" -->
 <!DOCTYPE html>
+
+<!--
+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.
+-->
+
 <html>
 <head>
     <meta charset='utf-8'/>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml b/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml
index 3f1ea52..0b529b3 100644
--- a/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml
+++ b/sandbox/dropwizard/src/test/resources/config/test-config-with-auth.yml
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # Config file for the Brooklyn REST endpoint
 
 stopApplicationsOnExit: true

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/dropwizard/src/test/resources/config/test-config.yml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/resources/config/test-config.yml b/sandbox/dropwizard/src/test/resources/config/test-config.yml
index 5064f20..dc965e6 100644
--- a/sandbox/dropwizard/src/test/resources/config/test-config.yml
+++ b/sandbox/dropwizard/src/test/resources/config/test-config.yml
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # Config file for the Brooklyn REST endpoint
 
 stopApplicationsOnExit: true

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock
index 648e6cb..183e8ed 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebClusterExampleNewDsl.groovyMock
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
 package brooklyn.demo
 
 import java.util.List

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/extra/src/main/resources/brooklyn/entity/salt/master
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/resources/brooklyn/entity/salt/master b/sandbox/extra/src/main/resources/brooklyn/entity/salt/master
index 0f5ccc3..72d7eb9 100644
--- a/sandbox/extra/src/main/resources/brooklyn/entity/salt/master
+++ b/sandbox/extra/src/main/resources/brooklyn/entity/salt/master
@@ -1,20 +1,21 @@
 [#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
+# 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
 #
-# 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://www.apache.org/licenses/LICENSE-2.0
 #
-# SaltStack Master Configuration
+# 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.
 #
 # /etc/salt/master
 ##

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless b/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless
index 5477bc8..ba41c6e 100644
--- a/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless
+++ b/sandbox/extra/src/main/resources/brooklyn/entity/salt/masterless
@@ -1,18 +1,22 @@
 [#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
+# 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
+#  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.
+# 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.
 #
 # SaltStack Masterless Minion Configuration
 #
@@ -46,4 +50,4 @@ file_roots:
 output: nested
 color: False
 log_level: info
-log_level_logfile: debug # Debugging
\ No newline at end of file
+log_level_logfile: debug # Debugging

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion b/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion
index 34f6caf..cff42c7 100644
--- a/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion
+++ b/sandbox/extra/src/main/resources/brooklyn/entity/salt/minion
@@ -1,18 +1,21 @@
 [#ftl]
 ##
-# Copyright 2013 by Cloudsoft Corp.
+# 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
 #
-# 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
 #
-# 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.
+# 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.
 #
 # SaltStack Minion Configuration
 #
@@ -46,4 +49,4 @@ key_logfile: ${runDir}/key.log
 output: nested
 color: False
 log_level: info
-log_level_logfile: debug # Debugging
\ No newline at end of file
+log_level_logfile: debug # Debugging

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/base/src/test/resources/brooklyn/entity/chef/hosted-chef-brooklyn-credentials/knife.rb
----------------------------------------------------------------------
diff --git a/software/base/src/test/resources/brooklyn/entity/chef/hosted-chef-brooklyn-credentials/knife.rb b/software/base/src/test/resources/brooklyn/entity/chef/hosted-chef-brooklyn-credentials/knife.rb
index 8c77792..d52e492 100644
--- a/software/base/src/test/resources/brooklyn/entity/chef/hosted-chef-brooklyn-credentials/knife.rb
+++ b/software/base/src/test/resources/brooklyn/entity/chef/hosted-chef-brooklyn-credentials/knife.rb
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 current_dir = File.dirname(__FILE__)
 log_level                :info
 log_location             STDOUT

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
----------------------------------------------------------------------
diff --git a/software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf b/software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
index d78f88e..fd4bdbe 100644
--- a/software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
+++ b/software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 [client]
 port            = ${driver.port?c}
 socket          = /tmp/mysql.sock.${entity.socketUid}.${driver.port?c}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
----------------------------------------------------------------------
diff --git a/software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf b/software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
index 85f55ab..f0af485 100644
--- a/software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
+++ b/software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 [client]
 port            = ${driver.port?c}
 socket          = /tmp/mysql.sock.${entity.socketUid}.${driver.port?c}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
----------------------------------------------------------------------
diff --git a/software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf b/software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
index 9ba5a0a..957a911 100644
--- a/software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
+++ b/software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
@@ -1,4 +1,23 @@
 [#ftl]
+#
+# 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.
+#
+
 # -----------------------------
 # PostgreSQL configuration file
 # -----------------------------

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
----------------------------------------------------------------------
diff --git a/software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf b/software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
index 485d290..bb3f37c 100644
--- a/software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
+++ b/software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
@@ -1,4 +1,22 @@
 [#ftl]
+#
+# 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.
+#
 
 RR::Initializer::run do |config|
 config.left = {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/messaging/src/main/resources/brooklyn/entity/messaging/zookeeper/zoo.cfg
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/brooklyn/entity/messaging/zookeeper/zoo.cfg b/software/messaging/src/main/resources/brooklyn/entity/messaging/zookeeper/zoo.cfg
index 944ff99..79721a6 100644
--- a/software/messaging/src/main/resources/brooklyn/entity/messaging/zookeeper/zoo.cfg
+++ b/software/messaging/src/main/resources/brooklyn/entity/messaging/zookeeper/zoo.cfg
@@ -1,17 +1,22 @@
 [#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
+# 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
+#  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.
 #
-# 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.
 
 ##
 # ZooKeeper configuration template for Brooklyn

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monit.monitrc
----------------------------------------------------------------------
diff --git a/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monit.monitrc b/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monit.monitrc
index 32180fd..99588dd 100644
--- a/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monit.monitrc
+++ b/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monit.monitrc
@@ -1,4 +1,22 @@
 [#ftl]
+#
+# 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.
+#
 
 set httpd port 2812 and use address localhost
 allow localhost

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysql.monitrc
----------------------------------------------------------------------
diff --git a/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysql.monitrc b/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysql.monitrc
index 57cfee6..b5bc4a6 100644
--- a/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysql.monitrc
+++ b/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysql.monitrc
@@ -1,4 +1,23 @@
 [#ftl]
+#
+# 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.
+#
+
 set httpd port 2812 and use address localhost
 allow localhost
 set daemon 5

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysqlwithrestart.monitrc
----------------------------------------------------------------------
diff --git a/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysqlwithrestart.monitrc b/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysqlwithrestart.monitrc
index fb10e3c..171fa71 100644
--- a/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysqlwithrestart.monitrc
+++ b/software/monitoring/src/test/resources/brooklyn/entity/monitoring/monit/monitmysqlwithrestart.monitrc
@@ -1,4 +1,23 @@
 [#ftl]
+#
+# 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.
+#
+
 set httpd port 2812 and use address localhost
 allow localhost
 set daemon 5

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/network/src/main/resources/brooklyn/entity/network/bind/domain.zone
----------------------------------------------------------------------
diff --git a/software/network/src/main/resources/brooklyn/entity/network/bind/domain.zone b/software/network/src/main/resources/brooklyn/entity/network/bind/domain.zone
index 6319331..d380298 100644
--- a/software/network/src/main/resources/brooklyn/entity/network/bind/domain.zone
+++ b/software/network/src/main/resources/brooklyn/entity/network/bind/domain.zone
@@ -1,9 +1,24 @@
 [#ftl]
 ;;
+;; 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.
+;;
 ;; Generated by Brooklyn on ${.now?string.short}
 ;;
-;; Copyright 2013 by Cloudsoft Corp.
-;; Licensed under the Apache License, Version 2.0 
 ;;
 [#noparse]$TTL[/#noparse] 86400
 @ IN SOA ns1.${entity.domainName}. root.${entity.domainName}. (

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/network/src/main/resources/brooklyn/entity/network/bind/ifcfg
----------------------------------------------------------------------
diff --git a/software/network/src/main/resources/brooklyn/entity/network/bind/ifcfg b/software/network/src/main/resources/brooklyn/entity/network/bind/ifcfg
index be4db51..b8b310d 100644
--- a/software/network/src/main/resources/brooklyn/entity/network/bind/ifcfg
+++ b/software/network/src/main/resources/brooklyn/entity/network/bind/ifcfg
@@ -1,9 +1,23 @@
 [#ftl]
 #
-# Generated by Brooklyn on ${.now?string.short}
+# 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
 #
-# Copyright 2013 by Cloudsoft Corp.
-# Licensed under the Apache License, Version 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.
+#
+# Generated by Brooklyn on ${.now?string.short}
 #
 DOMAIN=${entity.domainName}
 DNS1=${driver.address}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/network/src/main/resources/brooklyn/entity/network/bind/named.conf
----------------------------------------------------------------------
diff --git a/software/network/src/main/resources/brooklyn/entity/network/bind/named.conf b/software/network/src/main/resources/brooklyn/entity/network/bind/named.conf
index 56969ba..303e7ff 100644
--- a/software/network/src/main/resources/brooklyn/entity/network/bind/named.conf
+++ b/software/network/src/main/resources/brooklyn/entity/network/bind/named.conf
@@ -1,9 +1,24 @@
 [#ftl]
 //
+// 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.
+//
 // Generated by Brooklyn on ${.now?string.short}
 //
-// Copyright 2013 by Cloudsoft Corp.
-// Licensed under the Apache License, Version 2.0
 //
 options {
     listen-on port ${entity.dnsPort} { 127.0.0.1; ${driver.address}; };

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/network/src/main/resources/brooklyn/entity/network/bind/resolv.conf
----------------------------------------------------------------------
diff --git a/software/network/src/main/resources/brooklyn/entity/network/bind/resolv.conf b/software/network/src/main/resources/brooklyn/entity/network/bind/resolv.conf
index 65a1a52..ade4ce0 100644
--- a/software/network/src/main/resources/brooklyn/entity/network/bind/resolv.conf
+++ b/software/network/src/main/resources/brooklyn/entity/network/bind/resolv.conf
@@ -1,9 +1,24 @@
 [#ftl]
 #
+# 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.
+#
 # Generated by Brooklyn on ${.now?string.short}
 #
-# Copyright 2013 by Cloudsoft Corp.
-# Licensed under the Apache License, Version 2.0
 #
 search ${entity.domainName}
 nameserver ${driver.address}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/network/src/main/resources/brooklyn/entity/network/bind/reverse.zone
----------------------------------------------------------------------
diff --git a/software/network/src/main/resources/brooklyn/entity/network/bind/reverse.zone b/software/network/src/main/resources/brooklyn/entity/network/bind/reverse.zone
index 4248122..fa21e7e 100644
--- a/software/network/src/main/resources/brooklyn/entity/network/bind/reverse.zone
+++ b/software/network/src/main/resources/brooklyn/entity/network/bind/reverse.zone
@@ -1,9 +1,23 @@
 [#ftl]
 ;;
-;; Generated by Brooklyn on ${.now?string.short}
+;; 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
 ;;
-;; Copyright 2013 by Cloudsoft Corp.
-;; Licensed under the Apache License, Version 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.
+;;
+;; Generated by Brooklyn on ${.now?string.short}
 ;;
 [#noparse]$TTL[/#noparse] 86400
 @ IN SOA ns1.${entity.domainName}. root.${entity.domainName}. (

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini b/software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
index 374e6c3..b0344b6 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
@@ -1,4 +1,22 @@
 [#ftl]
+#
+# 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.
+#
 [couchdb]
 database_dir = ${driver.runDir}
 view_index_dir = ${driver.runDir}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf b/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf
index c3fcf1b..5394a19 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf
@@ -1,4 +1,23 @@
 [#ftl]
+#
+# 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.
+#
+
 # MongoDB configuration file
 
 # Startup configuration

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/redis.conf
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/redis.conf b/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/redis.conf
index 0554eb2..a81899c 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/redis.conf
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/redis.conf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # Redis configuration file
 
 # Start as daemon

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/slave.conf
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/slave.conf b/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/slave.conf
index 3a9e64a..5ab85ac 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/slave.conf
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/redis/slave.conf
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 # Redis configuration file
 
 # Start as daemon

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config b/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
index f1100fa..56b354d 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
@@ -1,3 +1,22 @@
+%%
+%% 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 note: file from 1.4.8 Mac install, with erlang section added, and ports templated
 
 %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/nosql/src/test/resources/test-mongodb.conf
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/resources/test-mongodb.conf b/software/nosql/src/test/resources/test-mongodb.conf
index 3364be5..ed4234e 100644
--- a/software/nosql/src/test/resources/test-mongodb.conf
+++ b/software/nosql/src/test/resources/test-mongodb.conf
@@ -1,4 +1,23 @@
 [#ftl]
+#
+# 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.
+#
+
 # MongoDB configuration file
 # See http://docs.mongodb.org/manual/reference/configuration-options/
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/webapp/src/main/resources/brooklyn/entity/dns/geoscaling/template.php
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/resources/brooklyn/entity/dns/geoscaling/template.php b/software/webapp/src/main/resources/brooklyn/entity/dns/geoscaling/template.php
index 31efe6b..7c879f1 100755
--- a/software/webapp/src/main/resources/brooklyn/entity/dns/geoscaling/template.php
+++ b/software/webapp/src/main/resources/brooklyn/entity/dns/geoscaling/template.php
@@ -1,3 +1,21 @@
+/*
+ * 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.
+*/
 
 /**************************************************************************************
  **  DO NOT modify this script, as your changes will likely be overwritten.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/webapp/src/main/resources/brooklyn/entity/proxy/nginx/server.conf
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/resources/brooklyn/entity/proxy/nginx/server.conf b/software/webapp/src/main/resources/brooklyn/entity/proxy/nginx/server.conf
index 67bcd97..72f38e6 100644
--- a/software/webapp/src/main/resources/brooklyn/entity/proxy/nginx/server.conf
+++ b/software/webapp/src/main/resources/brooklyn/entity/proxy/nginx/server.conf
@@ -1,4 +1,22 @@
 [#ftl]
+#
+# 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.
+#
 # example nginx configuration file
 
 pid ${driver.pidFile};

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/software/webapp/src/test/resources/brooklyn/entity/dns/geoscaling/expectedScript.php
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/resources/brooklyn/entity/dns/geoscaling/expectedScript.php b/software/webapp/src/test/resources/brooklyn/entity/dns/geoscaling/expectedScript.php
index 840b57c..dbf03aa 100644
--- a/software/webapp/src/test/resources/brooklyn/entity/dns/geoscaling/expectedScript.php
+++ b/software/webapp/src/test/resources/brooklyn/entity/dns/geoscaling/expectedScript.php
@@ -1,3 +1,21 @@
+/*
+ * 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.
+*/
 
 /**************************************************************************************
  **  DO NOT modify this script, as your changes will likely be overwritten.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/usage/dist/src/main/dist/bin/brooklyn
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/dist/bin/brooklyn b/usage/dist/src/main/dist/bin/brooklyn
index 6f6c132..ae8b659 100755
--- a/usage/dist/src/main/dist/bin/brooklyn
+++ b/usage/dist/src/main/dist/bin/brooklyn
@@ -1,9 +1,24 @@
 #!/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.
+#
 # Brooklyn
 #
-# Copyright 2011-2013 by Cloudsoft Corp.
-# Licensed under the Apache 2.0 License
 
 #set -x # debug
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/usage/dist/src/main/dist/bin/brooklyn.ps1
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/dist/bin/brooklyn.ps1 b/usage/dist/src/main/dist/bin/brooklyn.ps1
index 0bea983..073eba7 100644
--- a/usage/dist/src/main/dist/bin/brooklyn.ps1
+++ b/usage/dist/src/main/dist/bin/brooklyn.ps1
@@ -1,9 +1,24 @@
 #!ps1
 #
+# 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
 #
-# Copyright 2013 by Cloudsoft Corp.
-# Licensed under the Apache 2.0 License
 
 $ErrorActionPreference = "Stop";
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/usage/scripts/buildAndTest
----------------------------------------------------------------------
diff --git a/usage/scripts/buildAndTest b/usage/scripts/buildAndTest
index 82ebc13..45c1a26 100755
--- a/usage/scripts/buildAndTest
+++ b/usage/scripts/buildAndTest
@@ -1,5 +1,22 @@
 #!/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.
+#
 # Convenience script to clean, build, install and run unit and/or integration tests.
 # Recommend you run this prior to pushing to Github to reduce the chances of breaking
 # the continuous integration (unit tests) or overnight builds (integration tests.)

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/usage/scripts/release-branch-from-master
----------------------------------------------------------------------
diff --git a/usage/scripts/release-branch-from-master b/usage/scripts/release-branch-from-master
index 085bfa4..8d7befa 100755
--- a/usage/scripts/release-branch-from-master
+++ b/usage/scripts/release-branch-from-master
@@ -1,4 +1,22 @@
 #!/bin/bash -e
+#
+# 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.
+#
 
 usage(){
 	echo >&2 'Usage: release-branch-from-master --release <version> [ --release-suffix <suffix> ]'

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/724615a8/usage/scripts/release-make
----------------------------------------------------------------------
diff --git a/usage/scripts/release-make b/usage/scripts/release-make
index a3cc54b..df46ea1 100755
--- a/usage/scripts/release-make
+++ b/usage/scripts/release-make
@@ -1,4 +1,22 @@
 #!/bin/bash -e -u
+#
+# 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.
+#
 
 usage(){
 	echo >&2 'Usage: release-make [ --release <version> ] [ --next <version> ]'


Mime
View raw message