Author: rjollos
Date: Tue Mar 12 18:56:39 2013
New Revision: 1455667
URL: http://svn.apache.org/r1455667
Log:
Updated NOTICE and LICENSE files with latest license text, and additions of
jQuery UI and jQuery Timepicker Addon.
Modified:
incubator/bloodhound/trunk/LICENSE
incubator/bloodhound/trunk/NOTICE
Modified: incubator/bloodhound/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/LICENSE?rev=1455667&r1=1455666&r2=1455667&view=diff
==============================================================================
--- incubator/bloodhound/trunk/LICENSE (original)
+++ incubator/bloodhound/trunk/LICENSE Tue Mar 12 18:56:39 2013
@@ -209,7 +209,7 @@ separate copyright notices and license t
for the these subcomponents is subject to the terms and conditions of the
following licenses.
-For Trac, found in the trac/ directory:
+For Trac, in the trac/ directory:
Copyright (C) 2003-2013 Edgewall Software
All rights reserved.
@@ -243,7 +243,7 @@ For Trac, found in the trac/ directory:
For Bootstrap, as provided by the files
bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap.css
bloodhound_dashboard/bhdashboard/htdocs/css/bootstrap-responsive.css
-and the bloodhound_dashboard/bhdashboard/htdocs/js/ directory:
+and bloodhound_dashboard/bhdashboard/htdocs/js/bootstrap.js:
Copyright 2012 Twitter, Inc.
@@ -262,9 +262,14 @@ and the bloodhound_dashboard/bhdashboard
For jQuery, in the file
trac/trac/htdocs/js/jquery.js
- Copyright 2011 jQuery Foundation and other contributors
- http://jquery.com/
-
+ Copyright 2013 jQuery Foundation and other contributors,
+ http://jqueryui.com/
+
+ This software consists of voluntary contributions made by many
+ individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+ contribution history, see the revision history and logs, available
+ at http://jquery-ui.googlecode.com/svn/
+
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
@@ -272,10 +277,40 @@ trac/trac/htdocs/js/jquery.js
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 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 jQuery UI, in the file
+trac/trac/htdocs/js/jquery-ui.js
+
+ Copyright 2013 jQuery Foundation and other contributors,
+ http://jqueryui.com/
+
+ This software consists of voluntary contributions made by many
+ individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+ contribution history, see the revision history and logs, available
+ at http://jquery-ui.googlecode.com/svn/
+
+ 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 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
@@ -284,3 +319,26 @@ trac/trac/htdocs/js/jquery.js
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 jQuery Timepicker Addon, in the file
+trac/trac/htdocs/js/jquery-ui-addons.js
+
+ Copyright (c) 2009 Trent Richardson, http://trentrichardson.com/Impromptu/
+
+ 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 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.
\ No newline at end of file
Modified: incubator/bloodhound/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/bloodhound/trunk/NOTICE?rev=1455667&r1=1455666&r2=1455667&view=diff
==============================================================================
--- incubator/bloodhound/trunk/NOTICE (original)
+++ incubator/bloodhound/trunk/NOTICE Tue Mar 12 18:56:39 2013
@@ -16,3 +16,11 @@ jQuery - licensed under the MIT License
This product includes software (jQuery) developed by
jQuery (http://jquery.org/)
+jQuery UI - licensed under MIT License
+This product includes software (jQuery UI) developed by
+jQuery UI (http://jqueryui.com/)
+
+jQuery Timepicker Addon - licensed under MIT License
+This product includes software (jQuery Timepicker Addon)
+developed by Trent Richardson
+(http://trentrichardson.com/examples/timepicker/)
