From c6004e9c1aa00f94ee7c9dd61344a1dd3da4120c Mon Sep 17 00:00:00 2001
From: Antonio Petrelli <apetrelli@apache.org>
Date: Thu, 24 Jan 2008 20:12:19 +0000
Subject: [PATCH] WW-2437 Added Classworlds notice.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@614969 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/src/main/assembly/all.xml            | 11 ++++-
 assembly/src/main/assembly/lib.xml            | 11 ++++-
 assembly/src/main/resources/NOTICE.txt        |  1 +
 .../main/resources/CLASSWORLDS-LICENSE.txt    | 47 +++++++++++++++++++
 plugins/plexus/src/main/resources/NOTICE.txt  |  5 +-
 5 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt

diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 2bbce137e..8eb6ce8b8 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -45,8 +45,15 @@
       </includes>
     </fileSet>
     <fileSet>
-        <directory>../plugins/struts1/src/main/resources</directory>
-        <outputDirectory></outputDirectory>
+      <directory>../plugins/plexus/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>CLASSWORLDS-LICENSE.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../plugins/struts1/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
       <includes>
         <include>ANTLR-LICENSE.txt</include>
       </includes>
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index e910f9dad..8ee275c7a 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -45,8 +45,15 @@
       </includes>
     </fileSet>
     <fileSet>
-        <directory>../plugins/struts1/src/main/resources</directory>
-        <outputDirectory></outputDirectory>
+      <directory>../plugins/plexus/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>CLASSWORLDS-LICENSE.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../plugins/struts1/src/main/resources</directory>
+      <outputDirectory></outputDirectory>
       <includes>
         <include>ANTLR-LICENSE.txt</include>
       </includes>
diff --git a/assembly/src/main/resources/NOTICE.txt b/assembly/src/main/resources/NOTICE.txt
index e4da995db..f98d94bf0 100644
--- a/assembly/src/main/resources/NOTICE.txt
+++ b/assembly/src/main/resources/NOTICE.txt
@@ -8,3 +8,4 @@ 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/).
diff --git a/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt b/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
new file mode 100644
index 000000000..a8e9a986f
--- /dev/null
+++ b/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
@@ -0,0 +1,47 @@
+
+
+/*
+ $Id$
+
+ Copyright 2002 (C) The Codehaus. All Rights Reserved.
+ 
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+    statements and notices.  Redistributions must also contain a
+    copy of this document.
+ 
+ 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 name "classworlds" must not be used to endorse or promote
+    products derived from this Software without prior written
+    permission of The Codehaus.  For written permission, please 
+    contact bob@codehaus.org.
+ 
+ 4. Products derived from this Software may not be called "classworlds"
+    nor may "classworlds" appear in their names without prior written
+    permission of The Codehaus. "classworlds" is a registered
+    trademark of The Codehaus.
+ 
+ 5. Due credit should be given to The Codehaus.
+    (http://classworlds.codehaus.org/).
+ 
+ THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
+ ``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 CODEHAUS 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.
+ 
+ */
diff --git a/plugins/plexus/src/main/resources/NOTICE.txt b/plugins/plexus/src/main/resources/NOTICE.txt
index cd13ec449..fefa27583 100644
--- a/plugins/plexus/src/main/resources/NOTICE.txt
+++ b/plugins/plexus/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:
+Classworlds (http://classworlds.codehaus.org/).
\ No newline at end of file