From 42c8104e4ea66aff974c01e6b8810384b130f03b Mon Sep 17 00:00:00 2001 From: Antonio Petrelli Date: Fri, 25 Jan 2008 20:12:45 +0000 Subject: [PATCH] WW-2437 Added OGNL license and notice. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@615323 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/src/main/assembly/all.xml | 1 + assembly/src/main/assembly/lib.xml | 1 + assembly/src/main/resources/NOTICE.txt | 1 + core/src/main/resources/NOTICE.txt | 3 +- core/src/main/resources/OGNL-LICENSE.txt | 50 ++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 core/src/main/resources/OGNL-LICENSE.txt diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index 799438a7b..9f269ba42 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -52,6 +52,7 @@ FREEMARKER-LICENSE.txt + OGNL-LICENSE.txt diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml index 5b1f9eb96..268790be2 100644 --- a/assembly/src/main/assembly/lib.xml +++ b/assembly/src/main/assembly/lib.xml @@ -52,6 +52,7 @@ FREEMARKER-LICENSE.txt + OGNL-LICENSE.txt diff --git a/assembly/src/main/resources/NOTICE.txt b/assembly/src/main/resources/NOTICE.txt index 003f95325..f5b7a9483 100644 --- a/assembly/src/main/resources/NOTICE.txt +++ b/assembly/src/main/resources/NOTICE.txt @@ -12,3 +12,4 @@ Classworlds (http://classworlds.codehaus.org/). EZMorph (http://ezmorph.sourceforge.net/) FreeMarker (http://freemarker.org/). JSON-lib (http://json-lib.sourceforge.net/). +OGNL (http://www.opensymphony.com/ognl/). diff --git a/core/src/main/resources/NOTICE.txt b/core/src/main/resources/NOTICE.txt index d7440ce88..1e30a49f3 100644 --- a/core/src/main/resources/NOTICE.txt +++ b/core/src/main/resources/NOTICE.txt @@ -6,4 +6,5 @@ The Apache Software Foundation (http://www.apache.org/). domTT (http://www.mojavelinux.com/projects/domtooltip/). The binary distributions includes the following third party software: -FreeMarker (http://freemarker.org/). \ No newline at end of file +FreeMarker (http://freemarker.org/). +OGNL (http://www.opensymphony.com/ognl/). diff --git a/core/src/main/resources/OGNL-LICENSE.txt b/core/src/main/resources/OGNL-LICENSE.txt new file mode 100644 index 000000000..26cde3c34 --- /dev/null +++ b/core/src/main/resources/OGNL-LICENSE.txt @@ -0,0 +1,50 @@ +/* ==================================================================== + * The OpenSymphony Software License, Version 1.1 + * + * (this license is derived and fully compatible with the Apache Software + * License - see http://www.apache.org/LICENSE.txt) + * + * Copyright (c) 2001-2004 The OpenSymphony Group. 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. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * OpenSymphony Group (http://www.opensymphony.com/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "OpenSymphony" and "The OpenSymphony Group" + * must not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact license@opensymphony.com . + * + * 5. Products derived from this software may not be called "OpenSymphony" + * or "OGNL", nor may "OpenSymphony" or "OGNL" appear in their + * name, without prior written permission of the OpenSymphony Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR + * ITS 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. + * ==================================================================== + */ \ No newline at end of file