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/10/08 01:59:42 UTC
[03/18] git commit: Remove apache header from install config files
Remove apache header from install config files
- These are files "without any degree of creativity" from the
perspective of the Brooklyn/Apache contribution.
These files originate from the install artefacts of things to be
installed, and are often templated to make it easier to inject
port numbers etc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/14b6a0d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/14b6a0d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/14b6a0d4
Branch: refs/heads/master
Commit: 14b6a0d45d51a662299a3617fa6df16d07feb59d
Parents: ff11b4f
Author: Aled Sage <al...@gmail.com>
Authored: Fri Oct 3 14:01:07 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Oct 3 14:01:07 2014 +0100
----------------------------------------------------------------------
software/database/pom.xml | 24 ++++++++++++++++++++
.../brooklyn/entity/database/mariadb/my.cnf | 19 ----------------
.../brooklyn/entity/database/mysql/mysql.conf | 19 ----------------
.../entity/database/postgresql/postgresql.conf | 17 --------------
.../entity/database/rubyrep/rubyrep.conf | 17 --------------
software/messaging/pom.xml | 24 ++++++++++++++++++++
.../entity/messaging/activemq/activemq.xml | 18 ---------------
.../entity/messaging/kafka/server.properties | 17 --------------
.../entity/messaging/kafka/zookeeper.properties | 17 --------------
.../brooklyn/entity/messaging/storm/storm.yaml | 17 --------------
software/nosql/pom.xml | 23 +++++++++++++++++--
.../entity/nosql/cassandra/cassandra-1.2.yaml | 17 --------------
.../entity/nosql/cassandra/cassandra-2.0.yaml | 17 --------------
.../nosql/cassandra/cassandra-rackdc.properties | 18 ---------------
.../brooklyn/entity/nosql/couchdb/couch.ini | 17 --------------
.../entity/nosql/mongodb/default-mongodb.conf | 18 ---------------
.../brooklyn/entity/nosql/redis/redis.conf | 19 ----------------
.../brooklyn/entity/nosql/redis/slave.conf | 19 ----------------
.../brooklyn/entity/nosql/riak/app.config | 19 ----------------
.../brooklyn/entity/nosql/solr/solr.xml | 18 ---------------
software/webapp/pom.xml | 22 ++++++++++++++++++
.../entity/webapp/jboss/jboss7-standalone.xml | 18 ---------------
.../entity/webapp/jetty/jetty-brooklyn.xml | 18 ---------------
23 files changed, 91 insertions(+), 341 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index 66c005f..1fccba9 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -34,6 +34,30 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <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.
+ -->
+ <exclude>src/main/resources/brooklyn/entity/database/mariadb/my.cnf</exclude>
+ <exclude>src/main/resources/brooklyn/entity/database/mysql/mysql.conf</exclude>
+ <exclude>src/main/resources/brooklyn/entity/database/postgresql/postgresql.conf</exclude>
+ <exclude>src/main/resources/brooklyn/entity/database/rubyrep/rubyrep.conf</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<dependencies>
<dependency>
<groupId>io.brooklyn</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/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 fd4bdbe..d78f88e 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,22 +1,3 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
[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/14b6a0d4/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 f0af485..85f55ab 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,22 +1,3 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
[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/14b6a0d4/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 957a911..b6234c9 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,22 +1,5 @@
[#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/14b6a0d4/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 bb3f37c..12fed6f 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,22 +1,5 @@
[#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/14b6a0d4/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 760045d..2dc49c5 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -40,6 +40,30 @@
</repository>
</repositories>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <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.
+ -->
+ <exclude>src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml</exclude>
+ <exclude>src/main/resources/brooklyn/entity/messaging/kafka/server.properties</exclude>
+ <exclude>src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties</exclude>
+ <exclude>src/main/resources/brooklyn/entity/messaging/storm/storm.yaml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<dependencies>
<dependency>
<groupId>io.brooklyn</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml b/software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
index 0691c4e..fa9e82a 100644
--- a/software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
+++ b/software/messaging/src/main/resources/brooklyn/entity/messaging/activemq/activemq.xml
@@ -1,23 +1,5 @@
[#ftl]
<?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.
--->
<!-- Based on standard file from ActiveMQ Version 5.7.0 -->
<!-- START SNIPPET: example -->
<beans
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties b/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
index dbf5edb..7acffd4 100644
--- a/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
+++ b/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/server.properties
@@ -1,22 +1,5 @@
[#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.
-#
##
# KafkaBroker configuration template for Brooklyn
#
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties b/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties
index 6e39224..646d2f1 100644
--- a/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties
+++ b/software/messaging/src/main/resources/brooklyn/entity/messaging/kafka/zookeeper.properties
@@ -1,22 +1,5 @@
[#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.
-#
##
# KafkaZookeeper configuration template for Brooklyn
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml b/software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
index 0921c79..99f0c71 100644
--- a/software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
+++ b/software/messaging/src/main/resources/brooklyn/entity/messaging/storm/storm.yaml
@@ -1,22 +1,5 @@
[#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.
-#
# Storm Configuration
[#if driver.zookeeperServers?has_content]
storm.zookeeper.servers:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 4ea1ba6..a372530 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -213,9 +213,28 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes combine.children="append">
- <exclude>**/couchdb/couch.uri</exclude>
- <exclude>**/riak/vm.args</exclude>
+ <!--
+ 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.
+ -->
+ <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>
+ <exclude>src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-rackdc.properties</exclude>
+ <exclude>src/main/resources/brooklyn/entity/nosql/couchdb/couch.ini</exclude>
+ <exclude>src/main/resources/brooklyn/entity/nosql/couchdb/couch.uri</exclude>
+ <exclude>src/main/resources/brooklyn/entity/nosql/mongodb/default-mongodb.conf</exclude>
+ <exclude>src/main/resources/brooklyn/entity/nosql/redis/redis.conf</exclude>
+ <exclude>src/main/resources/brooklyn/entity/nosql/redis/slave.conf</exclude>
+ <exclude>src/main/resources/brooklyn/entity/nosql/riak/app.config</exclude>
+ <exclude>src/main/resources/brooklyn/entity/nosql/riak/vm.args</exclude>
+ <exclude>src/main/resources/brooklyn/entity/nosql/solr/solr.xml</exclude>
+
+ <!-- TODO explain! -->
<exclude>**/*.txt</exclude>
+
+ <!-- TODO explain why exclude src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar -->
+
<!-- In theory, binary files should be excluded, but for reasons unknown the example.tgz was being picked up as non-binary -->
<exclude>**/*.tgz</exclude>
</excludes>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-1.2.yaml
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-1.2.yaml b/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-1.2.yaml
index 09b3f70..045bb45 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-1.2.yaml
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-1.2.yaml
@@ -1,22 +1,5 @@
[#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.
-#
# Cassandra storage config YAML
# NOTE:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-2.0.yaml
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-2.0.yaml b/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-2.0.yaml
index 70968c7..518379c 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-2.0.yaml
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-2.0.yaml
@@ -1,22 +1,5 @@
[#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.
-#
# Cassandra storage config YAML
# NOTE:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-rackdc.properties
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-rackdc.properties b/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-rackdc.properties
index dec842d..8fc323a 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-rackdc.properties
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra-rackdc.properties
@@ -1,21 +1,3 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
# See http://www.datastax.com/docs/1.1/cluster_architecture/replication
# Note publicip/privateip added for use by custom MultiCloudSnitch
dc=${entity.datacenterName}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/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 b0344b6..fe58a0c 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,22 +1,5 @@
[#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/14b6a0d4/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 5394a19..6335f0d 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,23 +1,5 @@
[#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/14b6a0d4/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 a81899c..0554eb2 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,22 +1,3 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
# Redis configuration file
# Start as daemon
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/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 5ab85ac..3a9e64a 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,22 +1,3 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
# Redis configuration file
# Start as daemon
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/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 56b354d..f1100fa 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,22 +1,3 @@
-%%
-%% Licensed to the Apache Software Foundation (ASF) under one
-%% or more contributor license agreements. See the NOTICE file
-%% distributed with this work for additional information
-%% regarding copyright ownership. The ASF licenses this file
-%% to you under the Apache License, Version 2.0 (the
-%% "License"); you may not use this file except in compliance
-%% with the License. You may obtain a copy of the License at
-%%
-%% http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing,
-%% software distributed under the License is distributed on an
-%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-%% KIND, either express or implied. See the License for the
-%% specific language governing permissions and limitations
-%% under the License.
-%%
-
%% Brooklyn 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/14b6a0d4/software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml b/software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
index d361e56..6e12b5c 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/solr/solr.xml
@@ -1,23 +1,5 @@
[#ftl]
<?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.
--->
<solr>
<int name="coreLoadThreads">4</int>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index 5a44cc2..22d8061 100644
--- a/software/webapp/pom.xml
+++ b/software/webapp/pom.xml
@@ -34,6 +34,28 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <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.
+ -->
+ <exclude>src/main/resources/brooklyn/entity/webapp/jboss/jboss7-standalone.xml</exclude>
+ <exclude>src/main/resources/brooklyn/entity/webapp/jetty/jetty-brooklyn.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<dependencies>
<!-- required for GeoScaling DNS (entity accesses management service via HTTP) -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/jboss7-standalone.xml
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/jboss7-standalone.xml b/software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/jboss7-standalone.xml
index 8465acb..c82633e 100644
--- a/software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/jboss7-standalone.xml
+++ b/software/webapp/src/main/resources/brooklyn/entity/webapp/jboss/jboss7-standalone.xml
@@ -1,23 +1,5 @@
[#ftl]
<?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.
--->
<server xmlns="urn:jboss:domain:1.2">
<extensions>
<extension module="org.jboss.as.clustering.infinispan"/>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14b6a0d4/software/webapp/src/main/resources/brooklyn/entity/webapp/jetty/jetty-brooklyn.xml
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/resources/brooklyn/entity/webapp/jetty/jetty-brooklyn.xml b/software/webapp/src/main/resources/brooklyn/entity/webapp/jetty/jetty-brooklyn.xml
index ea6a3bb..746395f 100644
--- a/software/webapp/src/main/resources/brooklyn/entity/webapp/jetty/jetty-brooklyn.xml
+++ b/software/webapp/src/main/resources/brooklyn/entity/webapp/jetty/jetty-brooklyn.xml
@@ -1,23 +1,5 @@
[#ftl]
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-<!--
- 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.
--->
<!-- Configure the Jetty JMX Server -->
<Configure id="Server" class="org.mortbay.jetty.Server">
[#if entity.jmxPort > 0]