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/07/11 06:14:15 UTC
[08/10] git commit: Add Apache license header to new source files
Add Apache license header to new source 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/4b468c52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4b468c52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4b468c52
Branch: refs/heads/master
Commit: 4b468c5261688bb4db431902a0e94691154692f8
Parents: 1a8427d
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Jul 9 16:20:26 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Jul 9 16:20:26 2014 +0100
----------------------------------------------------------------------
.../assets/tpl/catalog/add-location-modal.html | 1 -
.../webapp/assets/tpl/catalog/details-entity.html | 2 --
.../assets/tpl/catalog/details-generic.html | 3 +--
.../assets/tpl/catalog/location-config.html | 3 +--
.../src/main/webapp/assets/tpl/catalog/page.html | 1 -
.../test/javascript/specs/brooklyn-utils-spec.js | 2 +-
.../src/main/java/brooklyn/rest/domain/HasId.java | 18 ++++++++++++++++++
.../main/java/brooklyn/rest/domain/HasName.java | 18 ++++++++++++++++++
.../brooklyn/rest/domain/SummaryComparators.java | 18 ++++++++++++++++++
9 files changed, 57 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/jsgui/src/main/webapp/assets/tpl/catalog/add-location-modal.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/catalog/add-location-modal.html b/usage/jsgui/src/main/webapp/assets/tpl/catalog/add-location-modal.html
index 528d23a..cadd6fc 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/catalog/add-location-modal.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/catalog/add-location-modal.html
@@ -1,4 +1,3 @@
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-entity.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-entity.html b/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-entity.html
index 8aeaf49..dac12f5 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-entity.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-entity.html
@@ -1,4 +1,3 @@
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +16,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<div class="catalog-details">
<h2><%= model.get("name") %></h2>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html b/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html
index e18de4a..4277ac6 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html
@@ -1,4 +1,3 @@
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -30,4 +29,4 @@ under the License.
<textarea readonly="readonly" rows="25" style="width:100%;"><%= json %></textarea>
<% } %>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/jsgui/src/main/webapp/assets/tpl/catalog/location-config.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/catalog/location-config.html b/usage/jsgui/src/main/webapp/assets/tpl/catalog/location-config.html
index d8dd7cc..91c980f 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/catalog/location-config.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/catalog/location-config.html
@@ -1,4 +1,3 @@
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -22,4 +21,4 @@ under the License.
<li>
<span class="key"><%= key %></span> : <span class="value"><%= value %></span>
<span class="icon-remove-sign remove" style="margin-left:10px;"></span>
-</li>
\ No newline at end of file
+</li>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/jsgui/src/main/webapp/assets/tpl/catalog/page.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/catalog/page.html b/usage/jsgui/src/main/webapp/assets/tpl/catalog/page.html
index c15802d..a945329 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/catalog/page.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/catalog/page.html
@@ -1,4 +1,3 @@
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/jsgui/src/test/javascript/specs/brooklyn-utils-spec.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/test/javascript/specs/brooklyn-utils-spec.js b/usage/jsgui/src/test/javascript/specs/brooklyn-utils-spec.js
index 055d51b..f7008eb 100644
--- a/usage/jsgui/src/test/javascript/specs/brooklyn-utils-spec.js
+++ b/usage/jsgui/src/test/javascript/specs/brooklyn-utils-spec.js
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
define([
'brooklyn-utils'
], function (Util) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/rest-api/src/main/java/brooklyn/rest/domain/HasId.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/HasId.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/HasId.java
index 640917a..7879c47 100644
--- a/usage/rest-api/src/main/java/brooklyn/rest/domain/HasId.java
+++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/HasId.java
@@ -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.
+ */
package brooklyn.rest.domain;
/** Marker interface for summary objects with an id field */
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/rest-api/src/main/java/brooklyn/rest/domain/HasName.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/HasName.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/HasName.java
index 94da59a..511c249 100644
--- a/usage/rest-api/src/main/java/brooklyn/rest/domain/HasName.java
+++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/HasName.java
@@ -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.
+ */
package brooklyn.rest.domain;
/** Marker interface for summary objects with a name field */
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4b468c52/usage/rest-api/src/main/java/brooklyn/rest/domain/SummaryComparators.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/brooklyn/rest/domain/SummaryComparators.java b/usage/rest-api/src/main/java/brooklyn/rest/domain/SummaryComparators.java
index 2ebadf3..3b467fe 100644
--- a/usage/rest-api/src/main/java/brooklyn/rest/domain/SummaryComparators.java
+++ b/usage/rest-api/src/main/java/brooklyn/rest/domain/SummaryComparators.java
@@ -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.
+ */
package brooklyn.rest.domain;
import java.util.Comparator;