You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/12 12:21:50 UTC
[1/3] incubator-brooklyn git commit: fix mis-attribution in notice,
and other tidies there (punctuation mainly)
Repository: incubator-brooklyn
Updated Branches:
refs/heads/0.7.0-M2-incubating 657fe0c57 -> edcf928ee
fix mis-attribution in notice, and other tidies there (punctuation mainly)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/029a8f4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/029a8f4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/029a8f4e
Branch: refs/heads/0.7.0-M2-incubating
Commit: 029a8f4e5e531527a4158811d99c1a05665a9504
Parents: 657fe0c
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 11 12:29:52 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 12 11:19:23 2014 +0000
----------------------------------------------------------------------
NOTICE | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/029a8f4e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 4466310..dd496d3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -45,7 +45,7 @@ Copyright (c) Twitter, Inc (2012).
Licensed under the Apache License 2.0.
typeahead.js, bloodhound.js
Copyright (c) Twitter, Inc (2013).
-Licensed under the MIT License
+Licensed under the MIT License.
This product includes software developed by Yehuda Katz (https://github.com/wycats/):
handlebars*.js.
@@ -84,46 +84,46 @@ Licensed under the MIT license.
This product includes configuation files developed at MariaDB (https://mariadb.org/):
Configuration file in software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
-Copyright (c) The MariaDB Foundation
-Licensed under GNU General Public License, version 2
+Copyright (c) The MariaDB Foundation.
+Licensed under GNU General Public License, version 2.
This product includes configuation files developed at MySQL (http://www.mysql.com/):
Configuration file in software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
-Copyright (c) The Oracle Corporation
-Licensed under Oracle’s Free and Open Source Software ("FOSS") License Exception
+Copyright (c) The Oracle Corporation.
+Licensed under Oracle’s Free and Open Source Software ("FOSS") License Exception.
This product includes configuation files developed at PostgreSQL (http://www.postgresql.org/):
Configuration file in software/database/src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf
-Copyright (c) PostgreSQL Global Development Group
-Licensed under The PostgreSQL Licence (http://opensource.org/licenses/postgresql)
+Copyright (c) PostgreSQL Global Development Group.
+Licensed under the PostgreSQL Licence (http://opensource.org/licenses/postgresql).
This product includes configuation files developed at rubyrep (http://www.rubyrep.org/):
Configuration file in software/database/src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf
-Licensed under MIT License
+Licensed under the MIT License.
This product includes configuation files developed at Apache ActiveMQ (http://activemq.apache.org/):
Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
Licensed under the Apache License 2.0.
This product includes configuation files developed at Apache Kafka (http://kafka.apache.org/):
Configuration files in software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/*
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
Licensed under the Apache License 2.0.
This product includes configuation files developed at Apache Storm (https://storm.incubator.apache.org/):
Configuration file in software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
Licensed under the Apache License 2.0.
This product includes configuation files developed at Apache Cassandra (http://cassandra.apache.org/):
Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/*
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
Licensed under the Apache License 2.0.
This product includes configuation files developed at Apache CouchDB (http://couchdb.apache.org/):
Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini
-Copyright (c) The Apache Software Foundation
+Copyright (c) The Apache Software Foundation.
Licensed under the Apache License 2.0.
This product includes configuation files developed at MongoDB (http://www.mongodb.org/):
@@ -133,19 +133,20 @@ Licensed under the Apache License 2.0.
This product includes configuation files developed at Redis (http://redis.io/):
Configuration files in software/nosql/src/main/resources/brooklyn/entity/nosql/redis/*.conf
-Licensed under the Three Clause BSD license
+Copyright (c) Salvatore Sanfilippo, Pieter Noordhuis, and other contributors as listed in the git history.
+Licensed under the Three Clause BSD license.
This product includes configuation files developed at Basho (http://basho.com/riak/):
Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/riak/app.config
-Copyright (c) Basho.
+Copyright (c) Basho Technologies.
Licensed under the Apache License 2.0.
This product includes configuation files developed at Apache Solr (http://lucene.apache.org/solr/):
Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
-Copyright (c) Apache Software Foundation
+Copyright (c) Apache Software Foundation.
Licensed under the Apache License 2.0.
-This product includes configuation files developed at Apache Solr (http://jbossas.jboss.org/):
+This product includes configuation files developed at Red Hat JBoss (http://jbossas.jboss.org/):
Configuration file in software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/*.xml
-Copyright (c) JBoss
-Licensed under LGPL
+Copyright (c) Red Hat, Inc.
+Licensed under the Lesser GNU Public License 2.1.
[3/3] incubator-brooklyn git commit: Improve RAT exclusion wording
for config files
Posted by al...@apache.org.
Improve RAT exclusion wording for config 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/edcf928e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/edcf928e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/edcf928e
Branch: refs/heads/0.7.0-M2-incubating
Commit: edcf928ee65cc29a84376c822759e468a9f016fe
Parents: 12e7fe9
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 11 22:45:02 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 12 11:21:19 2014 +0000
----------------------------------------------------------------------
software/database/pom.xml | 6 +++---
software/messaging/pom.xml | 6 +++---
software/nosql/pom.xml | 6 +++---
software/webapp/pom.xml | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/edcf928e/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index 4c5b9c4e..0f2c1f1 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -42,9 +42,9 @@
<configuration>
<excludes combine.children="append">
<!--
- Configuration artifacts (for installations) that have been downloaded from other projects,
- and then templated. These are files "without any degree of creativity" from the perspective
- of the Brooklyn/Apache contribution.
+ Configuration artifacts (for installations) are based on templated defaults for
+ the given components. These are files "without any degree of creativity" from the
+ perspective of the Brooklyn/Apache contribution.
-->
<exclude>src/main/resources/brooklyn/entity/database/mariadb/my.cnf</exclude>
<exclude>src/main/resources/brooklyn/entity/database/mysql/mysql.conf</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/edcf928e/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index de95f5d..b4982d5 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -49,9 +49,9 @@
<configuration>
<excludes combine.children="append">
<!--
- Configuration artifacts (for installations) that have been downloaded from other projects,
- and then templated. These are files "without any degree of creativity" from the perspective
- of the Brooklyn/Apache contribution.
+ Configuration artifacts (for installations) are based on templated defaults for
+ the given components. These are files "without any degree of creativity" from the
+ perspective of the Brooklyn/Apache contribution.
-->
<exclude>src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml</exclude>
<exclude>src/main/resources/brooklyn/entity/messaging/kafka/server.properties</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/edcf928e/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 58aa2d7..06e439f 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -214,9 +214,9 @@
<configuration>
<excludes combine.children="append">
<!--
- Configuration artifacts (for installations) that have been downloaded from other projects,
- and then templated. These are files "without any degree of creativity" from the perspective
- of the Brooklyn/Apache contribution.
+ Configuration artifacts (for installations) are based on templated defaults for
+ the given components. These are files "without any degree of creativity" from the
+ perspective of the Brooklyn/Apache contribution.
-->
<exclude>src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-1.2.yaml</exclude>
<exclude>src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-2.0.yaml</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/edcf928e/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index 95d397f..5e5db6e 100644
--- a/software/webapp/pom.xml
+++ b/software/webapp/pom.xml
@@ -42,9 +42,9 @@
<configuration>
<excludes combine.children="append">
<!--
- Configuration artifacts (for installations) that have been downloaded from other projects,
- and then templated. These are files "without any degree of creativity" from the perspective
- of the Brooklyn/Apache contribution.
+ Configuration artifacts (for installations) are based on templated defaults for
+ the given components. These are files "without any degree of creativity" from the
+ perspective of the Brooklyn/Apache contribution.
-->
<exclude>src/main/resources/brooklyn/entity/webapp/jboss/jboss7-standalone.xml</exclude>
<exclude>src/main/resources/brooklyn/entity/webapp/jetty/jetty-brooklyn.xml</exclude>
[2/3] incubator-brooklyn git commit: Remove from NOTICE MariaDB/JBoss
config files
Posted by al...@apache.org.
Remove from NOTICE MariaDB/JBoss config files
- These are based on the defaults shipped with the given projects,
but just match snippets from the docs, and examples that are readily
available on a myriad of blogs. Our template config files are similar
to the default files, but unsurprisingly the defaults match docs and
thus match what one would write for a basic deployment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/12e7fe9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/12e7fe9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/12e7fe9c
Branch: refs/heads/0.7.0-M2-incubating
Commit: 12e7fe9c7c07f2cdeaeff587db925924e1394cd3
Parents: 029a8f4
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 11 22:44:33 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Nov 12 11:21:19 2014 +0000
----------------------------------------------------------------------
NOTICE | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/12e7fe9c/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index dd496d3..55b920f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -82,11 +82,6 @@ ZeroClipboard.{js,swf}
Copyright (c) Jon Rohan, James M. Greene (2014).
Licensed under the MIT license.
-This product includes configuation files developed at MariaDB (https://mariadb.org/):
-Configuration file in software/database/src/main/resources/brooklyn/entity/database/mariadb/my.cnf
-Copyright (c) The MariaDB Foundation.
-Licensed under GNU General Public License, version 2.
-
This product includes configuation files developed at MySQL (http://www.mysql.com/):
Configuration file in software/database/src/main/resources/brooklyn/entity/database/mysql/mysql.conf
Copyright (c) The Oracle Corporation.
@@ -145,8 +140,3 @@ This product includes configuation files developed at Apache Solr (http://lucene
Configuration file in software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
Copyright (c) Apache Software Foundation.
Licensed under the Apache License 2.0.
-
-This product includes configuation files developed at Red Hat JBoss (http://jbossas.jboss.org/):
-Configuration file in software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/*.xml
-Copyright (c) Red Hat, Inc.
-Licensed under the Lesser GNU Public License 2.1.