Author: jrthomerson
Date: Fri Aug 5 04:47:11 2011
New Revision: 1154094
URL: http://svn.apache.org/viewvc?rev=1154094&view=rev
Log:
update NOTICE in release branch
Modified:
wicket/branches/wicket-1.4.18/NOTICE
Modified: wicket/branches/wicket-1.4.18/NOTICE
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.18/NOTICE?rev=1154094&r1=1154093&r2=1154094&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.18/NOTICE (original)
+++ wicket/branches/wicket-1.4.18/NOTICE Fri Aug 5 04:47:11 2011
@@ -12,36 +12,71 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUT
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/./wicket-jmx
+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/).
----------------------------------------------------------------------------
-src/./wicket-guice
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ 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
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ org.apache.wicket.util.upload contains parts of Apache Jakarta Commons
FileUpload,
+ released under the Apache Software License, Version 2.0.
+ (c) 2001-2004
- 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
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2004
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ 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-quickstart/NOTICE
+src/./wicket-spring
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -50,14 +85,18 @@ src/./wicket-quickstart/NOTICE
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/./wicket-ioc
+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-datetime
---------------------------------------------------------------------------
@@ -76,6 +115,15 @@ src/./wicket-datetime
Joda.org (http://www.joda.org/).
---------------------------------------------------------------------------
+src/./wicket-jmx
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------------------------
src/./wicket-examples
---------------------------------------------------------------------------
Apache Wicket Examples
@@ -119,18 +167,14 @@ src/./wicket-examples
which is released under CDDL 1.0 license
(http://www.opensource.org/licenses/cddl1.php).
---------------------------------------------------------------------------
-src/./wicket-extensions
+src/./wicket-ioc
---------------------------------------------------------------------------
- Apache Wicket Extensions
+ Apache Wicket
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
---------------------------------------------------------------------------
@@ -142,75 +186,22 @@ src/./wicket-objectssizeof-agent
---------------------------------------------------------------------------
-src/./wicket
+src/./wicket-auth-roles
---------------------------------------------------------------------------
- Apache Wicket
- Copyright 2006 The Apache Software Foundation
+ Apache Wicket Auth Roles
+ Copyright 2007 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
+src/./wicket-guice
---------------------------------------------------------------------------
- Apache Wicket Auth Roles
+ Apache Wicket
Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+ This product includes Guice, developed at Google, and licensed
+ under the Apache License 2.0. (http://code.google.com/p/google-guice/).
