You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2008/05/29 22:43:48 UTC
svn commit: r661475 - /hadoop/core/trunk/lib/slf4j-LICENSE.txt
Author: cutting
Date: Thu May 29 13:43:48 2008
New Revision: 661475
URL: http://svn.apache.org/viewvc?rev=661475&view=rev
Log:
HADOOP-3246. Fix lib/slf4j-LICENSE.txt.
Modified:
hadoop/core/trunk/lib/slf4j-LICENSE.txt
Modified: hadoop/core/trunk/lib/slf4j-LICENSE.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/lib/slf4j-LICENSE.txt?rev=661475&r1=661474&r2=661475&view=diff
==============================================================================
--- hadoop/core/trunk/lib/slf4j-LICENSE.txt (original)
+++ hadoop/core/trunk/lib/slf4j-LICENSE.txt Thu May 29 13:43:48 2008
@@ -1,568 +1,24 @@
-
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!-- ViewVC :: http://www.viewvc.org/ -->
-<head>
-<title>[slf4j.org-svn] Log of /slf4j/trunk/LICENSE.txt</title>
-<meta name="generator" content="ViewVC 1.0.1" />
-<link rel="stylesheet" href="/viewvc/*docroot*/styles.css" type="text/css" />
-
-</head>
-<body>
-<div class="vc_navheader">
-
-<form method="get" action="/viewvc/">
-
-<table style="padding:0.1em;">
-<tr>
-<td>
-<strong>
-
-<a href="/viewvc/">
-
-[slf4j.org-svn]</a>
-/
-
-<a href="/viewvc/slf4j/">
-
-slf4j</a>
-/
-
-<a href="/viewvc/slf4j/trunk/">
-
-trunk</a>
-/
-
-
-
-LICENSE.txt
-
-
-</strong>
-
-</td>
-<td style="text-align:right;">
-
-
-<strong>Repository:</strong>
-<select name="root" onchange="submit()">
-
-
-<option value="*viewroots*">Repository Listing</option>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<optgroup label="CVS Repositories"><option>cvs</option></optgroup>
-
-
-<optgroup label="Subversion Repositories"><option selected="selected">slf4j.org-svn</option></optgroup>
-
-</select>
-<input type="submit" value="Go" />
-
-</td>
-</tr>
-</table>
-
-</form>
-
-</div>
-<div style="float: right; padding: 5px;"><a href="http://www.viewvc.org/"><img src="/viewvc/*docroot*/images/logo.png" alt="ViewVC logotype" width="128" height="48" /></a></div>
-<h1>Log of /slf4j/trunk/LICENSE.txt</h1>
-
-<p style="margin:0;">
-
-<a href="/viewvc/slf4j/trunk/"><img src="/viewvc/*docroot*/images/back_small.png" width="16" height="16" alt="Parent Directory" /> Parent Directory</a>
-
-
-
-
-</p>
-
-<hr />
-<table class="auto">
-
-
-
-<tr>
-<td>Links to HEAD:</td>
-<td>
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?view=markup">view</a>)
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?view=co">download</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?view=annotate">annotate</a>)
-</td>
-</tr>
-
-
-
-<tr>
-<td>Sticky Revision:</td>
-<td><form method="get" action="/viewvc" style="display: inline">
-<input type="hidden" name="orig_pathtype" value="FILE" /><input type="hidden" name="orig_view" value="log" /><input type="hidden" name="orig_path" value="slf4j/trunk/LICENSE.txt" /><input type="hidden" name="view" value="redirect_pathrev" />
-
-<input type="text" name="pathrev" value="" size="6"/>
-
-<input type="submit" value="Set" />
-</form>
-
-</td>
-</tr>
-</table>
-
-
-
-
-
-
-
-
-
-<div>
-<hr />
-
-<a name="rev979"></a>
-
-
-Revision <a href="/viewvc?view=rev&revision=979"><strong>979</strong></a> -
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=979&view=markup">view</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=979">download</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?annotate=979">annotate</a>)
-
-
-
-- <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=979&view=log">[select for diffs]</a>
-
-
-
-
-<br />
-
-Modified
-
-<em>Thu Feb 21 18:43:04 2008 UTC</em> (3 months ago) by <em>ceki</em>
-
-
-
-
-
-
-
-
-
-<br />File length: 1159 byte(s)
-
-
-
-
-
-
-<br />Diff to <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=701&r2=979">previous 701</a>
-
-
-
-
-
-
-
-<pre class="vc_log">- renaming slf4j-converter module to slf4j-migrator</pre>
-</div>
-
-
-
-<div>
-<hr />
-
-<a name="rev701"></a>
-
-
-Revision <a href="/viewvc?view=rev&revision=701"><strong>701</strong></a> -
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=701&view=markup">view</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=701">download</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?annotate=701">annotate</a>)
-
-
-
-- <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=701&view=log">[select for diffs]</a>
-
-
-
-
-<br />
-
-Modified
-
-<em>Fri Feb 2 13:51:23 2007 UTC</em> (15 months, 3 weeks ago) by <em>ceki</em>
-
-
-
-
-
-
-
-
-
-<br />File length: 1159 byte(s)
-
-
-
-
-
-
-<br />Diff to <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=687&r2=701">previous 687</a>
-
-
-
-
-
-
-
-<pre class="vc_log">
-While we claim [1] that the SLF4J license is identical to the terms of
-the MIT License [2], Simon Kaegi observed that the "sublicense" right
-was removed from the actual license as published on our site. This was
-an unintentional omission that I just fixed in this SVN commit.
-
-I also updated the copyright dates and removed SLF4J.org as a copyright
-holder since SLF4J does not exist as a legal entity (only QOS.ch
-does).
-
-I also corrected the discrepancy between the license as published in
-[1] and the license included in the SLF4J distributions [3] which
-included the UC Berkeley advertising clause, a leftover form the early
-days where SLF4H was licensed under BSD.
-
-To cut a long story short, all LICENSE.txt files shipping are now
-identical copies containing exactly the same terms as the MIT license.
-
-Given that licensing changes are politically sensitive, please take
-the time to have a look at the changes and let me know if you have any
-objections to the changes just made.
-
-
-[1] <a href="http://slf4j.org/license.html">http://slf4j.org/license.html</a>
-[2] <a href="http://en.wikipedia.org/wiki/MIT_License">http://en.wikipedia.org/wiki/MIT_License</a>
-[3] <a href="http://svn.slf4j.org/viewvc/slf4j/trunk/LICENSE.txt?revision=687&view=markup">http://svn.slf4j.org/viewvc/slf4j/trunk/LICENSE.txt?revision=687&view=markup</a>
-
-</pre>
-</div>
-
-
-
-<div>
-<hr />
-
-<a name="rev687"></a>
-
-
-Revision <a href="/viewvc?view=rev&revision=687"><strong>687</strong></a> -
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=687&view=markup">view</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=687">download</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?annotate=687">annotate</a>)
-
-
-
-- <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=687&view=log">[select for diffs]</a>
-
-
-
-
-<br />
-
-Modified
-
-<em>Thu Jan 18 14:22:17 2007 UTC</em> (16 months, 1 week ago) by <em>seb</em>
-
-
-
-
-
-
-
-
-
-<br />File length: 1580 byte(s)
-
-
-
-
-
-
-<br />Diff to <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=686&r2=687">previous 686</a>
-
-
-
-
-
-
-
-<pre class="vc_log">test only, please ignore</pre>
-</div>
-
-
-
-<div>
-<hr />
-
-<a name="rev686"></a>
-
-
-Revision <a href="/viewvc?view=rev&revision=686"><strong>686</strong></a> -
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=686&view=markup">view</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=686">download</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?annotate=686">annotate</a>)
-
-
-
-- <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=686&view=log">[select for diffs]</a>
-
-
-
-
-<br />
-
-Modified
-
-<em>Thu Jan 18 13:38:32 2007 UTC</em> (16 months, 1 week ago) by <em>seb</em>
-
-
-
-
-
-
-
-
-
-<br />File length: 1579 byte(s)
-
-
-
-
-
-
-<br />Diff to <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=685&r2=686">previous 685</a>
-
-
-
-
-
-
-
-<pre class="vc_log">test only, please ignore</pre>
-</div>
-
-
-
-<div>
-<hr />
-
-<a name="rev685"></a>
-
-
-Revision <a href="/viewvc?view=rev&revision=685"><strong>685</strong></a> -
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=685&view=markup">view</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=685">download</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?annotate=685">annotate</a>)
-
-
-
-- <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=685&view=log">[select for diffs]</a>
-
-
-
-
-<br />
-
-Modified
-
-<em>Thu Jan 18 13:29:33 2007 UTC</em> (16 months, 1 week ago) by <em>seb</em>
-
-
-
-
-
-
-
-
-
-<br />File length: 1581 byte(s)
-
-
-
-
-
-
-<br />Diff to <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=200&r2=685">previous 200</a>
-
-
-
-
-
-
-
-<pre class="vc_log">test only, please ignore</pre>
-</div>
-
-
-
-<div>
-<hr />
-
-<a name="rev200"></a>
-
-
-Revision <a href="/viewvc?view=rev&revision=200"><strong>200</strong></a> -
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=200&view=markup">view</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?revision=200">download</a>)
-
-(<a href="/viewvc/slf4j/trunk/LICENSE.txt?annotate=200">annotate</a>)
-
-
-
-- <a href="/viewvc/slf4j/trunk/LICENSE.txt?r1=200&view=log">[select for diffs]</a>
-
-
-
-
-<br />
-
-Added
-
-<em>Fri Aug 26 19:46:12 2005 UTC</em> (2 years, 9 months ago) by <em>ceki</em>
-
-
-
-
-
-
-
-<br />File length: 1580 byte(s)
-
-
-
-
-
-
-
-
-
-
-<pre class="vc_log">missing LICENSE file</pre>
-</div>
-
-
-
-
-
- <hr />
-<p><a name="diff"></a>
-This form allows you to request diffs between any two revisions of this file.
-For each of the two "sides" of the diff,
-
-enter a numeric revision.
-
-</p>
-<form method="get" action="/viewvc/slf4j/trunk/LICENSE.txt" name="diff_select">
-<table cellpadding="2" cellspacing="0" class="auto">
-<tr>
-<td> </td>
-<td>
-<input type="hidden" name="view" value="diff" />
-Diffs between
-
-<input type="text" size="12" name="r1"
-value="979" />
-
-and
-
-<input type="text" size="12" name="r2" value="200" />
-
-</td>
-</tr>
-<tr>
-<td> </td>
-<td>
-Type of Diff should be a
-<select name="diff_format" onchange="submit()">
-<option value="h" selected="selected">Colored Diff</option>
-<option value="l" >Long Colored Diff</option>
-<option value="u" >Unidiff</option>
-<option value="c" >Context Diff</option>
-<option value="s" >Side by Side</option>
-</select>
-<input type="submit" value=" Get Diffs " />
-</td>
-</tr>
-</table>
-</form>
-
-
-<form method="get" action="/viewvc/slf4j/trunk/LICENSE.txt">
-<div>
-<hr />
-<a name="logsort"></a>
-<input type="hidden" name="view" value="log" />
-Sort log by:
-<select name="logsort" onchange="submit()">
-<option value="cvs" >Not sorted</option>
-<option value="date" selected="selected">Commit date</option>
-<option value="rev" >Revision</option>
-</select>
-<input type="submit" value=" Sort " />
-</div>
-</form>
-
-
-<hr />
-<table>
-<tr>
-<td><address><a href="http://www.slf4j.org/">slf4j.org lists</a></address></td>
-<td style="text-align: right;"><strong><a href="/viewvc/*docroot*/help_log.html">ViewVC Help</a></strong></td>
-</tr>
-<tr>
-<td>Powered by <a href="http://viewvc.tigris.org/">ViewVC 1.0.1</a></td>
-<td style="text-align: right;"> </td>
-</tr>
-</table>
-</body>
-</html>
-
-
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+