You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/02/20 15:07:26 UTC

[1/3] git commit: changes to notice files

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/9d040673
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9d040673
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9d040673

Branch: refs/heads/build/wicket-1.4.22
Commit: 9d040673ab8096a198d5ab8a1b5424d1438a0108
Parents: c149d70
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Feb 20 15:46:31 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Feb 20 15:46:31 2013 +0200

----------------------------------------------------------------------
 NOTICE |  191 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 91 insertions(+), 100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/9d040673/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index e20cd77..36b1031 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Wicket
-Copyright 2008 The Apache Software Foundation
+Copyright 2006-2013 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -21,7 +21,7 @@ src/./wicket-jmx
    The Apache Software Foundation (http://www.apache.org/).
 
 ---------------------------------------------------------------------------
-src/./wicket-guice
+src/./wicket-ioc
 ---------------------------------------------------------------------------
    Apache Wicket
    Copyright 2007 The Apache Software Foundation
@@ -29,8 +29,6 @@ src/./wicket-guice
    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/).
 ---------------------------------------------------------------------------
 src/./wicket-spring
 ---------------------------------------------------------------------------
@@ -41,106 +39,14 @@ src/./wicket-spring
    The Apache Software Foundation (http://www.apache.org/).
 
 ---------------------------------------------------------------------------
-src/./wicket-quickstart/NOTICE
----------------------------------------------------------------------------
-   Apache Wicket
-   Copyright 2007 The Apache Software Foundation
-
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
-
----------------------------------------------------------------------------
-src/./wicket-ioc
----------------------------------------------------------------------------
-   Apache Wicket
-   Copyright 2007 The Apache Software Foundation
-
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
-
----------------------------------------------------------------------------
-src/./wicket-datetime
----------------------------------------------------------------------------
-   Apache Wicket Date Time
-   Copyright 2007 The Apache Software Foundation
-
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
-   
-   Contains code of the Yahoo User Interface library (version: 0.12.2),
-   released under the BSD License:
-   http://developer.yahoo.net/yui/license.txt
-   Copyright (c) 2006, Yahoo!
-
-   This product includes software developed by
-   Joda.org (http://www.joda.org/).
-   
----------------------------------------------------------------------------
-src/./wicket-examples
----------------------------------------------------------------------------
-   Apache Wicket Examples
-   Copyright 2007 The Apache Software Foundation
-
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
-   
-   Contains Script.aculo.us javascript library released under a MIT license.
-   Copyright (c) 2005 Thomas Fuchs
-   
-   Contains prototype.js javascript library released under a MIT style license.
-   (c) 2005 Sam Stephenson
-   
-   Contains behaviour.js javascript library released under BSD license.
-   Behaviour v1.1 by Ben Nolan, June 2005. Based largely on the work
-   of Simon Willison
-   
-   com.meterware.httpunit.ParsedHTML is taken from HttpUnit, released
-   under a MIT style license.
-   Copyright (c) 2000-2004, Russell Gold
-   
-   Contains software developed by the Dojo foundation.
-   The dojo javascript is dual licensed under the AFL and BSD license.
-   Included in this software under the BSD license.
-   Copyright (c) 2004-2005, The Dojo Foundation
-
-   This product includes software developed by the Spring Framework Project
-   (http://www.springframework.org).
-
-   This product includes software developed by the CGLib Project
-   (http://cglib.sourceforge.net).
-
-   This product includes ASM, released under a BSD style license (http://asm.objectweb.org).
-   Copyright (c) 2000-2005 INRIA, France Telecom
-
-   This product includes software developed by
-   Joda.org (http://www.joda.org/).
-
-   This product includes jhighlight (https://jhighlight.dev.java.net/)
-   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
+src/./wicket-auth-roles
 ---------------------------------------------------------------------------
-   Apache Wicket
+   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
 ---------------------------------------------------------------------------
@@ -206,11 +112,96 @@ src/./wicket
    [1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
 
 ---------------------------------------------------------------------------
-src/./wicket-auth-roles
+src/./wicket-extensions
 ---------------------------------------------------------------------------
-   Apache Wicket Auth Roles
+   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-guice
+---------------------------------------------------------------------------
+   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/).
+---------------------------------------------------------------------------
+src/./wicket-objectssizeof-agent
+---------------------------------------------------------------------------
+   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
+   Copyright 2007 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+   
+   Contains Script.aculo.us javascript library released under a MIT license.
+   Copyright (c) 2005 Thomas Fuchs
+   
+   Contains prototype.js javascript library released under a MIT style license.
+   (c) 2005 Sam Stephenson
+   
+   Contains behaviour.js javascript library released under BSD license.
+   Behaviour v1.1 by Ben Nolan, June 2005. Based largely on the work
+   of Simon Willison
+   
+   com.meterware.httpunit.ParsedHTML is taken from HttpUnit, released
+   under a MIT style license.
+   Copyright (c) 2000-2004, Russell Gold
+   
+   Contains software developed by the Dojo foundation.
+   The dojo javascript is dual licensed under the AFL and BSD license.
+   Included in this software under the BSD license.
+   Copyright (c) 2004-2005, The Dojo Foundation
+
+   This product includes software developed by the Spring Framework Project
+   (http://www.springframework.org).
+
+   This product includes software developed by the CGLib Project
+   (http://cglib.sourceforge.net).
+
+   This product includes ASM, released under a BSD style license (http://asm.objectweb.org).
+   Copyright (c) 2000-2005 INRIA, France Telecom
+
+   This product includes software developed by
+   Joda.org (http://www.joda.org/).
+
+   This product includes jhighlight (https://jhighlight.dev.java.net/)
+   which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
+
+---------------------------------------------------------------------------
+src/./wicket-datetime
+---------------------------------------------------------------------------
+   Apache Wicket Date Time
    Copyright 2007 The Apache Software Foundation
 
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).
+   
+   Contains code of the Yahoo User Interface library (version: 0.12.2),
+   released under the BSD License:
+   http://developer.yahoo.net/yui/license.txt
+   Copyright (c) 2006, Yahoo!
 
+   This product includes software developed by
+   Joda.org (http://www.joda.org/).
+