Author: dashorst
Date: Sun Jun 10 12:43:36 2007
New Revision: 545924
URL: http://svn.apache.org/viewvc?view=rev&rev=545924
Log:
Fixed notices to include dependencies on other projects, removed delivering
runtime dependencies in lib/ in the distribution, added licenses for asm, yahoo
and slf4j
Added:
incubator/wicket/trunk/licenses/asm-license.txt (with props)
incubator/wicket/trunk/licenses/slf4j-license.txt (with props)
incubator/wicket/trunk/licenses/yahoo-license.txt (with props)
Removed:
incubator/wicket/trunk/licenses/log4j-license.txt
incubator/wicket/trunk/licenses/servletapi-license.txt
Modified:
incubator/wicket/trunk/NOTICE
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/resources/META-INF/NOTICE
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/resources/META-INF/NOTICE
incubator/wicket/trunk/jdk-1.4/wicket/src/main/resources/META-INF/NOTICE
incubator/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/resources/META-INF/NOTICE
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/resources/META-INF/NOTICE
incubator/wicket/trunk/wicket-assembly-all.xml
Modified: incubator/wicket/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/NOTICE?view=diff&rev=545924&r1=545923&r2=545924
==============================================================================
--- incubator/wicket/trunk/NOTICE (original)
+++ incubator/wicket/trunk/NOTICE Sun Jun 10 12:43:36 2007
@@ -19,35 +19,31 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
- The library for dragging the AJAX debug dialog has the
- following notice:
- "distributed under commons creative license 2.0"
-
+
Contains Diff library from Mavens JRCS, released under
The Apache Software License, Version 1.1.
(c) 1999-2003
-
- wicket.util.upload contains parts of Apache Jakarta Commons FileUpload,
+
+ org.apache.wicket.util.upload contains parts of Apache Jakarta Commons
FileUpload,
released under the Apache Software License, Version 2.0.
(c) 2001-2004
-
- wicket.util.io.IOUtils is taken from Apache Avalon, released
+
+ org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
under the Apache Software License, Version 2.0.
(c) 2001-2004
-
- wicket.util.io.ThresholdingOutputStream is taken from
+
+ 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
-
- wicket.util.crypt contains Base64 which is taken from
+
+ 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
-
- wicket.util.concurrent is taken from [1], which states the following:
+
+ 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
@@ -56,8 +52,8 @@
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
-
- wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1]
+
+ 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
@@ -79,7 +75,7 @@
---------------------------------------------------------------------------
src/jdk-1.4/wicket-datetime
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Date Time
Copyright 2007 The Apache Software Foundation
This product includes software developed at
@@ -90,10 +86,13 @@
http://developer.yahoo.net/yui/license.txt
Copyright (c) 2006, Yahoo!
+ This product includes software developed by
+ Joda.org (http://www.joda.org/).
+
---------------------------------------------------------------------------
src/jdk-1.4/wicket-extensions
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Extensions
Copyright 2007 The Apache Software Foundation
This product includes software developed at
@@ -124,7 +123,7 @@
---------------------------------------------------------------------------
src/jdk-1.5/wicket-auth-roles
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Auth Roles
Copyright 2007 The Apache Software Foundation
This product includes software developed at
@@ -158,6 +157,19 @@
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/).
+
+
---------------------------------------------------------------------------
src/jdk-1.5/wicket-jmx
---------------------------------------------------------------------------
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/resources/META-INF/NOTICE?view=diff&rev=545924&r1=545923&r2=545924
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/resources/META-INF/NOTICE
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/resources/META-INF/NOTICE
Sun Jun 10 12:43:36 2007
@@ -1,4 +1,4 @@
- Apache Wicket
+ Apache Wicket Date Time
Copyright 2007 The Apache Software Foundation
This product includes software developed at
@@ -8,3 +8,7 @@
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/).
+
\ No newline at end of file
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/resources/META-INF/NOTICE?view=diff&rev=545924&r1=545923&r2=545924
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/resources/META-INF/NOTICE
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/resources/META-INF/NOTICE
Sun Jun 10 12:43:36 2007
@@ -1,4 +1,4 @@
- Apache Wicket
+ Apache Wicket Extensions
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/resources/META-INF/NOTICE?view=diff&rev=545924&r1=545923&r2=545924
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/resources/META-INF/NOTICE
(original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/resources/META-INF/NOTICE
Sun Jun 10 12:43:36 2007
@@ -3,35 +3,34 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
- The library for dragging the AJAX debug dialog has the
- following notice:
- "distributed under commons creative license 2.0"
+
+ 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
-
- wicket.util.upload contains parts of Apache Jakarta Commons FileUpload,
+
+ org.apache.wicket.util.upload contains parts of Apache Jakarta Commons
FileUpload,
released under the Apache Software License, Version 2.0.
(c) 2001-2004
-
- wicket.util.io.IOUtils is taken from Apache Avalon, released
+
+ org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
under the Apache Software License, Version 2.0.
(c) 2001-2004
-
- wicket.util.io.ThresholdingOutputStream is taken from
+
+ 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
-
- wicket.util.crypt contains Base64 which is taken from
+
+ 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
-
- wicket.util.concurrent is taken from [1], which states the following:
+
+ 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
@@ -40,8 +39,8 @@
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
-
- wicket.markup.html.form.upload.MultiFileUploadField.js is taken from [1]
+
+ 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
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/resources/META-INF/NOTICE?view=diff&rev=545924&r1=545923&r2=545924
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/resources/META-INF/NOTICE
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-auth-roles/src/main/resources/META-INF/NOTICE
Sun Jun 10 12:43:36 2007
@@ -1,4 +1,4 @@
- Apache Wicket
+ Apache Wicket Auth Roles
Copyright 2007 The Apache Software Foundation
This product includes software developed at
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/resources/META-INF/NOTICE?view=diff&rev=545924&r1=545923&r2=545924
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/resources/META-INF/NOTICE
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/resources/META-INF/NOTICE
Sun Jun 10 12:43:36 2007
@@ -22,3 +22,17 @@
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/).
+
+
\ No newline at end of file
Added: incubator/wicket/trunk/licenses/asm-license.txt
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/licenses/asm-license.txt?view=auto&rev=545924
==============================================================================
--- incubator/wicket/trunk/licenses/asm-license.txt (added)
+++ incubator/wicket/trunk/licenses/asm-license.txt Sun Jun 10 12:43:36 2007
@@ -0,0 +1,29 @@
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
Propchange: incubator/wicket/trunk/licenses/asm-license.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wicket/trunk/licenses/slf4j-license.txt
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/licenses/slf4j-license.txt?view=auto&rev=545924
==============================================================================
--- incubator/wicket/trunk/licenses/slf4j-license.txt (added)
+++ incubator/wicket/trunk/licenses/slf4j-license.txt Sun Jun 10 12:43:36 2007
@@ -0,0 +1,21 @@
+Copyright (c) 2004-2007 QOS.ch
+All rights reserved.
+
+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.
Propchange: incubator/wicket/trunk/licenses/slf4j-license.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wicket/trunk/licenses/yahoo-license.txt
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/licenses/yahoo-license.txt?view=auto&rev=545924
==============================================================================
--- incubator/wicket/trunk/licenses/yahoo-license.txt (added)
+++ incubator/wicket/trunk/licenses/yahoo-license.txt Sun Jun 10 12:43:36 2007
@@ -0,0 +1,30 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2006, Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or
without modification, are
+permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+* Neither the name of Yahoo! Inc. nor the names of its
+ contributors may be used to endorse or promote products
+ derived from this software without specific prior
+ written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Propchange: incubator/wicket/trunk/licenses/yahoo-license.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/wicket/trunk/wicket-assembly-all.xml
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-assembly-all.xml?view=diff&rev=545924&r1=545923&r2=545924
==============================================================================
--- incubator/wicket/trunk/wicket-assembly-all.xml (original)
+++ incubator/wicket/trunk/wicket-assembly-all.xml Sun Jun 10 12:43:36 2007
@@ -106,10 +106,12 @@
<include>org.apache.wicket:wicket-objectsizeof-agent</include>
<include>org.apache.wicket:wicket-spring</include>
<include>org.apache.wicket:wicket-spring-annot</include>
+
<include>org.apache.wicket:wicket-velocity</include>
</includes>
<binaries>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
+ <includeDependencies>false</includeDependencies>
</binaries>
</moduleSet>
</moduleSets>
