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

@@ -62,6 +62,13 @@
         <include>CLASSWORLDS-LICENSE.txt</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../plugins/sitemesh/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>SITEMESH-LICENSE.txt</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>../plugins/struts1/src/main/resources</directory>
       <outputDirectory></outputDirectory>

assembly/src/main/assembly/lib.xml

@@ -62,6 +62,13 @@
         <include>CLASSWORLDS-LICENSE.txt</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../plugins/sitemesh/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>SITEMESH-LICENSE.txt</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>../plugins/struts1/src/main/resources</directory>
       <outputDirectory></outputDirectory>

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/).

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/).
+Classworlds (http://classworlds.codehaus.org/).
+Plexus (http://plexus.codehaus.org/).

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/).
+The Apache Software Foundation (http://www.apache.org/).
+
+The binary distributions includes the following third party software:
+SiteMesh (http://www.opensymphony.com/sitemesh/).

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.
+ * ====================================================================
+ */
+