Author: rdonkin
Date: Thu Jun 16 18:35:36 2011
New Revision: 1136591
URL: http://svn.apache.org/viewvc?rev=1136591&view=rev
Log:
JAMES-1269 Added provenance and license for dnsjava to the LICENSE contained in
the binary distribution.
Modified:
james/server/trunk/container-spring/src/main/appended-resources/supplemental-models.xml
james/server/trunk/container-spring/src/main/licensing/license-for-binary.txt
Modified:
james/server/trunk/container-spring/src/main/appended-resources/supplemental-models.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/appended-resources/supplemental-models.xml?rev=1136591&r1=1136590&r2=1136591&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/appended-resources/supplemental-models.xml
(original)
+++
james/server/trunk/container-spring/src/main/appended-resources/supplemental-models.xml
Thu Jun 16 18:35:36 2011
@@ -390,4 +390,21 @@ The Legion Of The Bouncy Castle
</organization>
</project>
</supplement>
+<!--
+
+
+==============================================================
+dnsjava
+ -->
+ <supplement>
+ <project>
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ <organization>
+ <name>dnsjava</name>
+ <url>http://www.dnsjava.org</url>
+ </organization>
+ </project>
+ </supplement>
+
</supplementalDataModels>
Modified:
james/server/trunk/container-spring/src/main/licensing/license-for-binary.txt
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/licensing/license-for-binary.txt?rev=1136591&r1=1136590&r2=1136591&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/licensing/license-for-binary.txt
(original)
+++
james/server/trunk/container-spring/src/main/licensing/license-for-binary.txt
Thu Jun 16 18:35:36 2011
@@ -214,6 +214,37 @@ Within the lib directory
from The Legion of the Bouncy Castle http://www.bouncycastle.org/
bcmail-jdk15-1.45.jar
bcprov-jdk15-1.45.jar
+ licensed under the BSD license http://www.dnsjava.org/dnsjava-current/README
(as follows)
+ dnsjava is placed under the BSD license. Several files are also
under
+ additional licenses; see the individual files for details.
+
+ Copyright (c) 1999-2005, Brian Wellington
+ 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 dnsjava 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.
+ by Brian Wellington
+ dnsjava-2.1.1.jar
placed in the public domain
by The AOP Alliance http://aopalliance.sourceforge.net/
aopalliance-1.0.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
