changes to notice files
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2adf60ca Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2adf60ca Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2adf60ca Branch: refs/heads/build/wicket-1.4.21 Commit: 2adf60cabc9e8a478e4b0bc8820f2f745293866d Parents: 33befcc Author: Carl-Eric Menzel <[email protected]> Authored: Wed Aug 29 13:54:48 2012 +0200 Committer: Carl-Eric Menzel <[email protected]> Committed: Wed Aug 29 13:54:48 2012 +0200 ---------------------------------------------------------------------- NOTICE | 161 ++++++++++++++++++++++++++++------------------------------- 1 files changed, 76 insertions(+), 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2adf60ca/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index e20cd77..715eca0 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Wicket -Copyright 2008 The Apache Software Foundation +Copyright 2006-2012 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -12,7 +12,16 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE. --------------------------------------------------------------------------- -src/./wicket-jmx +src/./wicket-auth-roles +--------------------------------------------------------------------------- + Apache Wicket Auth Roles + Copyright 2007 The Apache Software Foundation + + This product includes software developed at + The Apache Software Foundation (http://www.apache.org/). + +--------------------------------------------------------------------------- +src/./wicket-spring --------------------------------------------------------------------------- Apache Wicket Copyright 2007 The Apache Software Foundation @@ -32,7 +41,7 @@ src/./wicket-guice This product includes Guice, developed at Google, and licensed under the Apache License 2.0. (http://code.google.com/p/google-guice/). --------------------------------------------------------------------------- -src/./wicket-spring +src/./wicket-ioc --------------------------------------------------------------------------- Apache Wicket Copyright 2007 The Apache Software Foundation @@ -41,23 +50,82 @@ src/./wicket-spring The Apache Software Foundation (http://www.apache.org/). --------------------------------------------------------------------------- -src/./wicket-quickstart/NOTICE +src/./wicket-extensions --------------------------------------------------------------------------- - Apache Wicket + Apache Wicket Extensions Copyright 2007 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). + Contains software developed in Apache Turbine, released + under the Apache Software License, Version 2.0. + (c) 2001-2005 + --------------------------------------------------------------------------- -src/./wicket-ioc +src/./wicket --------------------------------------------------------------------------- Apache Wicket - Copyright 2007 The Apache Software Foundation + Copyright 2006 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). + This product includes software from QOS.ch (http://slf4j.org) licensed under the X11 license + Copyright (c) 2004-2007 QOS.ch + + Contains Diff library from Mavens JRCS, released under + The Apache Software License, Version 1.1. + (c) 1999-2003 + + org.apache.wicket.util.upload contains parts of Apache Jakarta Commons FileUpload, + released under the Apache Software License, Version 2.0. + (c) 2001-2004 + + org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released + under the Apache Software License, Version 2.0. + (c) 2001-2004 + + org.apache.wicket.util.io.ThresholdingOutputStream is taken from + Apache Jakarta Commons IO, released under the + Apache Software License, Version 2.0. + (c) 2001-2004 + + org.apache.wicket.util.crypt contains Base64 which is taken from + Apache Jakarta Commons Codec, released under the + Apache Software License, Version 2.0. Base64UrlSafe + is derived from Base64. + (c) 2001-2005 + + org.apache.wicket.util.concurrent is taken from [1], which states the following: + "All classes are released to the public domain and may be used for + any purpose whatsoever without permission or acknowledgment. + Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap + classes are adapted from Sun JDK source code. These are copyright + of Sun Microsystems, Inc, and are used with their kind permission, + as described in this license[2]." + [1]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html + [2]: licenses/sun-u.c.license.pdf + + org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1] + and has the following notice: + "Licence: + Use this however/wherever you like, just don't blame me if it breaks + anything. + + Credit: + If you're nice, you'll leave this bit: + + Class by Stickman -- http://www.the-stickman.com + with thanks to: + [for Safari fixes] + Luis Torrefranca -- http://www.law.pitt.edu + and + Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com + [for duplicate name bug] + 'neal'" + [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/ + --------------------------------------------------------------------------- src/./wicket-datetime --------------------------------------------------------------------------- @@ -119,19 +187,6 @@ src/./wicket-examples which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php). --------------------------------------------------------------------------- -src/./wicket-extensions ---------------------------------------------------------------------------- - Apache Wicket Extensions - Copyright 2007 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - Contains software developed in Apache Turbine, released - under the Apache Software License, Version 2.0. - (c) 2001-2005 - ---------------------------------------------------------------------------- src/./wicket-objectssizeof-agent --------------------------------------------------------------------------- Apache Wicket @@ -142,73 +197,9 @@ src/./wicket-objectssizeof-agent --------------------------------------------------------------------------- -src/./wicket +src/./wicket-jmx --------------------------------------------------------------------------- Apache Wicket - Copyright 2006 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - This product includes software from QOS.ch (http://slf4j.org) licensed under the X11 license - Copyright (c) 2004-2007 QOS.ch - - Contains Diff library from Mavens JRCS, released under - The Apache Software License, Version 1.1. - (c) 1999-2003 - - org.apache.wicket.util.upload contains parts of Apache Jakarta Commons FileUpload, - released under the Apache Software License, Version 2.0. - (c) 2001-2004 - - org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released - under the Apache Software License, Version 2.0. - (c) 2001-2004 - - org.apache.wicket.util.io.ThresholdingOutputStream is taken from - Apache Jakarta Commons IO, released under the - Apache Software License, Version 2.0. - (c) 2001-2004 - - org.apache.wicket.util.crypt contains Base64 which is taken from - Apache Jakarta Commons Codec, released under the - Apache Software License, Version 2.0. Base64UrlSafe - is derived from Base64. - (c) 2001-2005 - - org.apache.wicket.util.concurrent is taken from [1], which states the following: - "All classes are released to the public domain and may be used for - any purpose whatsoever without permission or acknowledgment. - Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap - classes are adapted from Sun JDK source code. These are copyright - of Sun Microsystems, Inc, and are used with their kind permission, - as described in this license[2]." - [1]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html - [2]: licenses/sun-u.c.license.pdf - - org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1] - and has the following notice: - "Licence: - Use this however/wherever you like, just don't blame me if it breaks - anything. - - Credit: - If you're nice, you'll leave this bit: - - Class by Stickman -- http://www.the-stickman.com - with thanks to: - [for Safari fixes] - Luis Torrefranca -- http://www.law.pitt.edu - and - Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com - [for duplicate name bug] - 'neal'" - [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/ - ---------------------------------------------------------------------------- -src/./wicket-auth-roles ---------------------------------------------------------------------------- - Apache Wicket Auth Roles Copyright 2007 The Apache Software Foundation This product includes software developed at
