eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject [1/2] incubator-eagle git commit: Remove kafka-python from top level license as it's under Apache License
Date Thu, 17 Mar 2016 02:59:41 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/master 8ce8d384c -> 45f7c7067


Remove kafka-python from top level license as it's under Apache License

Copy external license content for six,Google Fonts,AdminLTE

Add missed license header

Remove AdminLTE and Google fonts from top level LICENSE

Add AL for eagle-core/eagle-data-process/eagle-stream-pipeline/README.md


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/34aec7e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/34aec7e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/34aec7e9

Branch: refs/heads/master
Commit: 34aec7e9a99e231be74193f4446943ca49488f0f
Parents: ffd84fa
Author: Hao Chen <hao@apache.org>
Authored: Wed Mar 16 16:52:21 2016 +0800
Committer: Hao Chen <hao@apache.org>
Committed: Thu Mar 17 10:58:17 2016 +0800

----------------------------------------------------------------------
 LICENSE                                         | 56 +++++++-------------
 .../main/conf/sandbox-userprofile-topology.conf | 15 ++++++
 .../eagle-stream-pipeline/README.md             | 19 +++++++
 .../webapp/app/partials/config/application.html | 18 +++++++
 .../webapp/app/partials/config/feature.html     | 18 +++++++
 .../main/webapp/app/partials/config/site.html   | 18 +++++++
 .../src/main/webapp/app/partials/landing.html   | 18 +++++++
 7 files changed, 126 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/34aec7e9/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index a40f8bd..a32cd9a 100755
--- a/LICENSE
+++ b/LICENSE
@@ -209,45 +209,29 @@ subcomponents is subject to the terms and conditions of the following
 licenses.
 
 ==============================================================================
-For AdminLTE:
+For "six": eagle-external/hadoop_jmx_collector/lib/six/
 ==============================================================================
-This product bundles AdminLTE, which is available under a
-"MIT" license. 
+This product bundles "six: a Python 2 and 3 compatibility library", which is available under
 
-For details, see https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE.
+"
+Copyright (c) 2010-2016 Benjamin Peterson
 
-==============================================================================
-For Google Fonts: Source Sans Pro
-==============================================================================
-This product bundles "Google Fonts: Source Sans Pro", which is available under a "SIL Open
Font License, 1.1" license. 
-
-For details, see https://www.google.com/fonts/attribution and http://scripts.sil.org/OFL.
-
-==============================================================================
-For kafka-python: Kafka Python client
-==============================================================================
-This product bundles "kafka-python: Kafka Python client", which is available under a " Apache
License Version 2.0" license. 
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-For details, see https://github.com/dpkp/kafka-python and https://pypi.python.org/pypi/kafka-python.
-
-==============================================================================
-For six: Python 2 and 3 compatibility library
-==============================================================================
-This product bundles "six: a Python 2 and 3 compatibility library", which is avaiblable under
Copyright (c) 2010-2014 Benjamin Peterson. 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal in the Software
without restriction, including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For details, see https://pypi.python.org/pypi/six
-
-
-
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"
+
+For details, see https://bitbucket.org/gutworth/six/raw/a9b120c9c49734c1bd7a95e7f371fd3bf308f107/LICENSE.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/34aec7e9/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf b/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf
index abe8cb8..0998220 100644
--- a/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf
+++ b/eagle-assembly/src/main/conf/sandbox-userprofile-topology.conf
@@ -1,3 +1,18 @@
+# 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.
+
 {
 	"deployInstanceIdentifier" : {
 		"programId" : "mlProgramId"

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/34aec7e9/eagle-core/eagle-data-process/eagle-stream-pipeline/README.md
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/eagle-stream-pipeline/README.md b/eagle-core/eagle-data-process/eagle-stream-pipeline/README.md
index d44d156..b8a0bdc 100644
--- a/eagle-core/eagle-data-process/eagle-stream-pipeline/README.md
+++ b/eagle-core/eagle-data-process/eagle-stream-pipeline/README.md
@@ -1,3 +1,22 @@
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+
 Eagle Declarative Streaming DSL
 ===============================
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/34aec7e9/eagle-webservice/src/main/webapp/app/partials/config/application.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/partials/config/application.html b/eagle-webservice/src/main/webapp/app/partials/config/application.html
index 8f05703..eeb804e 100644
--- a/eagle-webservice/src/main/webapp/app/partials/config/application.html
+++ b/eagle-webservice/src/main/webapp/app/partials/config/application.html
@@ -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.
+  -->
+
 <div class="box box-info">
 	<div class="box-header with-border">
 		<h3 class="box-title">

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/34aec7e9/eagle-webservice/src/main/webapp/app/partials/config/feature.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/partials/config/feature.html b/eagle-webservice/src/main/webapp/app/partials/config/feature.html
index 6e13c0f..019286f 100644
--- a/eagle-webservice/src/main/webapp/app/partials/config/feature.html
+++ b/eagle-webservice/src/main/webapp/app/partials/config/feature.html
@@ -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.
+  -->
+
 <div class="box box-info">
 	<div class="box-header with-border">
 		<h3 class="box-title">

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/34aec7e9/eagle-webservice/src/main/webapp/app/partials/config/site.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/partials/config/site.html b/eagle-webservice/src/main/webapp/app/partials/config/site.html
index e9ed1bf..85a75a3 100644
--- a/eagle-webservice/src/main/webapp/app/partials/config/site.html
+++ b/eagle-webservice/src/main/webapp/app/partials/config/site.html
@@ -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.
+  -->
+
 <div class="box box-info">
 	<div class="box-header with-border">
 		<h3 class="box-title">

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/34aec7e9/eagle-webservice/src/main/webapp/app/partials/landing.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/partials/landing.html b/eagle-webservice/src/main/webapp/app/partials/landing.html
index c90d97c..a2e0f47 100644
--- a/eagle-webservice/src/main/webapp/app/partials/landing.html
+++ b/eagle-webservice/src/main/webapp/app/partials/landing.html
@@ -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.
+  -->
+
 <p class="lead">
 	<span ng-if="!Application.current()">Current site do not use any application.</span>
 	<span ng-if="Application.current()">Current application do not install any feature.</span>


Mime
View raw message