You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2008/01/24 21:12:20 UTC
svn commit: r614969 - in /struts/struts2/trunk: assembly/src/main/assembly/
assembly/src/main/resources/ plugins/plexus/src/main/resources/
Author: apetrelli
Date: Thu Jan 24 12:12:19 2008
New Revision: 614969
URL: http://svn.apache.org/viewvc?rev=614969&view=rev
Log:
WW-2437
Added Classworlds notice.
Added:
struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt (with props)
Modified:
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/plugins/plexus/src/main/resources/NOTICE.txt
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=614969&r1=614968&r2=614969&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:12:19 2008
@@ -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>
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=614969&r1=614968&r2=614969&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:12:19 2008
@@ -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>
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=614969&r1=614968&r2=614969&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:12:19 2008
@@ -8,3 +8,4 @@
The binary distributions includes the following third party software:
ANTLR (http://www.antlr.org/).
+Classworlds (http://classworlds.codehaus.org/).
Added: struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt?rev=614969&view=auto
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt (added)
+++ struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt Thu Jan 24 12:12:19 2008
@@ -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.
+
+ */
Propchange: struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/plugins/plexus/src/main/resources/CLASSWORLDS-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/plugins/plexus/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/src/main/resources/NOTICE.txt?rev=614969&r1=614968&r2=614969&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/plexus/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/plugins/plexus/src/main/resources/NOTICE.txt Thu Jan 24 12:12:19 2008
@@ -2,4 +2,7 @@
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