From f5a88391e19eb3055ad650db72c7acac3615ef1b Mon Sep 17 00:00:00 2001 From: Antonio Petrelli Date: Fri, 25 Jan 2008 20:30:09 +0000 Subject: [PATCH] WW-2437 Added Plexus and SiteMesh license and notice. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@615331 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/src/main/assembly/all.xml | 7 +++ assembly/src/main/assembly/lib.xml | 7 +++ assembly/src/main/resources/NOTICE.txt | 2 + plugins/plexus/src/main/resources/NOTICE.txt | 3 +- .../sitemesh/src/main/resources/NOTICE.txt | 5 +- .../src/main/resources/SITEMESH-LICENSE.txt | 51 +++++++++++++++++++ 6 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 plugins/sitemesh/src/main/resources/SITEMESH-LICENSE.txt diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index 9f269ba42..bdba5fe2d 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -62,6 +62,13 @@ CLASSWORLDS-LICENSE.txt + + ../plugins/sitemesh/src/main/resources + + + SITEMESH-LICENSE.txt + + ../plugins/struts1/src/main/resources diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml index 268790be2..d72a734be 100644 --- a/assembly/src/main/assembly/lib.xml +++ b/assembly/src/main/assembly/lib.xml @@ -62,6 +62,13 @@ CLASSWORLDS-LICENSE.txt + + ../plugins/sitemesh/src/main/resources + + + SITEMESH-LICENSE.txt + + ../plugins/struts1/src/main/resources diff --git a/assembly/src/main/resources/NOTICE.txt b/assembly/src/main/resources/NOTICE.txt index f5b7a9483..77e43f66d 100644 --- a/assembly/src/main/resources/NOTICE.txt +++ b/assembly/src/main/resources/NOTICE.txt @@ -13,3 +13,5 @@ EZMorph (http://ezmorph.sourceforge.net/) FreeMarker (http://freemarker.org/). JSON-lib (http://json-lib.sourceforge.net/). OGNL (http://www.opensymphony.com/ognl/). +Plexus (http://plexus.codehaus.org/). +SiteMesh (http://www.opensymphony.com/sitemesh/). diff --git a/plugins/plexus/src/main/resources/NOTICE.txt b/plugins/plexus/src/main/resources/NOTICE.txt index fefa27583..689c423d6 100644 --- a/plugins/plexus/src/main/resources/NOTICE.txt +++ b/plugins/plexus/src/main/resources/NOTICE.txt @@ -5,4 +5,5 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). The binary distributions includes the following third party software: -Classworlds (http://classworlds.codehaus.org/). \ No newline at end of file +Classworlds (http://classworlds.codehaus.org/). +Plexus (http://plexus.codehaus.org/). diff --git a/plugins/sitemesh/src/main/resources/NOTICE.txt b/plugins/sitemesh/src/main/resources/NOTICE.txt index cd13ec449..03e87d31c 100644 --- a/plugins/sitemesh/src/main/resources/NOTICE.txt +++ b/plugins/sitemesh/src/main/resources/NOTICE.txt @@ -2,4 +2,7 @@ Apache Struts Copyright 2000-2007 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file +The Apache Software Foundation (http://www.apache.org/). + +The binary distributions includes the following third party software: +SiteMesh (http://www.opensymphony.com/sitemesh/). diff --git a/plugins/sitemesh/src/main/resources/SITEMESH-LICENSE.txt b/plugins/sitemesh/src/main/resources/SITEMESH-LICENSE.txt new file mode 100644 index 000000000..6748a870b --- /dev/null +++ b/plugins/sitemesh/src/main/resources/SITEMESH-LICENSE.txt @@ -0,0 +1,51 @@ +/* ==================================================================== + * 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 "SiteMesh", nor may "OpenSymphony" or "SiteMesh" 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