Author: apetrelli
Date: Thu Jan 24 12:53:03 2008
New Revision: 614986
URL: http://svn.apache.org/viewvc?rev=614986&view=rev
Log:
WW-2437
Added FreeMarker, JSON-lib and EZMorph notices.
Added:
struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt (with
props)
struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt (with
props)
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/lib.xml
struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
struts/struts2/trunk/core/src/main/resources/NOTICE.txt
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=614986&r1=614985&r2=614986&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Thu Jan 24 12:53:03 2008
@@ -117,7 +117,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+<!-- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -138,7 +138,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=614986&r1=614985&r2=614986&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Thu Jan 24 12:53:03
2008
@@ -45,6 +45,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../core/src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>FREEMARKER-LICENSE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../plugins/plexus/src/main/resources</directory>
<outputDirectory></outputDirectory>
<includes>
Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=614986&r1=614985&r2=614986&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Thu Jan 24 12:53:03
2008
@@ -45,6 +45,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../core/src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>FREEMARKER-LICENSE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../plugins/plexus/src/main/resources</directory>
<outputDirectory></outputDirectory>
<includes>
Modified: struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt?rev=614986&r1=614985&r2=614986&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt Thu Jan 24
12:53:03 2008
@@ -9,3 +9,6 @@
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/).
Added: struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt?rev=614986&view=auto
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt (added)
+++ struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt Thu Jan
24 12:53:03 2008
@@ -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 [EMAIL PROTECTED]
+
+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/
Propchange: struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/resources/FREEMARKER-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/NOTICE.txt?rev=614986&r1=614985&r2=614986&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/core/src/main/resources/NOTICE.txt Thu Jan 24 12:53:03
2008
@@ -3,4 +3,7 @@
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
Added: struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt?rev=614986&view=auto
==============================================================================
--- struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt (added)
+++ struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt Thu Jan 24
12:53:03 2008
@@ -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/).
Propchange: struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
