Author: apetrelli
Date: Sun Jan 27 06:06:24 2008
New Revision: 615603
URL: http://svn.apache.org/viewvc?rev=615603&view=rev
Log:
WW-2437
Added XWork, XStream, XPP3 licenses and notice.
Added:
struts/struts2/trunk/core/src/main/resources/XWORK-LICENSE.txt (with
props)
struts/struts2/trunk/plugins/rest/src/main/resources/XPP3-LICENSE.txt
(with props)
struts/struts2/trunk/plugins/rest/src/main/resources/XSTREAM-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/core/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/rest/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=615603&r1=615602&r2=615603&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Sun Jan 27 06:06:24
2008
@@ -33,6 +33,7 @@
<excludes>
<exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
<exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+ <exclude>junit:junit</exclude>
<exclude>*:jdk14</exclude>
</excludes>
</dependencySet>
@@ -53,6 +54,7 @@
<includes>
<include>FREEMARKER-LICENSE.txt</include>
<include>OGNL-LICENSE.txt</include>
+ <include>XWORK-LICENSE.txt</include>
</includes>
</fileSet>
<fileSet>
@@ -60,6 +62,14 @@
<outputDirectory></outputDirectory>
<includes>
<include>CLASSWORLDS-LICENSE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/rest/src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>XSTREAM-LICENSE.txt</include>
+ <include>XPP3-LICENSE.txt</include>
</includes>
</fileSet>
<fileSet>
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=615603&r1=615602&r2=615603&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Sun Jan 27 06:06:24
2008
@@ -33,6 +33,7 @@
<excludes>
<exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
<exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+ <exclude>junit:junit</exclude>
<exclude>*:jdk14</exclude>
</excludes>
</dependencySet>
@@ -53,6 +54,7 @@
<includes>
<include>FREEMARKER-LICENSE.txt</include>
<include>OGNL-LICENSE.txt</include>
+ <include>XWORK-LICENSE.txt</include>
</includes>
</fileSet>
<fileSet>
@@ -60,6 +62,14 @@
<outputDirectory></outputDirectory>
<includes>
<include>CLASSWORLDS-LICENSE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../plugins/rest/src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>XSTREAM-LICENSE.txt</include>
+ <include>XPP3-LICENSE.txt</include>
</includes>
</fileSet>
<fileSet>
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=615603&r1=615602&r2=615603&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt Sun Jan 27
06:06:24 2008
@@ -15,3 +15,6 @@
OGNL (http://www.opensymphony.com/ognl/).
Plexus (http://plexus.codehaus.org/).
SiteMesh (http://www.opensymphony.com/sitemesh/).
+XWork (http://www.opensymphony.com/xwork/).
+XPP3 (http://www.extreme.indiana.edu/xgws/xsoap/xpp/).
+XStream (http://xstream.codehaus.org/).
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=615603&r1=615602&r2=615603&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/core/src/main/resources/NOTICE.txt Sun Jan 27 06:06:24
2008
@@ -8,3 +8,4 @@
The binary distributions includes the following third party software:
FreeMarker (http://freemarker.org/).
OGNL (http://www.opensymphony.com/ognl/).
+XWork (http://www.opensymphony.com/xwork/).
Added: struts/struts2/trunk/core/src/main/resources/XWORK-LICENSE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/XWORK-LICENSE.txt?rev=615603&view=auto
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/XWORK-LICENSE.txt (added)
+++ struts/struts2/trunk/core/src/main/resources/XWORK-LICENSE.txt Sun Jan 27
06:06:24 2008
@@ -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 [EMAIL PROTECTED] .
+ *
+ * 5. Products derived from this software may not be called "OpenSymphony"
+ * or "XWork", nor may "OpenSymphony" or "XWork" 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.
+ * ====================================================================
+ */
+
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/main/resources/XWORK-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/core/src/main/resources/XWORK-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: 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=615603&r1=615602&r2=615603&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/plugins/rest/src/main/resources/NOTICE.txt Sun Jan 27
06:06:24 2008
@@ -7,3 +7,5 @@
The binary distributions includes the following third party software:
EZMorph (http://ezmorph.sourceforge.net/)
JSON-lib (http://json-lib.sourceforge.net/).
+XPP3 (http://www.extreme.indiana.edu/xgws/xsoap/xpp/).
+XStream (http://xstream.codehaus.org/).
Added: struts/struts2/trunk/plugins/rest/src/main/resources/XPP3-LICENSE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/resources/XPP3-LICENSE.txt?rev=615603&view=auto
==============================================================================
--- struts/struts2/trunk/plugins/rest/src/main/resources/XPP3-LICENSE.txt
(added)
+++ struts/struts2/trunk/plugins/rest/src/main/resources/XPP3-LICENSE.txt Sun
Jan 27 06:06:24 2008
@@ -0,0 +1,46 @@
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. 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 Indiana University
+ Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself,
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
+must not be used to endorse or promote products derived from this
+software without prior written permission. For written permission,
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy"
+name nor may "Indiana Univeristy" appear in their name, without prior
+written permission of the Indiana University.
+
+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 AUTHORS, COPYRIGHT HOLDERS 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/rest/src/main/resources/XPP3-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/rest/src/main/resources/XPP3-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/struts2/trunk/plugins/rest/src/main/resources/XSTREAM-LICENSE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/resources/XSTREAM-LICENSE.txt?rev=615603&view=auto
==============================================================================
--- struts/struts2/trunk/plugins/rest/src/main/resources/XSTREAM-LICENSE.txt
(added)
+++ struts/struts2/trunk/plugins/rest/src/main/resources/XSTREAM-LICENSE.txt
Sun Jan 27 06:06:24 2008
@@ -0,0 +1,26 @@
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
list of
+conditions and the following disclaimer. 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.
+
+Neither the name of XStream nor the names of its contributors may be used to
endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY
+EXPRESS 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 COPYRIGHT OWNER OR 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/rest/src/main/resources/XSTREAM-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/rest/src/main/resources/XSTREAM-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
