You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/09/18 21:30:58 UTC
[4/5] git commit: [#6422] Cleaned up LICENSE and NOTICE files and
fixed license issues
[#6422] Cleaned up LICENSE and NOTICE files and fixed license issues
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d8686362
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d8686362
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d8686362
Branch: refs/heads/cj/6422
Commit: d868636228eb70d53c7d0cc96b53ce900febba27
Parents: c763991
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Sep 18 19:14:49 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Sep 18 19:14:49 2013 +0000
----------------------------------------------------------------------
Allura/LICENSE | 47 ++++++++++++---------
Allura/NOTICE | 21 ++-------
Allura/allura/controllers/controller.template | 16 +++++++
Allura/allura/public/nf/images/beta_sf.psd | Bin 2027421 -> 0 bytes
AlluraTest/LICENSE | 26 +-----------
AlluraTest/jslint/LICENSE | 21 +++++++++
ForgeDiscussion/NOTICE | 8 ++--
ForgeGit/NOTICE | 8 ++--
ForgeLink/NOTICE | 8 ++--
ForgeSVN/NOTICE | 8 ++--
ForgeTracker/NOTICE | 8 ++--
ForgeWiki/NOTICE | 8 ++--
LICENSE | 28 ++++++++----
NoWarnings/NOTICE | 8 ++--
rat-excludes.txt | 21 ++++-----
15 files changed, 127 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index de4eeac..973fd44 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -208,27 +208,36 @@ separate copyright notices and license terms. Your use of the source code
for the these subcomponents is subject to the terms and conditions of the
following licenses.
+The file allura/etc/mime.types from the mime-support package,
+which is in the public domain. For details, see
+http://ftp-master.metadata.debian.org/changelogs//main/m/mime-support/mime-support_3.54_copyright
+
+ASCII, Dammit, which is in the public domain.
+For details, see allura/lib/AsciiDammit.py
+
+jQuery, jQueryUI, and various related plugins, which are available
+under the MIT license. For details, see the individual files:
+ allura/public/nf/js/jquery-base.js
+ allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
+ allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+ allura/public/nf/js/jquery.daterangepicker.js
+ allura/public/nf/css/forge/ui.daterangepicker.css
+ allura/lib/widgets/resources/css/autocomplete.css
+ allura/public/nf/css/forge/accordion.css
+ allura/lib/widgets/resources/js/jqfontselector.js
+ allura/lib/widgets/resources/js/jquery.autosize-min.js
+ allura/lib/widgets/resources/js/jquery.colorPicker.js
+ allura/lib/widgets/resources/js/jquery.tagsinput.js
+ allura/lib/widgets/resources/js/jquery.textarea.js
+ allura/lib/widgets/resources/js/jquery.tools.min.js
+ allura/public/nf/js/jquery.flot.js
+ allura/public/nf/js/jquery.maxlength.min.js
+
Blueprint, which is available under the MIT license.
-For details, see Allura/allura/public/nf/css/blueprint/
+For details, see allura/public/nf/css/blueprint/
Spin.js, which is available under the MIT license.
-For details, see Allura/allura/public/nf/js/spin.min.js
+For details, see allura/public/nf/js/spin.min.js
Sylvester, which is available under the MIT license.
-For details, see Allura/allura/public/nf/js/sylvester.js
-
-jQuery, jQueryUI, and various related plugins, which are available
-under the MIT license. For details, see the individual files:
- Allura/allura/public/nf/js/jquery-base.js
- Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
- Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
- Allura/allura/lib/widgets/resources/css/autocomplete.css
- Allura/allura/public/nf/css/forge/accordion.css
- Allura/allura/lib/widgets/resources/js/jqfontselector.js
- Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
- Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
- Allura/allura/lib/widgets/resources/js/jquery.textarea.js
- Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
- Allura/allura/public/nf/js/jquery.daterangepicker.js
- Allura/allura/public/nf/js/jquery.flot.js
- Allura/allura/public/nf/js/jquery.maxlength.min.js
+For details, see allura/public/nf/js/sylvester.js
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/Allura/NOTICE
----------------------------------------------------------------------
diff --git a/Allura/NOTICE b/Allura/NOTICE
index 8157ed8..40b6969 100644
--- a/Allura/NOTICE
+++ b/Allura/NOTICE
@@ -1,18 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- This software contains library for converting various
- characters to ASCII encoding, written by Leonard Richardson
- and placed into public domain.
-
- This software contains library for checking maximum length
- of text area's content, written by Keith Wood.
-
- This software contains lightbox plugin for jQuery, written by
- Buck Wilson.
-
- Canvas functionality in Internet Explorer(r) is provided
- by code developed at Google Inc.
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/Allura/allura/controllers/controller.template
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/controller.template b/Allura/allura/controllers/controller.template
index d7fd65b..f565369 100644
--- a/Allura/allura/controllers/controller.template
+++ b/Allura/allura/controllers/controller.template
@@ -1,4 +1,20 @@
# -*- 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
+#
+# 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.
"""Sample controller module"""
# turbogears imports
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/Allura/allura/public/nf/images/beta_sf.psd
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/images/beta_sf.psd b/Allura/allura/public/nf/images/beta_sf.psd
deleted file mode 100644
index 9e74297..0000000
Binary files a/Allura/allura/public/nf/images/beta_sf.psd and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/AlluraTest/LICENSE
----------------------------------------------------------------------
diff --git a/AlluraTest/LICENSE b/AlluraTest/LICENSE
index 15f71ee..8da34a3 100644
--- a/AlluraTest/LICENSE
+++ b/AlluraTest/LICENSE
@@ -208,27 +208,5 @@ separate copyright notices and license terms. Your use of the source code
for the these subcomponents is subject to the terms and conditions of the
following licenses.
-For jslint.js, in directory
-jslint/
-
- Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
-
- 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 Software shall be used for Good, not Evil.
-
- 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.
+JSLint, which is available under the MIT license.
+For details, see jslint/
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/AlluraTest/jslint/LICENSE
----------------------------------------------------------------------
diff --git a/AlluraTest/jslint/LICENSE b/AlluraTest/jslint/LICENSE
new file mode 100644
index 0000000..9532d4e
--- /dev/null
+++ b/AlluraTest/jslint/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
+
+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 Software shall be used for Good, not Evil.
+
+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.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/ForgeDiscussion/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/NOTICE b/ForgeDiscussion/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeDiscussion/NOTICE
+++ b/ForgeDiscussion/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/ForgeGit/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeGit/NOTICE b/ForgeGit/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeGit/NOTICE
+++ b/ForgeGit/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/ForgeLink/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeLink/NOTICE b/ForgeLink/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeLink/NOTICE
+++ b/ForgeLink/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/ForgeSVN/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeSVN/NOTICE b/ForgeSVN/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeSVN/NOTICE
+++ b/ForgeSVN/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/ForgeTracker/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeTracker/NOTICE b/ForgeTracker/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeTracker/NOTICE
+++ b/ForgeTracker/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/ForgeWiki/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeWiki/NOTICE b/ForgeWiki/NOTICE
index e8ad3bb..40b6969 100644
--- a/ForgeWiki/NOTICE
+++ b/ForgeWiki/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index b7967a4..8f47b97 100644
--- a/LICENSE
+++ b/LICENSE
@@ -209,27 +209,39 @@ notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.
-Blueprint, which is available under the MIT license.
-For details, see Allura/allura/public/nf/css/blueprint/
-
-Spin.js, which is available under the MIT license.
-For details, see Allura/allura/public/nf/js/spin.min.js
+The file Allura/allura/etc/mime.types from the mime-support package,
+which is in the public domain. For details, see
+http://ftp-master.metadata.debian.org/changelogs//main/m/mime-support/mime-support_3.54_copyright
-Sylvester, which is available under the MIT license.
-For details, see Allura/allura/public/nf/js/sylvester.js
+ASCII, Dammit, which is in the public domain.
+For details, see Allura/allura/lib/AsciiDammit.py
jQuery, jQueryUI, and various related plugins, which are available
under the MIT license. For details, see the individual files:
Allura/allura/public/nf/js/jquery-base.js
Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+ Allura/allura/public/nf/js/jquery.daterangepicker.js
+ Allura/allura/public/nf/css/forge/ui.daterangepicker.css
Allura/allura/lib/widgets/resources/css/autocomplete.css
Allura/allura/public/nf/css/forge/accordion.css
Allura/allura/lib/widgets/resources/js/jqfontselector.js
Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
+ Allura/allura/lib/widgets/resources/js/jquery.tagsinput.js
Allura/allura/lib/widgets/resources/js/jquery.textarea.js
Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
- Allura/allura/public/nf/js/jquery.daterangepicker.js
Allura/allura/public/nf/js/jquery.flot.js
Allura/allura/public/nf/js/jquery.maxlength.min.js
+
+Blueprint, which is available under the MIT license.
+For details, see Allura/allura/public/nf/css/blueprint/
+
+Spin.js, which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/spin.min.js
+
+Sylvester, which is available under the MIT license.
+For details, see Allura/allura/public/nf/js/sylvester.js
+
+JSLint, which is available under the MIT license.
+For details, see AlluraTest/jslint/
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/NoWarnings/NOTICE
----------------------------------------------------------------------
diff --git a/NoWarnings/NOTICE b/NoWarnings/NOTICE
index e8ad3bb..40b6969 100644
--- a/NoWarnings/NOTICE
+++ b/NoWarnings/NOTICE
@@ -1,5 +1,5 @@
- Apache Allura (incubating)
- Copyright 2012-2013 The Apache Software Foundation
+Apache Allura (incubating)
+Copyright 2012-2013 The Apache Software Foundation
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d8686362/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 30ded2a..968c66f 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -8,38 +8,33 @@ requirements*
**/*.log
**/.coverage
**/nosetests.xml
-Allura/allura/controllers/controller.template
Allura/docs/_build/
Allura/allura/etc/mime.types
Allura/allura/lib/AsciiDammit.py
-Allura/allura/lib/widgets/resources/css/autocomplete.css
+Allura/allura/public/nf/js/jquery-base.js
+Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
Allura/allura/lib/widgets/resources/css/jquery.ui.datepicker.css
+Allura/allura/public/nf/js/jquery.daterangepicker.js
+Allura/allura/public/nf/css/forge/ui.daterangepicker.css
+Allura/allura/lib/widgets/resources/css/autocomplete.css
+Allura/allura/public/nf/css/forge/accordion.css
Allura/allura/lib/widgets/resources/js/jqfontselector.js
Allura/allura/lib/widgets/resources/js/jquery.autosize-min.js
Allura/allura/lib/widgets/resources/js/jquery.colorPicker.js
Allura/allura/lib/widgets/resources/js/jquery.tagsinput.js
Allura/allura/lib/widgets/resources/js/jquery.textarea.js
Allura/allura/lib/widgets/resources/js/jquery.tools.min.js
-Allura/allura/public/nf/css/blueprint/
-Allura/allura/public/nf/css/forge/accordion.css
-Allura/allura/public/nf/css/forge/ui.daterangepicker.css
-Allura/allura/public/nf/css/smoothness/jquery-ui-1.8.4.custom.css
-Allura/allura/public/nf/images/beta_sf.psd
-Allura/allura/public/nf/js/jquery-base.js
-Allura/allura/public/nf/js/jquery.daterangepicker.js
Allura/allura/public/nf/js/jquery.flot.js
Allura/allura/public/nf/js/jquery.maxlength.min.js
+Allura/allura/public/nf/css/blueprint/
Allura/allura/public/nf/js/spin.min.js
Allura/allura/public/nf/js/sylvester.js
Allura/allura/tests/data/genshi_hello_tmpl
Allura/allura/tests/data/test_mime/text_file.txt
-Allura/run/dummy.txt
AlluraTest/jslint/
CHANGES
+Allura/run/dummy.txt
ForgeGit/forgegit/data/post-receive_tmpl
ForgeSVN/forgesvn/tests/data/
ForgeImporters/forgeimporters/tests/data/google/empty-issue.html
ForgeImporters/forgeimporters/tests/data/google/test-issue.html
-solr_config/core0/conf/spellings.txt
-solr_config/core1/conf/spellings.txt
-solr_config/solr.xml