click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r727849 - in /incubator/click/trunk/click: LICENSE.txt NOTICE.txt README.txt framework/src/net/sf/click/util/ClickUtils.java
Date Thu, 18 Dec 2008 22:58:08 GMT
Author: sabob
Date: Thu Dec 18 14:58:07 2008
New Revision: 727849

URL: http://svn.apache.org/viewvc?rev=727849&view=rev
Log:
license updates

Modified:
    incubator/click/trunk/click/LICENSE.txt
    incubator/click/trunk/click/NOTICE.txt
    incubator/click/trunk/click/README.txt
    incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java

Modified: incubator/click/trunk/click/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/LICENSE.txt?rev=727849&r1=727848&r2=727849&view=diff
==============================================================================
--- incubator/click/trunk/click/LICENSE.txt (original)
+++ incubator/click/trunk/click/LICENSE.txt Thu Dec 18 14:58:07 2008
@@ -172,3 +172,234 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+======================================================================
+Check the accompanying NOTICE file for details on which
+third-party licenses apply to which components in Click.
+======================================================================
+
+OGNL LICENSE (BSD License)
+
+Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard
+All rights reserved.
+
+Redistribution and use 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 the Drew Davidson 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.
+
+======================================================================
+
+CONCURRENCY UTILITIES
+
+EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap.java 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]: http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf
+
+======================================================================
+
+COOKIE UTILS - Seraph project (BSD License)
+
+Copyright (c) 2007 - Atlassian Software Systems Pty Ltd
+
+All rights reserved.
+
+Redistribution and use 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 the Atlassian Software Systems 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
+
+======================================================================
+
+PROTOTYPE LICENSE (MIT License)
+
+Copyright (c) 2005-2008 Sam Stephenson
+
+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 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.
+
+======================================================================
+
+SCRIPTACULOUS LICENSE (MIT License)
+
+Copyright© 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+
+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.
+
+======================================================================
+
+COLOR PICKER LICENSE (MIT License)
+
+Copyright 2008 Sebo Zoltan <iamzoli@yahoo.com>
+
+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.
+
+======================================================================
+
+VIRTUAL KEYBOARD LICENSE (BSD License)
+
+Copyright (c) 2004-2007, GreyWyvern
+All rights reserved.
+
+Redistribution and use 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 GreyWyvern.com 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.
+
+======================================================================
+
+YUI LICENSE
+
+Software License Agreement (BSD License)
+Copyright (c) 2008, 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.
+
+======================================================================
+
+ATLASSIAN
+
+Distributed under the terms of the Apache Software License 2.0.
+
+======================================================================

Modified: incubator/click/trunk/click/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/NOTICE.txt?rev=727849&r1=727848&r2=727849&view=diff
==============================================================================
--- incubator/click/trunk/click/NOTICE.txt (original)
+++ incubator/click/trunk/click/NOTICE.txt Thu Dec 18 14:58:07 2008
@@ -11,8 +11,8 @@
 developed by Doug Lea 
 (http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html).
 
-This product includes software developed by Atlassian
-(http://www.atlassian.com/), released under the Apache Software License.
+This product includes software from the Seraph project developed by Atlassian
+(http://www.atlassian.com/).
 
 This product includes the Java API for Servlets,
 developed by Sun Microsystems Inc (http://www.sun.com). 
@@ -20,7 +20,7 @@
 Click runtime library.
 
 This product includes the prototype JavaScript library,
-developed by Sam Stephenson (http://prototype.conio.net).
+developed by Sam Stephenson (http://prototypejs.org/).
 
 This product includes the script.aculo.us JavaScript library,
 developed by Thomas Fuchs (http://script.aculo.us/).

Modified: incubator/click/trunk/click/README.txt
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/README.txt?rev=727849&r1=727848&r2=727849&view=diff
==============================================================================
--- incubator/click/trunk/click/README.txt (original)
+++ incubator/click/trunk/click/README.txt Thu Dec 18 14:58:07 2008
@@ -8,7 +8,7 @@
 
 Comprehensive HTML documentation is available online at:
 
-    http://click.sourceforge.net
+    http://incubator.apache.org/click
 
 This documentation is also available in the directory:
 
@@ -20,7 +20,9 @@
 
    dist/click-nodeps-xx.jar - Click runtime JAR with no dependencies
 
-   dist/click-extras-xx.jar - Click Extras JAR	
+   dist/click-extras-xx.jar - Click Extras JAR
+
+   dist/click-mock-xx.jar   - Click Mock Utilities JAR
 
 Example pre-built web appliation include:
 

Modified: incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java?rev=727849&r1=727848&r2=727849&view=diff
==============================================================================
--- incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java (original)
+++ incubator/click/trunk/click/framework/src/net/sf/click/util/ClickUtils.java Thu Dec 18
14:58:07 2008
@@ -636,7 +636,7 @@
      * Invalidate the specified cookie and delete it from the response object.
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @param request the servlet request
      * @param response the servlet response
@@ -665,7 +665,7 @@
      * {@link #invalidateCookie(HttpServletRequest, HttpServletResponse, String, String)}
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @see #invalidateCookie(HttpServletRequest, HttpServletResponse, String, String)
      *
@@ -802,7 +802,7 @@
      * Returns the specified Cookie object, or null if the cookie does not exist.
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @param request the servlet request
      * @param name the name of the cookie
@@ -835,7 +835,7 @@
      * The cookie secure flag is set if the request is secure.
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @param request the servlet request
      * @param response the servlet response
@@ -864,7 +864,7 @@
      * does not exist, the method returns null.
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @param request the servlet request
      * @param name the name of the cookie
@@ -1257,7 +1257,7 @@
      * character offsets, you can easily tweak results.
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @param username the username
      * @param password the password
@@ -1281,7 +1281,7 @@
      * character offsets, you can easily tweak results.
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @param username the username
      * @param password the password
@@ -1319,7 +1319,7 @@
      * Decodes a cookie string containing a username and password.
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @param cookieVal the encoded cookie username and password value
      * @param xorMask the XOR mask to decrypt the value with, must be same as
@@ -1338,7 +1338,7 @@
      * Decodes a cookie string containing a username and password.
      * <p/>
      * This method was derived from Atlassian <tt>CookieUtils</tt> method of
-     * the same name, release under the Apache License.
+     * the same name, release under the BSD License.
      *
      * @param cookieVal the encoded cookie username and password value
      * @param encoding  a String used to customize cookie encoding (only the first 3 characters
are used)



Mime
View raw message