changed the license.

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@12 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

1 files changed, 45 insertions, 22 deletions

diff --git a/Readme.html b/Readme.html
index 77a01657..9addaa05 100644
--- a/Readme.html
+++ b/Readme.html
@@ -7,13 +7,13 @@
 
 <h1>Javassist version 2</h1>
 
-<h3>in April, 2003.
+<h3>in May, 2003.
 <br>Copyright (C) 2000-2003 by Shigeru Chiba, All rights reserved.</h3>
 
 <p><br></p>
 
-<p>Javassist (JAVA programming ASSISTant) is yet another reflective
-system for Java.  It is a class library for editing bytecodes in Java;
+<p>Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation
+simple.  It is a class library for editing bytecodes in Java;
 it enables Java programs to define a new class at runtime and to
 modify a class file when the JVM loads it.  Unlike other similar
 bytecode editors, Javassist provides two levels of API: source level
@@ -22,7 +22,8 @@ edit a class file without knowledge of the specifications of the Java
 bytecode.  The whole API is designed with only the vocabulary of the
 Java language.  You can even specify inserted bytecode in the form of
 source text; Javassist compiles it on the fly.  On the other hand, the
-bytecode-level API allows the users to directly edit a class file.
+bytecode-level API allows the users to directly edit a class file as
+other editors.
 
 <p><br>
 
@@ -32,7 +33,8 @@ bytecode-level API allows the users to directly edit a class file.
 <table>
 <tr>
 <td><li><tt><a href="License.html">License.html</a></tt></td>
-<td>License file</td>
+<td>License file
+(Also see the <a href="#copyright">copyright notices</a> below)</td>
 </tr>
 
 <tr>
@@ -234,10 +236,10 @@ see javassist.Dump.
 
 <h2>Changes</h2>
 
-<p>- version 2.5 in April, 2003.
+<p>- version 2.5 in May, 2003.
 <br>From this version, Javassist is part of the JBoss project.
 <ul>
-  <li>The license was changed from MPL to LGPL.
+  <li>The license was changed from MPL to MPL/LGPL dual.
   <li>ClassPool.removeClassPath() and ClassPath.close() have been added.
   <li>ClassPool.makeClass(InputStream) has been added.
   <li>javassist.expr.Handler has been added.
@@ -414,30 +416,51 @@ see javassist.Dump.
 <br>
 
 <p><dt>The home page of Javassist:
-<dd><tt><a href="http://www.csg.is.titech.ac.jp/~chiba/javassist">http://www.csg.is.titech.ac.jp/~chiba/javassist</a></tt>
+<dd>Visit <a href="http://www.jboss.org/index.html?module=html&op=userdisplay&id=developers/projects/javassist"><tt>www.jboss.org</tt></a>
 
-<p><dt>The Javassist mailing list:
-<dd><tt><a href="javassist@csg.is.titech.ac.jp">javassist@csg.is.titech.ac.jp</a></tt>
 </dl>
 
 <p><br>
 
+<a name="copyright">
 <h2>Copyright notices</h2>
 
 <p>Javassist, a Java-bytecode translator toolkit.
 <br>Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved.
 
-<p>This library is free software; you can redistribute it and/or
-modify it under the terms of
-<a href="License.html">the GNU Lesser General Public
-License</a> as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-<p>This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See <a href="License.html">the GNU Lesser General Public License</a>
-for more details.
+<p>The contents of this software, Javassist, are subject to
+the Mozilla Public License Version 1.1 (the "License");<br>
+you may not use this software except in compliance 
+with the License. You may obtain a copy of the License at 
+<br>http://www.mozilla.org/MPL/ 
+
+<p>Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF <br>ANY KIND, either express or implied.
+See the License for the specific language governing rights and
+<br>limitations under the License. 
+
+<p>The Original Code is Javassist. 
+
+<p>The Initial Developer of the Original Code is Shigeru Chiba. 
+Portions created by the Initial Developer are<br>&nbsp;
+Copyright (C) 1999-2003 Shigeru Chiba. All Rights Reserved. 
+<p>Contributor(s): ______________________________________. 
+
+<p>Alternatively, the contents of this software may be used under the
+terms of the GNU Lesser General Public License Version 2.1 or later
+(the "LGPL"), in which case the provisions of the LGPL are applicable
+instead of those above. If you wish to allow use of your version of
+this software only under the terms of the LGPL, and not to allow others to
+use your version of this software under the terms of the MPL, indicate
+your decision by deleting the provisions above and replace them with
+the notice and other provisions required by the LGPL. If you do not
+delete the provisions above, a recipient may use your version of this
+software under the terms of either the MPL or the LGPL.
+
+<p>If you obtain this software as part of JBoss, the contents of this
+software may be used under only the terms of the LGPL.  To use them
+under the MPL, you must obtain a separate package including only
+Javassist but not the other part of JBoss.
 
 <p><br>
 
@@ -462,6 +485,6 @@ for their contributions.
 
 <hr>
 <a href="http://www.is.titech.ac.jp/~chiba">Shigeru Chiba</a>
-(Email: <tt>chiba@is.titech.ac.jp</tt>)
+(Email: <tt>chiba@acm.org</tt>)
 <br>Dept. of Math. and Computing Sciences,
 <a href="http://www.titech.ac.jp">Tokyo Institute of Technology</a>