added the Apache license.

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

1 files changed, 14 insertions, 13 deletions

diff --git a/License.html b/License.html
index bec1335b..7d842b40 100644
--- a/License.html
+++ b/License.html
@@ -337,7 +337,7 @@ MISCELLANEOUS.</B>
   basis. Nothing herein is intended or shall be deemed to constitute any 
   admission of liability.</UL><B>13. MULTIPLE-LICENSED CODE.</B> 
 <UL>Initial Developer may designate portions of the Covered Code as 
-  �Multiple-Licensed?.&nbsp; �Multiple-Licensed? means that the Initial 
+  "Multiple-Licensed".&nbsp; "Multiple-Licensed" means that the Initial 
   Developer permits you to utilize portions of the Covered Code under Your 
   choice of the MPL or the alternative licenses, if any, specified by the 
   Initial Developer in the file described in Exhibit A.</UL>
@@ -353,19 +353,20 @@ MISCELLANEOUS.</B>
   <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-2010 Shigeru Chiba. All Rights Reserved. 
-  <P>Contributor(s): ______________________________________. 
+  Copyright (C) 1999- Shigeru Chiba. All Rights Reserved. 
+  <P>Contributor(s):  __Bill Burke, Jason T. Greene______________.
 
-  <P>Alternatively, the contents of this file 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 file only
-  under the terms of the LGPL, and not to allow others to
-  use your version of this file 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 file under
-  the terms of either the MPL or the LGPL.
+<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"), or the Apache License Version 2.0 (the "AL"),
+in which case the provisions of the LGPL or the AL are applicable
+instead of those above. If you wish to allow use of your version of
+this software only under the terms of either the LGPL or the AL, 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 or the AL. If you do not
+delete the provisions above, a recipient may use your version of this
+software under the terms of any one of the MPL, the LGPL or the AL.
 
   <P></P></UL>
 </BODY>