You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/07/09 16:06:54 UTC
[44/75] git commit: Fix various issues with license placement
Fix various issues with license placement
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/be4d44f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/be4d44f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/be4d44f4
Branch: refs/heads/master
Commit: be4d44f48279f48e3ceec0bfa8e1326d6837e305
Parents: cc89cd1
Author: Andrew Kennedy <gr...@apache.org>
Authored: Wed Jul 9 00:12:05 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Wed Jul 9 14:59:31 2014 +0100
----------------------------------------------------------------------
.../src/main/resources/cumulus.yaml | 4 ++--
.../entity/messaging/activemq/activemq.xml | 19 +------------------
.../brooklyn/entity/messaging/storm/storm.yaml | 2 +-
.../entity/nosql/cassandra/cassandra.yaml | 2 +-
.../brooklyn/entity/nosql/solr/solr.xml | 3 +--
.../resources/solr/example/conf/solrconfig.xml | 18 ------------------
.../entity/webapp/jboss/jboss7-standalone.xml | 4 +---
.../entity/webapp/jetty/jetty-brooklyn.xml | 19 ++-----------------
.../resources/test-entity-basic-template.yaml | 2 +-
usage/jsgui/src/main/webapp/WEB-INF/web.xml | 9 +++------
.../rest-server/src/main/webapp/WEB-INF/web.xml | 9 +++------
11 files changed, 16 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/examples/simple-nosql-cluster/src/main/resources/cumulus.yaml
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/src/main/resources/cumulus.yaml b/examples/simple-nosql-cluster/src/main/resources/cumulus.yaml
index a34c2b5..8772d37 100644
--- a/examples/simple-nosql-cluster/src/main/resources/cumulus.yaml
+++ b/examples/simple-nosql-cluster/src/main/resources/cumulus.yaml
@@ -1,3 +1,4 @@
+[#ftl]
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -16,11 +17,10 @@
# specific language governing permissions and limitations
# under the License.
#
-[#ftl]
storage-layout: "flat"
cassandra-hosts: "${cassandraHostname}:${cassandraThriftPort?c}"
cassandra-keyspace: "KeyspaceCumulus"
proxy-mode: "false"
triples-subject: -1
triples-object: 5000
-query-limit: 50000
\ No newline at end of file
+query-limit: 50000
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/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 964f0ae..0691c4e 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,3 +1,4 @@
+[#ftl]
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -17,25 +18,7 @@
specific language governing permissions and limitations
under the License.
-->
-
-[#ftl]
<!-- Based on standard file from ActiveMQ Version 5.7.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
-
- 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.
--->
<!-- START SNIPPET: example -->
<beans
xmlns="http://www.springframework.org/schema/beans"
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/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 70a92dd..0921c79 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,3 +1,4 @@
+[#ftl]
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
# specific language governing permissions and limitations
# under the License.
#
-[#ftl]
# Storm Configuration
[#if driver.zookeeperServers?has_content]
storm.zookeeper.servers:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra.yaml
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra.yaml b/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra.yaml
index 864d47a..6394172 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra.yaml
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/cassandra/cassandra.yaml
@@ -1,3 +1,4 @@
+[#ftl]
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
# specific language governing permissions and limitations
# under the License.
#
-[#ftl]
# Cassandra storage config YAML
# NOTE:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/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 e3ed2f9..d361e56 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,3 +1,4 @@
+[#ftl]
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -17,8 +18,6 @@
specific language governing permissions and limitations
under the License.
-->
-
-[#ftl]
<solr>
<int name="coreLoadThreads">4</int>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/software/nosql/src/test/resources/solr/example/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/resources/solr/example/conf/solrconfig.xml b/software/nosql/src/test/resources/solr/example/conf/solrconfig.xml
index 3b0df1e..1373790 100644
--- a/software/nosql/src/test/resources/solr/example/conf/solrconfig.xml
+++ b/software/nosql/src/test/resources/solr/example/conf/solrconfig.xml
@@ -17,24 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
<!--
For more details about configurations options that may appear in
this file, see http://wiki.apache.org/solr/SolrConfigXml.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/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 35fd00b..8465acb 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,3 +1,4 @@
+[#ftl]
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -17,9 +18,6 @@
specific language governing permissions and limitations
under the License.
-->
-
-[#ftl]
-
<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/be4d44f4/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 d6ca718..ea6a3bb 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,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+[#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
@@ -17,22 +18,6 @@
specific language governing permissions and limitations
under the License.
-->
-
-[#ftl]
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-<!--
- Copyright 2011-2014 by Cloudsoft Corporation Limited
- 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]
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/usage/camp/src/test/resources/test-entity-basic-template.yaml
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/resources/test-entity-basic-template.yaml b/usage/camp/src/test/resources/test-entity-basic-template.yaml
index 5b25c71..7e31473 100644
--- a/usage/camp/src/test/resources/test-entity-basic-template.yaml
+++ b/usage/camp/src/test/resources/test-entity-basic-template.yaml
@@ -1,3 +1,4 @@
+[#ftl]
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
# specific language governing permissions and limitations
# under the License.
#
-#ftl
name: test-entity-basic-template
description: TestEntity with templated brooklyn.config and additional config (such as services)
origin: http://brooklyn.io
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/usage/jsgui/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/WEB-INF/web.xml b/usage/jsgui/src/main/webapp/WEB-INF/web.xml
index 42c07c8..02e7fcc 100644
--- a/usage/jsgui/src/main/webapp/WEB-INF/web.xml
+++ b/usage/jsgui/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,11 +19,6 @@
specific language governing permissions and limitations
under the License.
-->
-
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
<web-app>
<display-name>Brooklyn</display-name>
</web-app>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be4d44f4/usage/rest-server/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/webapp/WEB-INF/web.xml b/usage/rest-server/src/main/webapp/WEB-INF/web.xml
index 4a3439e..61d4781 100644
--- a/usage/rest-server/src/main/webapp/WEB-INF/web.xml
+++ b/usage/rest-server/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,11 +19,6 @@
specific language governing permissions and limitations
under the License.
-->
-
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
<web-app>
<display-name>Brooklyn REST API v1</display-name>