From 420510aae305e105b574a56c7e248dc51573dfee Mon Sep 17 00:00:00 2001 From: Antonio Petrelli Date: Thu, 24 Jan 2008 20:53:03 +0000 Subject: [PATCH] WW-2437 Added FreeMarker, JSON-lib and EZMorph notices. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@614986 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/pom.xml | 4 +- assembly/src/main/assembly/all.xml | 7 +++ assembly/src/main/assembly/lib.xml | 7 +++ assembly/src/main/resources/NOTICE.txt | 3 ++ .../src/main/resources/FREEMARKER-LICENSE.txt | 46 +++++++++++++++++++ core/src/main/resources/NOTICE.txt | 5 +- plugins/rest/src/main/resources/NOTICE.txt | 9 ++++ 7 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 core/src/main/resources/FREEMARKER-LICENSE.txt create mode 100644 plugins/rest/src/main/resources/NOTICE.txt diff --git a/assembly/pom.xml b/assembly/pom.xml index af307ddb5..57feed675 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -117,7 +117,7 @@ - + maven-assembly-plugin 2.2-beta-1 diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index 8eb6ce8b8..a655b7cbc 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -44,6 +44,13 @@ NOTICE* + + ../core/src/main/resources + + + FREEMARKER-LICENSE.txt + + ../plugins/plexus/src/main/resources diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml index 8ee275c7a..e432922d5 100644 --- a/assembly/src/main/assembly/lib.xml +++ b/assembly/src/main/assembly/lib.xml @@ -44,6 +44,13 @@ NOTICE* + + ../core/src/main/resources + + + FREEMARKER-LICENSE.txt + + ../plugins/plexus/src/main/resources diff --git a/assembly/src/main/resources/NOTICE.txt b/assembly/src/main/resources/NOTICE.txt index f98d94bf0..003f95325 100644 --- a/assembly/src/main/resources/NOTICE.txt +++ b/assembly/src/main/resources/NOTICE.txt @@ -9,3 +9,6 @@ domTT (http://www.mojavelinux.com/projects/domtooltip/). The binary distributions includes the following third party software: ANTLR (http://www.antlr.org/). Classworlds (http://classworlds.codehaus.org/). +EZMorph (http://ezmorph.sourceforge.net/) +FreeMarker (http://freemarker.org/). +JSON-lib (http://json-lib.sourceforge.net/). diff --git a/core/src/main/resources/FREEMARKER-LICENSE.txt b/core/src/main/resources/FREEMARKER-LICENSE.txt new file mode 100644 index 000000000..0ed6c6d7d --- /dev/null +++ b/core/src/main/resources/FREEMARKER-LICENSE.txt @@ -0,0 +1,46 @@ +FreeMarker 1.x was released under the LGPL license. Later, by community +consensus, we have switched over to a BSD-style license. As of FreeMarker +2.2pre1, the original author, Benjamin Geer, has relinquished the copyright in +behalf of Visigoth Software Society. The current copyright holder is the +Visigoth Software Society. + +------------------------------------------------------------------------------ +Copyright (c) 2003 The Visigoth Software Society. 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. The end-user documentation included with the redistribution, if any, must + include the following acknowlegement: + "This product includes software developed by the + Visigoth Software Society (http://www.visigoths.org/)." + Alternately, this acknowlegement may appear in the software itself, if and + wherever such third-party acknowlegements normally appear. + +3. Neither the name "FreeMarker", "Visigoth", nor any of the names of the + project contributors may be used to endorse or promote products derived + from this software without prior written permission. For written + permission, please contact visigoths@visigoths.org. + +4. Products derived from this software may not be called "FreeMarker" or + "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names + without prior written permission of the Visigoth Software Society. + +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 +VISIGOTH SOFTWARE SOCIETY 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. +------------------------------------------------------------------------------ + +This software consists of voluntary contributions made by many individuals on +behalf of the Visigoth Software Society. For more information on the Visigoth +Software Society, please see http://www.visigoths.org/ diff --git a/core/src/main/resources/NOTICE.txt b/core/src/main/resources/NOTICE.txt index 41beb5c8e..d7440ce88 100644 --- a/core/src/main/resources/NOTICE.txt +++ b/core/src/main/resources/NOTICE.txt @@ -3,4 +3,7 @@ Copyright 2000-2007 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -domTT (http://www.mojavelinux.com/projects/domtooltip/). \ No newline at end of file +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 diff --git a/plugins/rest/src/main/resources/NOTICE.txt b/plugins/rest/src/main/resources/NOTICE.txt new file mode 100644 index 000000000..9d1fea123 --- /dev/null +++ b/plugins/rest/src/main/resources/NOTICE.txt @@ -0,0 +1,9 @@ +Apache Struts +Copyright 2000-2007 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + +The binary distributions includes the following third party software: +EZMorph (http://ezmorph.sourceforge.net/) +JSON-lib (http://json-lib.sourceforge.net/).