You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/11/12 10:03:25 UTC
[1/3] incubator-brooklyn git commit: Remove from NOTICE MariaDB/JBoss
config files
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 5e538e9a3 -> 79e1c941d
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/26f5f7a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/26f5f7a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/26f5f7a2
Branch: refs/heads/master
Commit: 26f5f7a2bd2eef6476480a875e72f92ee638f7f4
Parents: 235afd0
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 11 22:44:33 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 11 22:44:33 2014 +0000
----------------------------------------------------------------------
NOTICE | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/26f5f7a2/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.
[3/3] incubator-brooklyn git commit: This closes #318
Posted by he...@apache.org.
This closes #318
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/79e1c941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/79e1c941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/79e1c941
Branch: refs/heads/master
Commit: 79e1c941d536d69606f8700093b130d4d73859fc
Parents: 5e538e9 66a89a7
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Nov 12 09:03:11 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Nov 12 09:03:11 2014 +0000
----------------------------------------------------------------------
NOTICE | 10 ----------
software/database/pom.xml | 6 +++---
software/messaging/pom.xml | 6 +++---
software/nosql/pom.xml | 6 +++---
software/webapp/pom.xml | 6 +++---
5 files changed, 12 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-brooklyn git commit: Improve RAT exclusion wording
for config files
Posted by he...@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/66a89a7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/66a89a7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/66a89a7c
Branch: refs/heads/master
Commit: 66a89a7cb6d04bdd51479ac8b702ab2e771bd1c3
Parents: 26f5f7a
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 11 22:45:02 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 11 22:45:02 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/66a89a7c/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index 7eec3cd..89090a1 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/66a89a7c/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 6f661d3..6246432 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/66a89a7c/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index fdb7bc1..fed2877 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/66a89a7c/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index ccb89a2..aeef6ad 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>