Author: veithen
Date: Sat May 29 15:48:03 2010
New Revision: 949406
URL: http://svn.apache.org/viewvc?rev=949406&view=rev
Log:
LEGAL-74 / WSCOMMONS-545: Added appropriate notice and license files for Jaxen
sources included in axiom-jaxen-testsuite.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/README.txt
(with props)
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/LICENSE-JAXEN
(with props)
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/NOTICE
(with props)
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/jaxen/test/README.txt
Modified:
webservices/commons/trunk/modules/axiom/pom.xml
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/README.txt
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/README.txt?rev=949406&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/README.txt
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/README.txt
Sat May 29 15:48:03 2010
@@ -0,0 +1,4 @@
+This module contains sources from Jaxen 1.1.1/1.1.2. See
+src/main/resources/META-INF/NOTICE for more information. Please do not modify
+these files so that they can easily be replaced by new versions from upstream
+releases.
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/README.txt
------------------------------------------------------------------------------
eol:style = native
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/LICENSE-JAXEN
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/LICENSE-JAXEN?rev=949406&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/LICENSE-JAXEN
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/LICENSE-JAXEN
Sat May 29 15:48:03 2010
@@ -0,0 +1,33 @@
+/*
+ $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $
+
+ Copyright 2003-2006 The Werken Company. 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 the Jaxen Project 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:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/LICENSE-JAXEN
------------------------------------------------------------------------------
eol:style = native
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/NOTICE?rev=949406&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/NOTICE
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/NOTICE
Sat May 29 15:48:03 2010
@@ -0,0 +1,17 @@
+Axiom Jaxen Test Suite
+
+Copyright 2004-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
+The following packages/folders in this archive contain code and resources
+developed by the Werken Company:
+
+* org.jaxen.test
+* xml
+
+Copyright 2003-2006 The Werken Company. All Rights Reserved.
+
+See the LICENSE-JAXEN file for the license terms applicable to these files.
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/META-INF/NOTICE
------------------------------------------------------------------------------
eol:style = native
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=949406&r1=949405&r2=949406&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Sat May 29 15:48:03 2010
@@ -568,10 +568,10 @@
<exclude>**/*.svg</exclude>
<!-- We can't add license headers to test resources -->
<exclude>src/test/resources/**</exclude>
- <!-- TODO: These are indeed copies of classes from
Jaxen -->
+ <!-- Source code, resources and license files from
Jaxen (see LEGAL-74 & WSCOMMONS-545) -->
<exclude>src/main/resources/xml/**</exclude>
<exclude>src/main/java/org/jaxen/test/**</exclude>
- <!-- TODO: This is related to the previous one an
needs to be investigated -->
+
<exclude>src/main/resources/META-INF/LICENSE-JAXEN</exclude>
<exclude>legal/jaxen-LICENSE.txt</exclude>
<!-- Files used by various developer tools -->
<exclude>*.sonarj</exclude>
