Repository: incubator-senssoft-distill Updated Branches: refs/heads/master b118b21c6 -> 0fcd2127a
SENSSOFT-62 Add ALv2.0 License Headers to DISTILL Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/commit/0fcd2127 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/tree/0fcd2127 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/diff/0fcd2127 Branch: refs/heads/master Commit: 0fcd2127a6b108851f6e48244da5295faccc914a Parents: b118b21 Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Authored: Wed Sep 21 11:59:07 2016 -0700 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Wed Sep 21 11:59:07 2016 -0700 ---------------------------------------------------------------------- DISCLAIMER.txt | 7 +++++++ LICENSE | 5 +++-- NOTICE | 10 ++++++++-- README.rst | 8 +++++--- distill/algorithms/graphs/tests/__init__.py | 3 --- distill/algorithms/stats/tests/__init__.py | 3 --- distill/models/tests/__init__.py | 3 --- distill/tests/__init__.py | 17 ++++++++++++++--- distill/tests/basic_test.py | 17 ++++++++++++++--- distill/tests/distill_test.py | 14 ++++++++++++++ distill/utils/exceptions.py | 16 +++++++--------- distill/utils/query_builder.py | 16 +++++++--------- distill/utils/tests/__init__.py | 17 ++++++++++++++--- distill/utils/validation.py | 16 +++++++--------- docker/webserver/supervisord.conf | 15 +++++++++++++++ 15 files changed, 115 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/DISCLAIMER.txt ---------------------------------------------------------------------- diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt new file mode 100644 index 0000000..22afb45 --- /dev/null +++ b/DISCLAIMER.txt @@ -0,0 +1,7 @@ +Apache SensSoft Distill is an effort undergoing incubation at The Apache Software Foundation (ASF), +sponsored by the Apache Incubator project. Incubation is required of all newly accepted +projects until a further review indicates that the infrastructure, communications, and +decision making process have stabilized in a manner consistent with other successful +ASF projects. While incubation status is not necessarily a reflection of the +completeness or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 8b33aad..d645695 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -178,7 +179,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2016 The Charles Stark Draper Laboratory, Inc. + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 2f37c2f..1aa9a80 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,11 @@ -Apache Distill +Apache SensSoft Distill Copyright 2016 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file +The Apache Software Foundation (http://www.apache.org/). + +In addition, this product includes software dependencies. See +the accompanying LICENSE.txt for a listing of dependencies +that are NOT Apache licensed (with pointers to their licensing) + +Apache SensSoft Distill includes ... \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/README.rst ---------------------------------------------------------------------- diff --git a/README.rst b/README.rst index 3ae4343..574f1cd 100644 --- a/README.rst +++ b/README.rst @@ -16,7 +16,9 @@ limitations under the License. ---> -Apache Distill - Under Development +# Apache SensSoft Distill -~ What is Apache Distill - An analytical engine for Apache UserALE to interact with user activity logs and apply basic analtical operations to the data. +## What is Apache SensSoft Distill? +Distill is part of the [SensSoft](http://sensssoft.incubator.apache.org) software stack. +It comprises an analytical engine for [SensSoft UserALE](https://github.com/apache/incubator-senssoft-user-ale) +to interact with user activity logs and apply basic analtical operations to the data. http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/algorithms/graphs/tests/__init__.py ---------------------------------------------------------------------- diff --git a/distill/algorithms/graphs/tests/__init__.py b/distill/algorithms/graphs/tests/__init__.py index bb2f853..f6f6899 100644 --- a/distill/algorithms/graphs/tests/__init__.py +++ b/distill/algorithms/graphs/tests/__init__.py @@ -19,7 +19,4 @@ distill: tests module. Meant for use with py.test. Organize tests into files, each named xxx_test.py Read more here: http://pytest.org/ - -Copyright 2016, The Charles Stark Draper Laboratory, Inc. -Licensed under Apache Software License ''' \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/algorithms/stats/tests/__init__.py ---------------------------------------------------------------------- diff --git a/distill/algorithms/stats/tests/__init__.py b/distill/algorithms/stats/tests/__init__.py index bb2f853..f6f6899 100644 --- a/distill/algorithms/stats/tests/__init__.py +++ b/distill/algorithms/stats/tests/__init__.py @@ -19,7 +19,4 @@ distill: tests module. Meant for use with py.test. Organize tests into files, each named xxx_test.py Read more here: http://pytest.org/ - -Copyright 2016, The Charles Stark Draper Laboratory, Inc. -Licensed under Apache Software License ''' \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/models/tests/__init__.py ---------------------------------------------------------------------- diff --git a/distill/models/tests/__init__.py b/distill/models/tests/__init__.py index bb2f853..f6f6899 100644 --- a/distill/models/tests/__init__.py +++ b/distill/models/tests/__init__.py @@ -19,7 +19,4 @@ distill: tests module. Meant for use with py.test. Organize tests into files, each named xxx_test.py Read more here: http://pytest.org/ - -Copyright 2016, The Charles Stark Draper Laboratory, Inc. -Licensed under Apache Software License ''' \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/tests/__init__.py ---------------------------------------------------------------------- diff --git a/distill/tests/__init__.py b/distill/tests/__init__.py index c278e5a..09c5e2f 100644 --- a/distill/tests/__init__.py +++ b/distill/tests/__init__.py @@ -1,10 +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. ''' distill: tests module. Meant for use with py.test. Organize tests into files, each named xxx_test.py Read more here: http://pytest.org/ - -Copyright 2016, The Charles Stark Draper Laboratory, Inc. -Licensed under Apache Software License ''' \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/tests/basic_test.py ---------------------------------------------------------------------- diff --git a/distill/tests/basic_test.py b/distill/tests/basic_test.py index 8836099..712d1fe 100644 --- a/distill/tests/basic_test.py +++ b/distill/tests/basic_test.py @@ -1,12 +1,23 @@ +# 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. ''' distill: Test module. Meant for use with py.test. Write each test as a function named test_<something>. Read more here: http://pytest.org/ - -Copyright 2016, The Charles Stark Draper Laboratory, Inc. -Licensed under Apache Software License ''' def test_example(): http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/tests/distill_test.py ---------------------------------------------------------------------- diff --git a/distill/tests/distill_test.py b/distill/tests/distill_test.py index 4340bfd..c8f97de 100644 --- a/distill/tests/distill_test.py +++ b/distill/tests/distill_test.py @@ -1,3 +1,17 @@ +# 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. from flask import Flask, request from distill import app as test_app http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/utils/exceptions.py ---------------------------------------------------------------------- diff --git a/distill/utils/exceptions.py b/distill/utils/exceptions.py index a74a969..a391241 100644 --- a/distill/utils/exceptions.py +++ b/distill/utils/exceptions.py @@ -1,13 +1,11 @@ -# -*- coding: 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 # -# This file is part of Distill. -# Copyright 2016 The Charles Stark Draper Laboratory, Inc. -# -# Licensed 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 +# 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, http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/utils/query_builder.py ---------------------------------------------------------------------- diff --git a/distill/utils/query_builder.py b/distill/utils/query_builder.py index ca72b61..017a08b 100644 --- a/distill/utils/query_builder.py +++ b/distill/utils/query_builder.py @@ -1,13 +1,11 @@ -# -*- coding: 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 # -# This file is part of Distill. -# Copyright 2016 The Charles Stark Draper Laboratory, Inc. -# -# Licensed 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 +# 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, http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/utils/tests/__init__.py ---------------------------------------------------------------------- diff --git a/distill/utils/tests/__init__.py b/distill/utils/tests/__init__.py index c278e5a..09c5e2f 100644 --- a/distill/utils/tests/__init__.py +++ b/distill/utils/tests/__init__.py @@ -1,10 +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. ''' distill: tests module. Meant for use with py.test. Organize tests into files, each named xxx_test.py Read more here: http://pytest.org/ - -Copyright 2016, The Charles Stark Draper Laboratory, Inc. -Licensed under Apache Software License ''' \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/distill/utils/validation.py ---------------------------------------------------------------------- diff --git a/distill/utils/validation.py b/distill/utils/validation.py index c3baddc..7cd3362 100644 --- a/distill/utils/validation.py +++ b/distill/utils/validation.py @@ -1,13 +1,11 @@ -# -*- coding: 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 # -# This file is part of Distill. -# Copyright 2016 The Charles Stark Draper Laboratory, Inc. -# -# Licensed 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 +# 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, http://git-wip-us.apache.org/repos/asf/incubator-senssoft-distill/blob/0fcd2127/docker/webserver/supervisord.conf ---------------------------------------------------------------------- diff --git a/docker/webserver/supervisord.conf b/docker/webserver/supervisord.conf index bb15542..4d29abd 100644 --- a/docker/webserver/supervisord.conf +++ b/docker/webserver/supervisord.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. + [supervisord] nodaemon = true