[jboss-svn-commits] JBL Code SVN: r9650 - labs/jbosstm/trunk/ext.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Feb 20 09:04:48 EST 2007


Author: jhalliday
Date: 2007-02-20 09:04:47 -0500 (Tue, 20 Feb 2007)
New Revision: 9650

Added:
   labs/jbosstm/trunk/ext/junit.jar
Modified:
   labs/jbosstm/trunk/ext/Readme
   labs/jbosstm/trunk/ext/third_party_licenses.txt
Log:
Added JUnit 3.8.2 to support unit testing, updated licence file accordingly.


Modified: labs/jbosstm/trunk/ext/Readme
===================================================================
--- labs/jbosstm/trunk/ext/Readme	2007-02-20 14:03:42 UTC (rev 9649)
+++ labs/jbosstm/trunk/ext/Readme	2007-02-20 14:04:47 UTC (rev 9650)
@@ -1,17 +1,17 @@
 JBoss, Home of Professional Open Source
-Copyright 2006, Red Hat Middleware LLC, and individual contributors 
-as indicated by the @author tags. 
+Copyright 2006, Red Hat Middleware LLC, and individual contributors
+as indicated by the @author tags.
 See the copyright.txt in the distribution for a
-full listing of individual contributors. 
+full listing of individual contributors.
 This copyrighted material is made available to anyone wishing to use,
 modify, copy, or redistribute it subject to the terms and conditions
 of the GNU Lesser General Public License, v. 2.1.
-This program is distributed in the hope that it will be useful, but WITHOUT A 
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+This program is distributed in the hope that it will be useful, but WITHOUT A
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License,
 v.2.1 along with this distribution; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 MA  02110-1301, USA.
 
 (C) 2005-2006,
@@ -33,7 +33,8 @@
 jmxri.jar		JMX reference implementation
 jndi.jar		JNDI
 jta-spec1_0_1.jar	JTA specification 1.0.1
-log4j-1.2.8.jar		LOG4j version 1.2.8	
+junit.jar		JUnit test framework, 3.8.2
+log4j-1.2.8.jar		LOG4j version 1.2.8
 wrapper.jar		Java Service Wrapper 3.2.3
 xalan.jar
 xercesImpl.jar		Xerces 2.3.0

Added: labs/jbosstm/trunk/ext/junit.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosstm/trunk/ext/junit.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosstm/trunk/ext/third_party_licenses.txt
===================================================================
--- labs/jbosstm/trunk/ext/third_party_licenses.txt	2007-02-20 14:03:42 UTC (rev 9649)
+++ labs/jbosstm/trunk/ext/third_party_licenses.txt	2007-02-20 14:04:47 UTC (rev 9650)
@@ -1,301 +1,301 @@
 TERMS AND CONDITIONS FOR THIRD PARTY PRODUCTS THAT MAY ACCOMPANY JBOSSTS
-THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE SOFTWARE THAT IS THE 
-PARTICULAR THIRD PARTY PRODUCT AND DO NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY OTHER PRODUCTS TERMS 
-ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE. 
+THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE SOFTWARE THAT IS THE
+PARTICULAR THIRD PARTY PRODUCT AND DO NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY OTHER PRODUCTS TERMS
+ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE.
 LICENSE TERMS FOR APACHE XERXES AND APACHE XALAN THAT MAY ACCOMPANY THE ARJUNA SOFTWARE
 
 
 The Apache Software LICENSE, Version 1.1
-THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE SOFTWARE THAT IS 
-APACHE XERCES AND XALAN AND DO NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY OTHER PRODUCTS TERMS 
+THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE SOFTWARE THAT IS
+APACHE XERCES AND XALAN AND DO NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY OTHER PRODUCTS TERMS
 ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE.
 
 For the Apache Xerces software:  Copyright (c) 1999-2000 The Apache Software Foundation.  All rights reserved.
 For the Apache Xalan software:  Copyright (c) 1999 The Apache Software Foundation.  All rights reserved.
 
-Redistribution and use in source and binary forms, with or without  modification, are permitted provided that the following conditions are 
+Redistribution and use in source and binary forms, with or without  modification, are permitted provided that the following conditions are
 met:
- 
-1.	Redistributions of source code must retain the above copyright  notice, this list of conditions and the following disclaimer. 
 
-2.	Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
+1.	Redistributions of source code must retain the above copyright  notice, this list of conditions and the following disclaimer.
+
+2.	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.
 
-3.	The end-user documentation included with the redistribution, if any, must include the following acknowledgment:  
+3.	The end-user documentation included with the redistribution, if any, must include the following acknowledgment:
 
 "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)."
 
-Alternately, this acknowledgment may appear in the software itself,   if and wherever such third-party acknowledgments normally 
+Alternately, this acknowledgment may appear in the software itself,   if and wherever such third-party acknowledgments normally
 appear.
 
-4.	The names "Xerces", "Xalan"  and "Apache Software Foundation" must not be used to endorse or promote products derived from 
-this software without prior written permission. For written permission, please contact apache at apache.org. 
+4.	The names "Xerces", "Xalan"  and "Apache Software Foundation" must not be used to endorse or promote products derived from
+this software without prior written permission. For written permission, please contact apache at apache.org.
 
-5.	Products derived from this software may not be called "Apache", "Velocity" nor may "Apache" appear in their name, without prior 
+5.	Products derived from this software may not be called "Apache", "Velocity" nor may "Apache" appear in their name, without prior
 written permission of the Apache Software Foundation.
 
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR ITS 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 IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR ITS 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.
 
 
 LICENSE TERMS FOR SUN MICROSYSTEMS, INC. PROGRAMS THAT MAY ACCOMPANY THE ARJUNA SOFTWARE
 
-THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE SOFTWARE THAT IS SUN 
-MICROSYSTEMS, INC. SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY OTHER PRODUCTS TERMS 
-ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE. 
+THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE SOFTWARE THAT IS SUN
+MICROSYSTEMS, INC. SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY OTHER PRODUCTS TERMS
+ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE.
 
-I.	Binary Code License Agreement for JavaTM Secure Socket Extensions ("JSSE") (including jsse, jcert and jnet) and JavaMailTM 
+I.	Binary Code License Agreement for JavaTM Secure Socket Extensions ("JSSE") (including jsse, jcert and jnet) and JavaMailTM
 1.2 ("JavaMail") (mail)
 
-1. LICENSE TO USE. Sun grants you a non-exclusive and non-transferable license for the internal use only of the JSSE and JavaMail 
-software and documentation and any error corrections provided by Sun (collectively "Sun Software"), by the number of users and the 
+1. LICENSE TO USE. Sun grants you a non-exclusive and non-transferable license for the internal use only of the JSSE and JavaMail
+software and documentation and any error corrections provided by Sun (collectively "Sun Software"), by the number of users and the
 class of computer hardware for which the corresponding fee has been paid.
-2. RESTRICTIONS. Sun Software is confidential and copyrighted. Title to Sun Software and all associated intellectual property rights is 
-retained by Sun and/or its licensors. Except as specifically authorized in any Supplemental License Terms, you may not make copies of 
-Sun Software, other than a single copy of Sun Software for archival purposes. Unless enforcement is prohibited by applicable law, you 
-may not modify, decompile, or reverse engineer Sun Software. You acknowledge that Sun Software is not designed, licensed or 
-intended for use in the design, construction, operation or maintenance of any nuclear facility. Sun disclaims any express or implied 
-warranty of fitness for such uses. No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its 
-licensors is granted under this Sun Agreement. 
-3. LIMITED WARRANTY. Sun Software is provided "AS IS". Your exclusive remedy and Sun's entire liability under this limited 
-warranty will be Sun's refund of the fee paid for Sun Software. 
-4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS SUN AGREEMENT, ALL EXPRESS OR IMPLIED 
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF 
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT 
-TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 
-5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS 
-LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, 
-INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING 
-OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SUN SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF 
-THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's liability to you, whether in contract, tort (including negligence), or 
-otherwise, exceed the amount paid by you for Sun Software under this Sun Agreement. The foregoing limitations will apply even if the 
-above stated warranty fails of its essential purpose. 
-6. Termination. This Sun Agreement is effective until terminated. You may terminate this Sun Agreement at any time by destroying all 
-copies of Sun Software. This Sun Agreement will terminate immediately without notice from Sun if you fail to comply with any 
-provision of this Sun Agreement. Upon Termination, you must destroy all copies of Sun Software. 
-7. Export Regulations. All Sun Software and technical data delivered under this Sun Agreement are subject to US export control laws 
-and may be subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations 
-and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery 
-to you. 
-8. U.S. Government Restricted Rights. If Sun Software is being acquired by or on behalf of the U.S. Government or by a U.S. 
-Government prime contractor or subcontractor (at any tier), then the Government's rights in Sun Software and accompanying 
-documentation will be only as set forth in this Sun Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for 
-Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
-9. Governing Law. Any action related to this Sun Agreement will be governed by California law and controlling U.S. federal law. No 
-choice of law rules of any jurisdiction will apply. 
-10. Severability. If any provision of this Sun Agreement is held to be unenforceable, this Sun Agreement will remain in effect with the 
-provision omitted, unless omission would frustrate the intent of the parties, in which case this Sun Agreement will immediately 
-terminate. 
-11. Integration. This Sun Agreement is the entire agreement between you and Sun relating to its subject matter. It supersedes all prior or 
-contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or 
-additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during 
-the term of this Sun Agreement. No modification of this Sun Agreement will be binding, unless in writing and signed by an authorized 
-representative of each party. For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California 94303 
+2. RESTRICTIONS. Sun Software is confidential and copyrighted. Title to Sun Software and all associated intellectual property rights is
+retained by Sun and/or its licensors. Except as specifically authorized in any Supplemental License Terms, you may not make copies of
+Sun Software, other than a single copy of Sun Software for archival purposes. Unless enforcement is prohibited by applicable law, you
+may not modify, decompile, or reverse engineer Sun Software. You acknowledge that Sun Software is not designed, licensed or
+intended for use in the design, construction, operation or maintenance of any nuclear facility. Sun disclaims any express or implied
+warranty of fitness for such uses. No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its
+licensors is granted under this Sun Agreement.
+3. LIMITED WARRANTY. Sun Software is provided "AS IS". Your exclusive remedy and Sun's entire liability under this limited
+warranty will be Sun's refund of the fee paid for Sun Software.
+4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS SUN AGREEMENT, ALL EXPRESS OR IMPLIED
+CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT
+TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
+LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
+INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING
+OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SUN SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's liability to you, whether in contract, tort (including negligence), or
+otherwise, exceed the amount paid by you for Sun Software under this Sun Agreement. The foregoing limitations will apply even if the
+above stated warranty fails of its essential purpose.
+6. Termination. This Sun Agreement is effective until terminated. You may terminate this Sun Agreement at any time by destroying all
+copies of Sun Software. This Sun Agreement will terminate immediately without notice from Sun if you fail to comply with any
+provision of this Sun Agreement. Upon Termination, you must destroy all copies of Sun Software.
+7. Export Regulations. All Sun Software and technical data delivered under this Sun Agreement are subject to US export control laws
+and may be subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations
+and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery
+to you.
+8. U.S. Government Restricted Rights. If Sun Software is being acquired by or on behalf of the U.S. Government or by a U.S.
+Government prime contractor or subcontractor (at any tier), then the Government's rights in Sun Software and accompanying
+documentation will be only as set forth in this Sun Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for
+Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
+9. Governing Law. Any action related to this Sun Agreement will be governed by California law and controlling U.S. federal law. No
+choice of law rules of any jurisdiction will apply.
+10. Severability. If any provision of this Sun Agreement is held to be unenforceable, this Sun Agreement will remain in effect with the
+provision omitted, unless omission would frustrate the intent of the parties, in which case this Sun Agreement will immediately
+terminate.
+11. Integration. This Sun Agreement is the entire agreement between you and Sun relating to its subject matter. It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or
+additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during
+the term of this Sun Agreement. No modification of this Sun Agreement will be binding, unless in writing and signed by an authorized
+representative of each party. For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California 94303
 
 II.	JAVATM DEVELOPMENT OPTIONAL PACKAGES JSSE,VERSION 1.0.2 SUPPLEMENTAL LICENSE TERMS
-These supplemental license terms ("JSSE Supplement") add to or modify the terms of the Sun Agreement (collectively, the "JSSE 
-Agreement") solely for the JSSE Software. Capitalized terms not defined in this Supplement shall have the same meanings ascribed to 
-them in the Sun Agreement. These Supplement terms shall supersede any inconsistent or conflicting terms in the Sun Agreement, or in 
-any license contained within the JSSE Software. 
-1. License to Distribute. Sun grants you a non-exclusive, non-transferable, royalty-free, limited license to (a) use the binary form of the 
-JSSE Software for the sole purpose of designing, developing and testing your JavaTM applets and applications intended to run on a 
-compatible Java environment (the "Programs"), provided that the Programs add significant and primary functionality to the JSSE 
-Software, and (b) reproduce and distribute the binary form of the JSSE Software through multiple tiers of distribution provided that you: 
-(i) distribute the JSSE Software complete and unmodified; (ii) do not distribute additional software intended to supersede any 
-component(s) of the JSSE Software; (iii) do not remove or alter any proprietary legends or notices contained in or on the JSSE Software; 
-and (iv) only distribute the JSSE Software pursuant to a license agreement that protects Sun's interests consistent with the terms 
-contained in this Agreement, and provides that Sun is a third party beneficiary to such license agreement. If you distribute the JSSE 
-Software pursuant to this paragraph, you must include the following statement as part of product documentation (whether hard copy or 
-electronic), as a part of a copyright page or proprietary rights notice page, in an "About" box or in any other form reasonably designed to 
-make the statement visible to users of the JSSE Software: "This product includes code licensed from RSA Data Security". 
-2. Requirements. In exchange for the licenses granted in Paragraph II.1 above, you agree: a. not to create, or authorize your licensees to 
-create, additional classes, interfaces or subpackages that are contained in the "java," "javax" or "sun" packages, or similarly named 
-package, as specified by Sun in any naming convention; b. that, in the event that you create an API(s) which: (i) extends the 
-functionality of a Java platform; and (ii) is distributed to third party software developers for the purpose of developing software which 
-invokes such additional API, you must promptly and broadly publish an accurate specification for such API for free use by all 
-developers; and c. to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts 
-and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or 
-results from the use or distribution of any and all Programs and/or JSSE Software. 
-3. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the Java trademark and all Java-related 
-trademarks, service marks, logos and other brand designations including the Coffee Cup logo and Duke logo ("Java Marks"), and you 
-agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. 
-Any use you make of the Java Marks inures to Sun's benefit. 
-4. Source Code. JSSE Software may contain source code that is provided solely for reference purposes pursuant to the terms of this 
-JSSE Agreement. 
+These supplemental license terms ("JSSE Supplement") add to or modify the terms of the Sun Agreement (collectively, the "JSSE
+Agreement") solely for the JSSE Software. Capitalized terms not defined in this Supplement shall have the same meanings ascribed to
+them in the Sun Agreement. These Supplement terms shall supersede any inconsistent or conflicting terms in the Sun Agreement, or in
+any license contained within the JSSE Software.
+1. License to Distribute. Sun grants you a non-exclusive, non-transferable, royalty-free, limited license to (a) use the binary form of the
+JSSE Software for the sole purpose of designing, developing and testing your JavaTM applets and applications intended to run on a
+compatible Java environment (the "Programs"), provided that the Programs add significant and primary functionality to the JSSE
+Software, and (b) reproduce and distribute the binary form of the JSSE Software through multiple tiers of distribution provided that you:
+(i) distribute the JSSE Software complete and unmodified; (ii) do not distribute additional software intended to supersede any
+component(s) of the JSSE Software; (iii) do not remove or alter any proprietary legends or notices contained in or on the JSSE Software;
+and (iv) only distribute the JSSE Software pursuant to a license agreement that protects Sun's interests consistent with the terms
+contained in this Agreement, and provides that Sun is a third party beneficiary to such license agreement. If you distribute the JSSE
+Software pursuant to this paragraph, you must include the following statement as part of product documentation (whether hard copy or
+electronic), as a part of a copyright page or proprietary rights notice page, in an "About" box or in any other form reasonably designed to
+make the statement visible to users of the JSSE Software: "This product includes code licensed from RSA Data Security".
+2. Requirements. In exchange for the licenses granted in Paragraph II.1 above, you agree: a. not to create, or authorize your licensees to
+create, additional classes, interfaces or subpackages that are contained in the "java," "javax" or "sun" packages, or similarly named
+package, as specified by Sun in any naming convention; b. that, in the event that you create an API(s) which: (i) extends the
+functionality of a Java platform; and (ii) is distributed to third party software developers for the purpose of developing software which
+invokes such additional API, you must promptly and broadly publish an accurate specification for such API for free use by all
+developers; and c. to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts
+and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or
+results from the use or distribution of any and all Programs and/or JSSE Software.
+3. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the Java trademark and all Java-related
+trademarks, service marks, logos and other brand designations including the Coffee Cup logo and Duke logo ("Java Marks"), and you
+agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks.
+Any use you make of the Java Marks inures to Sun's benefit.
+4. Source Code. JSSE Software may contain source code that is provided solely for reference purposes pursuant to the terms of this
+JSSE Agreement.
 
 III.		JAVAMAIL, VERSION 1.2 SUPPLEMENTAL LICENSE TERMS
-These supplemental license terms ("JavaMail Supplemental Terms") add to or modify the terms of the Sun Agreement solely for the 
-JavaMail software (collectively, the " JavaMail Agreement"). Capitalized terms not defined in these JavaMail Supplemental Terms shall 
-have the same meanings ascribed to them in the Sun Agreement. These JavaMail Supplemental Terms shall supersede any inconsistent 
-or conflicting terms in the Agreement, or in any license contained within the JavaMail Software. 
-1. JavaMail Software Internal Use and Development License Grant. Subject to the terms and conditions of this JavaMail 
-Agreement, including, but not limited to Section 3 (JavaTM Technology Restrictions) of these JavaMail Supplemental Terms, Sun grants 
-you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the JavaMail 
-Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications 
-("Programs"). 
-2. License to Distribute JavaMail Software. Subject to the terms and conditions of this Agreement, including, but not limited to 
-Section 3 (Java TM Technology Restrictions) of these JavaMail Supplemental Terms, Sun grants you a non-exclusive, non-transferable, 
-limited license to reproduce and distribute the JavaMail Software in binary code form only, provided that (i) you distribute the JavaMail 
-Software complete and unmodified and only bundled as part of, and for the sole purpose of running, your Java applets or applications 
-("Programs"), (ii) the Programs add significant and primary functionality to the JavaMail Software, (iii) you do not distribute additional 
-software intended to replace any component(s) of the JavaMail Software, (iv) you do not remove or alter any proprietary legends or 
-notices contained in the JavaMail Software, (v) you only distribute the JavaMail Software subject to a license agreement that protects 
-Sun's interests consistent with the terms contained in this JavaMail Agreement, and (vi) you agree to defend and indemnify Sun and its 
-licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in 
-connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs 
-and/or JavaMail Software. 
-3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the 
-"java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the 
-addition to or modification of the classes in the JPI. In the event that you create an additional class and associated API(s) which (i) 
-extends the functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing 
-additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for 
-free use by all developers. You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that 
-are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. 
-4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, 
-FORTE, STAROFFICE, STARPORTAL and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE, 
-STARPORTAL and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to 
-comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use 
-you make of the Sun Marks inures to Sun's benefit. 
-5. Source Code. JavaMail Software may contain source code that is provided solely for reference purposes pursuant to the terms of this 
-JavaMail Agreement. Source code may not be redistributed unless expressly provided for in this JavaMail Agreement. 
-6. Termination for Infringement. Either party may terminate this JavaMail Agreement immediately should any JavaMail Software 
-become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 
+These supplemental license terms ("JavaMail Supplemental Terms") add to or modify the terms of the Sun Agreement solely for the
+JavaMail software (collectively, the " JavaMail Agreement"). Capitalized terms not defined in these JavaMail Supplemental Terms shall
+have the same meanings ascribed to them in the Sun Agreement. These JavaMail Supplemental Terms shall supersede any inconsistent
+or conflicting terms in the Agreement, or in any license contained within the JavaMail Software.
+1. JavaMail Software Internal Use and Development License Grant. Subject to the terms and conditions of this JavaMail
+Agreement, including, but not limited to Section 3 (JavaTM Technology Restrictions) of these JavaMail Supplemental Terms, Sun grants
+you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the JavaMail
+Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications
+("Programs").
+2. License to Distribute JavaMail Software. Subject to the terms and conditions of this Agreement, including, but not limited to
+Section 3 (Java TM Technology Restrictions) of these JavaMail Supplemental Terms, Sun grants you a non-exclusive, non-transferable,
+limited license to reproduce and distribute the JavaMail Software in binary code form only, provided that (i) you distribute the JavaMail
+Software complete and unmodified and only bundled as part of, and for the sole purpose of running, your Java applets or applications
+("Programs"), (ii) the Programs add significant and primary functionality to the JavaMail Software, (iii) you do not distribute additional
+software intended to replace any component(s) of the JavaMail Software, (iv) you do not remove or alter any proprietary legends or
+notices contained in the JavaMail Software, (v) you only distribute the JavaMail Software subject to a license agreement that protects
+Sun's interests consistent with the terms contained in this JavaMail Agreement, and (vi) you agree to defend and indemnify Sun and its
+licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in
+connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs
+and/or JavaMail Software.
+3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the
+"java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the
+addition to or modification of the classes in the JPI. In the event that you create an additional class and associated API(s) which (i)
+extends the functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing
+additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for
+free use by all developers. You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that
+are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
+4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI,
+FORTE, STAROFFICE, STARPORTAL and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE,
+STARPORTAL and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to
+comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use
+you make of the Sun Marks inures to Sun's benefit.
+5. Source Code. JavaMail Software may contain source code that is provided solely for reference purposes pursuant to the terms of this
+JavaMail Agreement. Source code may not be redistributed unless expressly provided for in this JavaMail Agreement.
+6. Termination for Infringement. Either party may terminate this JavaMail Agreement immediately should any JavaMail Software
+become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
 For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California 94303
 
- IV.  Binary Code License Agreement for Java ™ API for SML Processing (jaxp) Sun Microsystems, Inc. 
+ IV.  Binary Code License Agreement for Java � API for SML Processing (jaxp) Sun Microsystems, Inc.
 
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software 
-and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer 
-hardware for which the corresponding fee has been paid. 
+1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software
+and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer
+hardware for which the corresponding fee has been paid.
 
-2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by 
-Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other 
-than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, 
-or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction, 
-operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or 
-interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 
+2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by
+Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other
+than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile,
+or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction,
+operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or
+interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
 
-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of 
-the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except 
-for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's 
-option to replace Software media or refund the fee paid for Software. 
+3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of
+the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except
+for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's
+option to replace Software media or refund the fee paid for Software.
 
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE 
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 
+4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
 
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS 
-BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR 
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED 
-TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by 
-you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 
+5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED
+TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by
+you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
 
-6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of 
-Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  
-Upon Termination, you must destroy all copies of Software. 
+6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of
+Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.
+Upon Termination, you must destroy all copies of Software.
 
-7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be 
-subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge 
-that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 
+7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be
+subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge
+that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
 
-8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government 
-prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set 
-forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) 
-and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
+8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government
+prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set
+forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions)
+and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
 
-9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of 
-law rules of any jurisdiction will apply. 
+9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of
+law rules of any jurisdiction will apply.
 
-10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision 
-omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 
+10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision
+omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
 
-11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or 
-contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional 
-terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this 
-Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 
+11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional
+terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this
+Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
 
-V.  Supplemental License Terms for Java ™ API for XML Parsing (jaxp), Version 1.1
+V.  Supplemental License Terms for Java � API for XML Parsing (jaxp), Version 1.1
 
-These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, 
-the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the 
-Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained 
-within the Software. 
+These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively,
+the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the
+Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained
+within the Software.
 
-1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to 
-Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited 
-license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of 
-designing, developing and testing your Java applets and applications ("Programs"). 
+1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to
+Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited
+license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of
+designing, developing and testing your Java applets and applications ("Programs").
 
-2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of 
-these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology 
-Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form, 
-provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute 
-additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices 
-contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the 
-terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, 
-liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any 
-third party that arises or results from the use or distribution of any and all Programs and/or Software. 
+2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of
+these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology
+Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form,
+provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute
+additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices
+contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the
+terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs,
+liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any
+third party that arises or results from the use or distribution of any and all Programs and/or Software.
 
-3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" 
-package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or 
-modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the 
-functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software 
-which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. 
-You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as 
+3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java"
+package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or
+modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the
+functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software
+which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers.
+You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as
 "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
 
-4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, 
-STAROFFICE, STARPORTAL and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL 
-and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun 
-Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks 
-inures to Sun's benefit. 
+4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE,
+STAROFFICE, STARPORTAL and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL
+and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun
+Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks
+inures to Sun's benefit.
 
-5. Source Code. Software may contain source code that is provided for reference purposes pursuant to the terms of this Agreement. Source 
-code may not be redistributed unless expressly provided for in this Agreement. Portions of this download are governed by the Apache Source 
+5. Source Code. Software may contain source code that is provided for reference purposes pursuant to the terms of this Agreement. Source
+code may not be redistributed unless expressly provided for in this Agreement. Portions of this download are governed by the Apache Source
 Code License and are identified in the Readme file. A copy of the Apache License is supplied with the Apache Source Code.
 
-6. Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's 
-opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 
+6. Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's
+opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
 
-For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303 
-(Form last modified 11-03-2000.) 
- 
-VI.  Binary Code License Agreement for Java ™ Authentication and Activation Service (jaas)
+For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303
+(Form last modified 11-03-2000.)
 
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software 
-and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer 
+VI.  Binary Code License Agreement for Java � Authentication and Activation Service (jaas)
+
+1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software
+and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer
 hardware for which the corresponding fee has been paid.
 
-2.  RESTRICTIONS.  Software is confidential and copyrighted.  Title to Software and all associated intellectual property rights is retained by 
-Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other 
-than a single copy of Software for archival purposes. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or 
-reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction, 
-operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or 
+2.  RESTRICTIONS.  Software is confidential and copyrighted.  Title to Software and all associated intellectual property rights is retained by
+Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other
+than a single copy of Software for archival purposes. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or
+reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction,
+operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or
 interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
 
-3.  LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of  
-the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except 
-for the  foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at 
+3.  LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of
+the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except
+for the  foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at
 Sun's option to replace Software media or refund the fee paid for Software.
 
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
+4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
 REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
 DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
 
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS 
-BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR 
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED 
-TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by 
+5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED
+TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by
 you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
 
 6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of
@@ -303,16 +303,16 @@
 Upon Termination, you must destroy all copies of Software.
 
 7.  Export Regulations.  All Software and technical data delivered under this Agreement are subject to US export control laws and may be
-subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge 
+subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge
 that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
 
-8.  U.S.  Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S.  Government or by a U.S.  Government 
+8.  U.S.  Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S.  Government or by a U.S.  Government
 prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set
-forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) ac- quisitions) 
+forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) ac- quisitions)
 and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
 
-9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of 
-law rules of any jurisdiction will apply. 
+9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of
+law rules of any jurisdiction will apply.
 
 10.  Severability.  If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision
 omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
@@ -326,458 +326,458 @@
 Inc.  901 San Antonio Road, Palo Alto, California
 94303
 
-VII.  Supplemental License for Java ™ Authentication and Authorization Service (jaas) 
+VII.  Supplemental License for Java � Authentication and Authorization Service (jaas)
 SUPPLEMENTAL LICENSE TERMS
 
 
-These supplemental license terms ("Supplement") add to or modify the terms of the Binary Code License Agreement (collectively, the  
-"Agreement"). Capitalized terms not defined in this Supplement shall have the same meanings ascribed to them in the Agreement.  These 
+These supplemental license terms ("Supplement") add to or modify the terms of the Binary Code License Agreement (collectively, the
+"Agreement"). Capitalized terms not defined in this Supplement shall have the same meanings ascribed to them in the Agreement.  These
 Supplement terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software.
 
 1.  License to Distribute.  Subject to the terms and conditions of this Agreement, including but not limited to Section 2 (Requirements), Sun
 grants you a non-exclusive, non-transferable, royalty-free, limited license to (a) use the binary form of the Software for the sole purpose
-of designing, developing and testing your JavaTM applets and applications intended to run on a compatible Java environment (the 
-"Programs"), and (b) reproduce and distribute the binary form of the Software provided that you:  (i) distribute the Software complete and 
-unmodified and only bundled as part of the Programs; (ii) do not distribute additional software intended to supersede any component(s) of the 
-Software; (iii) do not remove or alter any proprietary legends or notices contained in or on the Software; and (iv) only distribute the Software 
+of designing, developing and testing your JavaTM applets and applications intended to run on a compatible Java environment (the
+"Programs"), and (b) reproduce and distribute the binary form of the Software provided that you:  (i) distribute the Software complete and
+unmodified and only bundled as part of the Programs; (ii) do not distribute additional software intended to supersede any component(s) of the
+Software; (iii) do not remove or alter any proprietary legends or notices contained in or on the Software; and (iv) only distribute the Software
 pursuant to a license agreement that protects Sun's interests consistent with the terms contained in this Agreement.
- 
+
 2.  Requirements.  In exchange for the licenses granted in Paragraph 1 above, you agree:
 
-a.  not to create, or authorize your licensees to create, additional classes, interfaces or subpackages that are contained in the "java," "javax" or 
+a.  not to create, or authorize your licensees to create, additional classes, interfaces or subpackages that are contained in the "java," "javax" or
 "sun" packages, or similarly named package, as specified by Sun in any naming convention;
 
 b.  that, in the event that you create an API(s) which:  (i) extends the functionality of a Java platform; and (ii) is distributed to third party
-software developers for the purpose of developing software which invokes such additional API, you must promptly and broadly publish an 
+software developers for the purpose of developing software which invokes such additional API, you must promptly and broadly publish an
 accurate specification for such API for free use by all developers; and
 
-c.  to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses 
-(including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or 
+c.  to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses
+(including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or
 distribution of any and all Programs and/or Software.
 
-3.  Trademarks and Logos.  You acknowledge and agree as between you and Sun that Sun owns the Java trademark and all Java-related 
-trademarks, service marks, logos and other brand designations including the Coffee Cup logo and Duke logo ("Java Marks"), and you agree 
+3.  Trademarks and Logos.  You acknowledge and agree as between you and Sun that Sun owns the Java trademark and all Java-related
+trademarks, service marks, logos and other brand designations including the Coffee Cup logo and Duke logo ("Java Marks"), and you agree
 to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks.
 Any use you make of the Java Marks inures to Sun's benefit.
 
 4.  Source Code.  Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.
 
 
-VIII.  Binary Code License Agreement Terms for JavaHelp™ 1.1.2_01 (including jhall) 
+VIII.  Binary Code License Agreement Terms for JavaHelp� 1.1.2_01 (including jhall)
 
 
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software 
-and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer 
-hardware for which the corresponding fee has been paid. 
+1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software
+and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer
+hardware for which the corresponding fee has been paid.
 
-2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by 
-Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other 
-than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, 
-or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction, 
-operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or 
-interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 
+2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by
+Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other
+than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile,
+or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction,
+operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or
+interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
 
-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of 
-the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except 
-for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's 
-option to replace Software media or refund the fee paid for Software. 
+3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of
+the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except
+for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's
+option to replace Software media or refund the fee paid for Software.
 
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE 
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 
+4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
 
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS 
-BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR 
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED 
-TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by 
-you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 
+5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED
+TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by
+you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
 
-6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of 
-Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  
-Upon Termination, you must destroy all copies of Software. 
+6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of
+Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.
+Upon Termination, you must destroy all copies of Software.
 
 
-7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be 
-subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge 
-that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 
+7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be
+subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge
+that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
 
-8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government 
-prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set 
-forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) 
-and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
+8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government
+prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set
+forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions)
+and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
 
-9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of 
-law rules of any jurisdiction will apply. 
+9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of
+law rules of any jurisdiction will apply.
 
-10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision 
-omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 
+10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision
+omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
 
-11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or 
-contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional 
-terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this 
-Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 
+11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional
+terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this
+Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
 
-IX.  Supplemental License Terms for JavaHelp™ 1.1.2_01 (including jhall)
+IX.  Supplemental License Terms for JavaHelp� 1.1.2_01 (including jhall)
 
-These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, 
-the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the 
-Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained 
-within the Software. 
+These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively,
+the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the
+Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained
+within the Software.
 
-1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to 
-Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited 
-license to reproduce internally and use internally the binary form of the Software complete and unmodified for the sole purpose of designing, 
-developing and testing your Java applets and applications intended to run on the Java platform ("Programs"). 
-"). 
+1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to
+Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited
+license to reproduce internally and use internally the binary form of the Software complete and unmodified for the sole purpose of designing,
+developing and testing your Java applets and applications intended to run on the Java platform ("Programs").
+").
 
-2. License to Distribute Redistributables.  In addition to the license granted in Section 1 (Software Internal Use and Development License 
-Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java 
-Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and 
-distribute those files specifically identified as redistributable in the Software "README" file ("Redistributables") provided that: (i) you 
-distribute the Redistributables complete and unmodified (unless otherwise specified in the applicable README file), and only bundled as 
-part of your Programs, (ii) you do not distribute additional software intended to supersede any component(s) of the Redistributables, (iii) you 
-do not remove or alter any proprietary legends or notices contained in or on the Redistributables, (iv) you only distribute the Redistributables 
-pursuant to a license agreement that protects Sun's interests consistent with the terms contained in the Agreement, and (v) you agree to 
-defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including 
-attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of 
-any and all Programs and/or Software. 
+2. License to Distribute Redistributables.  In addition to the license granted in Section 1 (Software Internal Use and Development License
+Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java
+Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and
+distribute those files specifically identified as redistributable in the Software "README" file ("Redistributables") provided that: (i) you
+distribute the Redistributables complete and unmodified (unless otherwise specified in the applicable README file), and only bundled as
+part of your Programs, (ii) you do not distribute additional software intended to supersede any component(s) of the Redistributables, (iii) you
+do not remove or alter any proprietary legends or notices contained in or on the Redistributables, (iv) you only distribute the Redistributables
+pursuant to a license agreement that protects Sun's interests consistent with the terms contained in the Agreement, and (v) you agree to
+defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including
+attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of
+any and all Programs and/or Software.
 
-3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" 
-package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or 
-modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the 
-functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software 
-which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. 
-You may not create, or authorize your licensees to create, additional classes, interfaces, or subpackages that are in any way identified as 
-"java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. 
+3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java"
+package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or
+modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the
+functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software
+which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers.
+You may not create, or authorize your licensees to create, additional classes, interfaces, or subpackages that are in any way identified as
+"java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
 
-4.  Java Runtime Availability.  Refer to the appropriate version of the Java Runtime Environment binary code license (currently located at 
-http://www.java.sun.com/jdk/index.html) for the availability of runtime code which may be distributed with Java applets and applications. 
+4.  Java Runtime Availability.  Refer to the appropriate version of the Java Runtime Environment binary code license (currently located at
+http://www.java.sun.com/jdk/index.html) for the availability of runtime code which may be distributed with Java applets and applications.
 
-5. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, 
-and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other 
-brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at 
-http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit. 
+5. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE,
+and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other
+brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at
+http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit.
 
-6. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.  
-Source code may not be redistributed unless expressly provided for in this Agreement. 
+6. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.
+Source code may not be redistributed unless expressly provided for in this Agreement.
 
-7.  Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's 
-opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 
+7.  Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's
+opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
 
 
 
-For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303 
+For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303
 (LFI#90701/Form ID#011801)
 
-X.	Binary Code License Agreement for JavaBeans ™ Activation Framework 1.0.1 (activation)
- 
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software 
-and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer 
-hardware for which the corresponding fee has been paid. 
+X.	Binary Code License Agreement for JavaBeans � Activation Framework 1.0.1 (activation)
 
-2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by 
-Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other 
-than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, 
-or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction, 
-operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or 
-interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 
+1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software
+and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer
+hardware for which the corresponding fee has been paid.
 
-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of 
-the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except 
-for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's 
-option to replace Software media or refund the fee paid for Software. 
+2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by
+Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other
+than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile,
+or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction,
+operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or
+interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
 
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE 
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 
+3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of
+the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except
+for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's
+option to replace Software media or refund the fee paid for Software.
 
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS 
-BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR 
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED 
-TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by 
-you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 
+4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
 
-6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of 
-Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  
-Upon Termination, you must destroy all copies of Software. 
+5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED
+TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by
+you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
 
-7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be 
-subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge 
-that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 
+6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of
+Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.
+Upon Termination, you must destroy all copies of Software.
 
-8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government 
-prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set 
-forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) 
-and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
+7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be
+subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge
+that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
 
-9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of 
-law rules of any jurisdiction will apply. 
+8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government
+prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set
+forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions)
+and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
 
-10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision 
-omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 
+9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of
+law rules of any jurisdiction will apply.
 
-11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or 
-contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional 
-terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this 
-Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 
+10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision
+omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
 
-XI.  Supplemental License Terms for JavaBeans ™ Activation Framework, Version 1.0.1 (activation) 
+11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional
+terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this
+Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
 
-These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, 
-the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the 
-Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained 
-within the Software. 
+XI.  Supplemental License Terms for JavaBeans � Activation Framework, Version 1.0.1 (activation)
 
-1. Software Internal Use and Development License Grant.  Subject to the terms and conditions of this Agreement, including, but not limited 
-to Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited 
-license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of 
-designing, developing and testing your Java applets and applications ("Programs"). 
+These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively,
+the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the
+Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained
+within the Software.
 
-2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of 
-these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to, Section 3 (Java Technology 
-Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the 
-Software in binary code form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your 
-Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any 
-proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's 
-interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against 
-any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit 
-or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software. 
+1. Software Internal Use and Development License Grant.  Subject to the terms and conditions of this Agreement, including, but not limited
+to Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited
+license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of
+designing, developing and testing your Java applets and applications ("Programs").
 
-3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" 
-package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or 
-modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the 
-functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software 
-which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers.  
-You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as 
-"java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. 
+2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of
+these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to, Section 3 (Java Technology
+Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the
+Software in binary code form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your
+Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any
+proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's
+interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against
+any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit
+or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software.
 
-4. No Support. Sun is under no obligation to support the Software or to provide you with updates or error corrections. You acknowledge that 
+3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java"
+package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or
+modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the
+functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software
+which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers.
+You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as
+"java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
+
+4. No Support. Sun is under no obligation to support the Software or to provide you with updates or error corrections. You acknowledge that
 the Software may have defects or deficiencies which cannot or will not be corrected by Sun.
 
-5. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, 
-and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other 
-brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at 
-http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit. 
+5. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE,
+and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other
+brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at
+http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit.
 
-6. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.  
-Source code may not be redistributed unless expressly provided for in this Agreement. 
+6. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.
+Source code may not be redistributed unless expressly provided for in this Agreement.
 
-7. Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's 
+7. Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's
 opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
 
-For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303 
+For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303
 (LFI#90622/Form ID#011801)
- 
-XII.  Binary Code License Agreement for Java ™ Cryptography Extension (jce)
-    
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and  non-transferable license for the internal use only of the 
-accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by 
+
+XII.  Binary Code License Agreement for Java � Cryptography Extension (jce)
+
+1.  LICENSE TO USE.  Sun grants you a non-exclusive and  non-transferable license for the internal use only of the
+accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by
 the number of users and the class of computer hardware for which the corresponding fee has been paid.
 
-2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by 
-Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other 
-than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, 
-or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction, 
-operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or 
-interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 
+2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by
+Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other
+than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile,
+or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction,
+operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or
+interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
 
-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of 
-the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except 
-for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's 
+3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of
+the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except
+for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's
 option to replace Software media or refund the fee paid for Software.
 
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE 
+4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
 DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
 
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS 
-BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR 
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED 
-TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by 
-you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.  
+5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED
+TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by
+you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
 
-6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of 
-Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  
+6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of
+Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.
 Upon Termination, you must destroy all copies of Software.
 
-7.  Export Regulations.  All Software and technical data delivered under this Agreement are subject to US export control laws and may be 
-subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge 
+7.  Export Regulations.  All Software and technical data delivered under this Agreement are subject to US export control laws and may be
+subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge
 that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
 
-8.  U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government 
-prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set 
-forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) 
+8.  U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government
+prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set
+forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions)
 and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
 
-9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of 
+9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of
 law rules of any jurisdiction will apply.
 
-10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision 
-omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.  
+10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision
+omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
 
-11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or 
-contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional 
-terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this 
-Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.  
+11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional
+terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this
+Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
 
-For inquiries please contact: Sun Microsystems, Inc.  901 
+For inquiries please contact: Sun Microsystems, Inc.  901
 San Antonio Road, Palo Alto, California 94303
 
-XII.  Supplemental License Terms for Java(TM) Development Optional Packages Java (TM) Cryptography Extension, Version 1.2.1 
+XII.  Supplemental License Terms for Java(TM) Development Optional Packages Java (TM) Cryptography Extension, Version 1.2.1
 (jce)
 
 SUPPLEMENTAL LICENSE TERMS
 
-These supplemental license terms ("Supplement") add to or modify the terms of the Binary Code License Agreement (collectively, the 
-"Agreement"). Capitalized terms not defined in this Supplement shall have the same meanings ascribed to them in the Agreement. These 
+These supplemental license terms ("Supplement") add to or modify the terms of the Binary Code License Agreement (collectively, the
+"Agreement"). Capitalized terms not defined in this Supplement shall have the same meanings ascribed to them in the Agreement. These
 Supplement terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software.
 
-1. License to Distribute. Sun grants to you a non-exclusive, non-transferable, royalty-free, limited license to (a) use the binary form of the 
-Software for the sole purpose of designing, developing and testing your Java(TM) applets and applications intended to run on a compatible 
-Java environment (the "Programs"), provided that the Programs add significant and primary functionality to the Software, and (b) reproduce 
-and distribute the binary form of the Software provided that you: (i) distribute the Software complete and unmodified; (ii) do not distribute 
-additional software intended to supersede any component(s) of the Software; (iii) do not remove or alter any proprietary legends or notices 
-contained in or on the Software; and (iv) only distribute the Software pursuant to a license agreement that protects Sun's interests 
-consistent with the terms contained in this Agreement, and provides that Sun is a third party beneficiary to such license agreement. 
+1. License to Distribute. Sun grants to you a non-exclusive, non-transferable, royalty-free, limited license to (a) use the binary form of the
+Software for the sole purpose of designing, developing and testing your Java(TM) applets and applications intended to run on a compatible
+Java environment (the "Programs"), provided that the Programs add significant and primary functionality to the Software, and (b) reproduce
+and distribute the binary form of the Software provided that you: (i) distribute the Software complete and unmodified; (ii) do not distribute
+additional software intended to supersede any component(s) of the Software; (iii) do not remove or alter any proprietary legends or notices
+contained in or on the Software; and (iv) only distribute the Software pursuant to a license agreement that protects Sun's interests
+consistent with the terms contained in this Agreement, and provides that Sun is a third party beneficiary to such license agreement.
 
 2. Requirements. In exchange for the licenses granted in Paragraph 1 above, you agree:
 
-a. not to create, or authorize your licensees to create, additional classes, interfaces or subpackages that are contained in the "java," "javax" or 
+a. not to create, or authorize your licensees to create, additional classes, interfaces or subpackages that are contained in the "java," "javax" or
 "sun" packages, or similarly named package, as specified by Sun in any naming convention;
 
-b. that, in the event that you create an API(s) which: (i) extends the functionality of a Java platform; and (ii) is distributed to third party 
-software developers for the purpose of developing software which invokes such additional API, you must promptly and broadly publish an 
+b. that, in the event that you create an API(s) which: (i) extends the functionality of a Java platform; and (ii) is distributed to third party
+software developers for the purpose of developing software which invokes such additional API, you must promptly and broadly publish an
 accurate specification for such API for free use by all developers; and
 
-c. to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses 
-(including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or 
-distribution of any and all Programs and/or Software. 
+c. to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses
+(including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or
+distribution of any and all Programs and/or Software.
 
-3. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the Java trademark and all Java-related 
-trademarks, service marks, logos and other brand designations including the Coffee Cup logo and Duke logo ("Java Marks"), and you agree 
-to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you 
+3. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the Java trademark and all Java-related
+trademarks, service marks, logos and other brand designations including the Coffee Cup logo and Duke logo ("Java Marks"), and you agree
+to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you
 make of the Java Marks inures to Sun's benefit.
 
 4. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.
 
 XIV.  Binary Code License Agreement for Java(TM) Servlet API Class Files 2.2b (servlet)
-   
 
-1. LICENSE TO USE. Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software 
-and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer 
-hardware for which the corresponding fee has been paid. 
 
+1. LICENSE TO USE. Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software
+and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer
+hardware for which the corresponding fee has been paid.
 
-  
-2. RESTRICTIONS Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by 
-Sun and/or its licensors. Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other 
-than a single copy of Software for archival purposes. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or 
-reverse engineer Software. You acknowledge that Software is not designed, licensed or intended for use in the design, construction, operation 
-or maintenance of any nuclear facility. Sun disclaims any express or implied warranty of fitness for such uses. No right, title or interest in or 
-to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 
-  
 
-  
-3. LIMITED WARRANTY. Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of 
-the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use. Except 
-for the foregoing, Software is provided "AS IS". Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's 
-option to replace Software media or refund the fee paid for Software. 
-  
 
-  
-4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE 
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 
-  
+2. RESTRICTIONS Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by
+Sun and/or its licensors. Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other
+than a single copy of Software for archival purposes. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or
+reverse engineer Software. You acknowledge that Software is not designed, licensed or intended for use in the design, construction, operation
+or maintenance of any nuclear facility. Sun disclaims any express or implied warranty of fitness for such uses. No right, title or interest in or
+to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
 
-  
-5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS 
-BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR 
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED 
-TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES. In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by 
-you for Software under this Agreement. The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 
-  
 
-  
-6. Termination. This Agreement is effective until terminated. You may terminate this Agreement at any time by destroying all copies of 
-Software. This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement. 
-Upon Termination, you must destroy all copies of Software. 
-  
 
-  
-7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be 
-subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations and acknowledge 
-that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 
-  
+3. LIMITED WARRANTY. Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of
+the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use. Except
+for the foregoing, Software is provided "AS IS". Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's
+option to replace Software media or refund the fee paid for Software.
 
-  
-8. U.S. Government Restricted Rights. If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime 
-contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth 
-in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and 
-with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
-  
 
-  
-9. Governing Law. Any action related to this Agreement will be governed by California law and controlling U.S. federal law. No choice of 
-law rules of any jurisdiction will apply. 
-  
 
-  
-10. Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision 
-omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 
-  
+4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
 
-  
-11. Integration. This Agreement is the entire agreement between you and Sun relating to its subject matter. It supersedes all prior or 
-contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional 
-terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this 
-Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 
-  
 
-  
-For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California 94303 
 
+5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED
+TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES. In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by
+you for Software under this Agreement. The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
+
+
+
+6. Termination. This Agreement is effective until terminated. You may terminate this Agreement at any time by destroying all copies of
+Software. This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.
+Upon Termination, you must destroy all copies of Software.
+
+
+
+7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be
+subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations and acknowledge
+that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
+
+
+
+8. U.S. Government Restricted Rights. If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime
+contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth
+in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and
+with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
+
+
+
+9. Governing Law. Any action related to this Agreement will be governed by California law and controlling U.S. federal law. No choice of
+law rules of any jurisdiction will apply.
+
+
+
+10. Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision
+omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
+
+
+
+11. Integration. This Agreement is the entire agreement between you and Sun relating to its subject matter. It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional
+terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this
+Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
+
+
+
+For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California 94303
+
 XV.  Supplemental License Terms for Java(TM) Servlet API Class Files 2.2b (servlet)
-These supplemental license terms ("Supplement") add to or modify the terms of the Binary Code License Agreement (collectively, the 
-"Agreement"). Capitalized terms not defined in this Supplement shall have the same meanings ascribed to them in the Agreement. These 
-Supplement terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software. 
-  
+These supplemental license terms ("Supplement") add to or modify the terms of the Binary Code License Agreement (collectively, the
+"Agreement"). Capitalized terms not defined in this Supplement shall have the same meanings ascribed to them in the Agreement. These
+Supplement terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software.
 
-  
-1. License to Develop. Subject to the terms and conditions of this Agreement, including but not limited to the terms and conditions contained 
-in this Supplement, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and use internally the binary form of the 
-Software for the purpose of designing, developing and testing your JavaTM applets and applications intended to run on a compatible Java 
-platform (the "Program(s)"). 
-  
 
-  
-2. License to Distribute. Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the binary code form of 
-the Software to third party end users, through multiple tiers of distribution, provided that you: (i) distribute the Software complete and 
-unmodified in its original Java Archive file, and only bundled as a part of your Program that incorporates the Software; (ii) do not distribute 
-additional software intended to replace any component(s) of the Software; (iii) do not remove or alter any proprietary legends or notices 
-contained in or on the Software; (iv) only distribute the Program pursuant to a license agreement that protects Sun's interest consistent with 
-the terms contained in the Agreement and provided that Sun is a third party beneficiary to such license agreement; (v) do not create, or 
-authorize your licensees to create, additional classes, interfaces, or subpackages that are contained in the "java", "javax" or "sun" packages or 
-similar packages as specified by Sun in any naming convention; and (vi) agree to defend and indemnify Sun and its licensors from and 
-against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, 
-lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs. 
-  
 
-  
-3. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the Java trademark and all Java-related 
-trademarks, service marks, logos and other brand designations including the Coffee Cup logo and Duke logo ("Java Marks"), and you agree 
-to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you 
-make of the Java Marks inures to Sun's benefit. 
+1. License to Develop. Subject to the terms and conditions of this Agreement, including but not limited to the terms and conditions contained
+in this Supplement, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and use internally the binary form of the
+Software for the purpose of designing, developing and testing your JavaTM applets and applications intended to run on a compatible Java
+platform (the "Program(s)").
 
- 
+
+
+2. License to Distribute. Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the binary code form of
+the Software to third party end users, through multiple tiers of distribution, provided that you: (i) distribute the Software complete and
+unmodified in its original Java Archive file, and only bundled as a part of your Program that incorporates the Software; (ii) do not distribute
+additional software intended to replace any component(s) of the Software; (iii) do not remove or alter any proprietary legends or notices
+contained in or on the Software; (iv) only distribute the Program pursuant to a license agreement that protects Sun's interest consistent with
+the terms contained in the Agreement and provided that Sun is a third party beneficiary to such license agreement; (v) do not create, or
+authorize your licensees to create, additional classes, interfaces, or subpackages that are contained in the "java", "javax" or "sun" packages or
+similar packages as specified by Sun in any naming convention; and (vi) agree to defend and indemnify Sun and its licensors from and
+against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim,
+lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs.
+
+
+
+3. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the Java trademark and all Java-related
+trademarks, service marks, logos and other brand designations including the Coffee Cup logo and Duke logo ("Java Marks"), and you agree
+to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you
+make of the Java Marks inures to Sun's benefit.
+
+
 XVI.  Sun Community Source License for JMX Instrumentation Reference Implementation 1.0 (jmxri)
 SUN COMMUNITY SOURCE LICENSE
 
@@ -785,10 +785,10 @@
 
 "Community Code" means Reference Code, Contributed Code, and any combination thereof.
 
-"Community Member" means You, Original Contributor and any other party that has entered into and has in effect a version of this License 
+"Community Member" means You, Original Contributor and any other party that has entered into and has in effect a version of this License
 "(or who is similarly authorized and obligated by Sun)" for the Technology with Original Contributor.
 
-"Contributed Code" means Error Corrections, Shared Modifications and any other code other than Reference Code made available to all 
+"Contributed Code" means Error Corrections, Shared Modifications and any other code other than Reference Code made available to all
 Community Members in accordance with this License.
 
 "Contributed Code Specifications" means the functional, interface and operational specifications and documentation for Contributed Code.
@@ -797,265 +797,265 @@
 
 "Covered Code" means any and all code (including Modifications) implementing all or any portion of the Technology Specifications.
 
-"Error Correction(s)" mean Modifications which correct any failure of Community Code to conform to any aspect of the Technology 
+"Error Correction(s)" mean Modifications which correct any failure of Community Code to conform to any aspect of the Technology
 Specifications.
 
-"Interfaces" means classes or other programming code or specifications designed for use with the Technology comprising a means or link for 
+"Interfaces" means classes or other programming code or specifications designed for use with the Technology comprising a means or link for
 invoking functionality, operations or protocols and which are additional to or extend the interfaces designated in the Technology
 Specifications.
 
-"Modifications" means any (i) change or addition to Covered Code, or (ii) new source or object code implementing any portion of the 
-Technology Specifications, but (iii) excluding any incorporated Reference Code. 
+"Modifications" means any (i) change or addition to Covered Code, or (ii) new source or object code implementing any portion of the
+Technology Specifications, but (iii) excluding any incorporated Reference Code.
 
 "Original Contributor" means Sun Microsystems, Inc., its affiliates, successors and assigns.
 
 "Reference Code" means source code for the Technology designated by Original Contributor at the Technology Site from time to time.
 
-"Research Use" means research, evaluation, development, educational or personal and individual use, excluding use or distribution for direct 
+"Research Use" means research, evaluation, development, educational or personal and individual use, excluding use or distribution for direct
 or indirect commercial (including strategic) gain or advantage.
 
 "Shared Modifications" means those Modifications which Community Members elect to share with other Community Members.
 
-"Technology Specifications" means the functional, interface and operational specifications and documentation for the Technology designated 
-by Original Contributor at the Technology Site from time to time. 
+"Technology Specifications" means the functional, interface and operational specifications and documentation for the Technology designated
+by Original Contributor at the Technology Site from time to time.
 
-"Technology" means the technology described in and contemplated by the Technology Specifications and which You have received pursuant 
+"Technology" means the technology described in and contemplated by the Technology Specifications and which You have received pursuant
 to this License.
 
 "Technology Site" means the website designated by Original Contributor for accessing Community Code and Technology Specifications.
 
-"You" means the individual executing this license or the legal entity or entities represented by the individual executing this license.  "Your" is 
-the possessive of "You." 
+"You" means the individual executing this license or the legal entity or entities represented by the individual executing this license.  "Your" is
+the possessive of "You."
 
 II.  PURPOSE.
 
-Original Contributor is licensing the Reference Code and Technology Specifications and is permitting implementation of Technology under 
-and subject to this Sun Community Source License (the "License") to promote research, education, innovation and product development 
+Original Contributor is licensing the Reference Code and Technology Specifications and is permitting implementation of Technology under
+and subject to this Sun Community Source License (the "License") to promote research, education, innovation and product development
 using the Technology.
 
-COMMERCIAL USE AND DISTRIBUTION OF TECHNOLOGY IS PERMITTEDONLY UNDER OPTIONAL SUPPLEMENTS TO 
+COMMERCIAL USE AND DISTRIBUTION OF TECHNOLOGY IS PERMITTEDONLY UNDER OPTIONAL SUPPLEMENTS TO
 THIS LICENSE.
 
 III.  RESEARCH USE RIGHTS.
 
-A.  From Original Contributor.  Subject to and conditioned upon Your full compliance with the terms and conditions of this License, 
+A.  From Original Contributor.  Subject to and conditioned upon Your full compliance with the terms and conditions of this License,
 including Sections IV (Restrictions and Community Responsibilities) and V.E.7 (International Use), Original Contributor:
 
-1.  grants to You a non-exclusive, worldwide and royalty-free license to the extent of Original Contributor's copyrights and trade secret rights 
+1.  grants to You a non-exclusive, worldwide and royalty-free license to the extent of Original Contributor's copyrights and trade secret rights
 in and covering the Reference Code and Technology Specifications to do the following for Your Research Use only:  a) Reproduce, prepare
-derivative works of, display and perform the Reference Code, in whole or in part, alone or as part of Covered Code; b) Reproduce, prepare 
-derivative works of and display the Technology Specifications; c) Distribute source or object code copies of Reference Code, in whole or in 
+derivative works of, display and perform the Reference Code, in whole or in part, alone or as part of Covered Code; b) Reproduce, prepare
+derivative works of and display the Technology Specifications; c) Distribute source or object code copies of Reference Code, in whole or in
 part, alone or as part Covered Code, to other Community Members or to students; and d) Distribute object code copies of Reference
 Code, in whole or in part, alone or as part of Covered Code to third parties.
 
-2.  will not, during the term of Your License, bring against You any claim alleging that Your using, making, having made, importing or 
-distributing Community Code for Your Research Use, insofar as permitted under Section III.A.1 of this License, necessarily infringes any 
+2.  will not, during the term of Your License, bring against You any claim alleging that Your using, making, having made, importing or
+distributing Community Code for Your Research Use, insofar as permitted under Section III.A.1 of this License, necessarily infringes any
 patent now owned or hereafter acquired by Original Contributor whose claims cover subject matter contained in or embodied by the
-Reference Code or which would necessarily be infringed by the use or distribution of any and all implementations of the Technology 
+Reference Code or which would necessarily be infringed by the use or distribution of any and all implementations of the Technology
 Specifications.
 
-3.  grants to You a non-exclusive, worldwide and royalty-free license, to the extent of its intellectual property rights therein, to use (a) 
+3.  grants to You a non-exclusive, worldwide and royalty-free license, to the extent of its intellectual property rights therein, to use (a)
 Original Contributor's class, interface and package names only insofar as necessary to accurately reference or invoke Your Modifications for
-Research Use, and (b) any associated software tools, documents and information provided by Original Contributor at the Technology Site for 
+Research Use, and (b) any associated software tools, documents and information provided by Original Contributor at the Technology Site for
 use in exercising the above license rights.
 
-B.  Contributed Code.  Subject to and conditioned upon compliance with the terms and conditions of this License, including Sections IV 
+B.  Contributed Code.  Subject to and conditioned upon compliance with the terms and conditions of this License, including Sections IV
 (Restrictions and Community Responsibilities) and V.E.7 (International Use), each Contributor:
 
-1.  grants to each Community Member a non-exclusive, worldwide and royalty-free license to the extent of such Contributor's copyrights 
-[and trade secret rights?]  in and covering its Contributed Code, to reproduce, modify, display and distribute Contributed Code, in whole or in 
-part, in source code and object code form, to the same extent as permitted under such Community Member's License with Original 
+1.  grants to each Community Member a non-exclusive, worldwide and royalty-free license to the extent of such Contributor's copyrights
+[and trade secret rights?]  in and covering its Contributed Code, to reproduce, modify, display and distribute Contributed Code, in whole or in
+part, in source code and object code form, to the same extent as permitted under such Community Member's License with Original
 Contributor (including all supplements thereto).
 
-2.  will not, during the term of the Community Member's  License, bring against any Community Member any claim alleging that using, 
-making, having made, importing or distributing Contributed Code as permitted under this License (including any supplements) infringes any 
-patents or patent applications now owned or hereafter acquired by such Contributor which patents or patent applications are infringed by 
-using, making, having made, selling, offering for sale, importing or otherwise transferring the Contributed Code ("Contributor Patents").  
+2.  will not, during the term of the Community Member's  License, bring against any Community Member any claim alleging that using,
+making, having made, importing or distributing Contributed Code as permitted under this License (including any supplements) infringes any
+patents or patent applications now owned or hereafter acquired by such Contributor which patents or patent applications are infringed by
+using, making, having made, selling, offering for sale, importing or otherwise transferring the Contributed Code ("Contributor Patents").
 This covenant shall apply to the combination of the Contributed Code with other Covered Code if, at the time the Contributed Code is
-posted by Contributor, such addition of the Contributed Code causes such combination to be covered by the Contributor Patents.  The 
-covenant shall not apply to any other combinations which include the Contributed Code or to the use or distribution of modified Contributed 
+posted by Contributor, such addition of the Contributed Code causes such combination to be covered by the Contributor Patents.  The
+covenant shall not apply to any other combinations which include the Contributed Code or to the use or distribution of modified Contributed
 Code where the modifications made by the Community Member add to the functions performed by the Contributed Code in question and
 where, in the absence of such modifications, there would be no infringement of a Contributor Patent.
 
-3.  grants to Original Contributor, in addition to the rights set forth in Sections III.B.1 and III.B.2, the right to sublicense all such rights in 
-Contributed Code, in whole or in part, as part of Reference Code or other technologies based in whole or in part on Reference Code or 
+3.  grants to Original Contributor, in addition to the rights set forth in Sections III.B.1 and III.B.2, the right to sublicense all such rights in
+Contributed Code, in whole or in part, as part of Reference Code or other technologies based in whole or in part on Reference Code or
 Technology and to copy, distribute, modify and prepare derivative works of Contributed Code Specifications, in whole or in part, in
 connection with the exercise of such rights.
 
-C.  Subcontracting.  You may provide Covered Code to a contractor for the sole purpose of providing development services exclusively to 
-You consistent with Your rights under this License.  Such Contractor must be a Community Member or have executed an agreement with 
-You that is consistent with Your rights and obligations under this License and that assigns exclusive rights in work product to You.  You 
+C.  Subcontracting.  You may provide Covered Code to a contractor for the sole purpose of providing development services exclusively to
+You consistent with Your rights under this License.  Such Contractor must be a Community Member or have executed an agreement with
+You that is consistent with Your rights and obligations under this License and that assigns exclusive rights in work product to You.  You
 agree that such work product is to be treated as Covered Code.
 
-D.  No Implied Licenses.  Neither party is granted any right or license other than the licenses and covenants expressly set out herein.  Other 
-than the licenses and covenants expressly set out herein, Original Contributor retains all right, title and interest in Reference Code and 
-Technology Specifications and You retain all right, title and interest in Your Modifications and associated specifications.  Except as 
-expressly permitted herein, You may not otherwise use any package, class or interface naming conventions that appear to originate from 
-Original Contributor. 
+D.  No Implied Licenses.  Neither party is granted any right or license other than the licenses and covenants expressly set out herein.  Other
+than the licenses and covenants expressly set out herein, Original Contributor retains all right, title and interest in Reference Code and
+Technology Specifications and You retain all right, title and interest in Your Modifications and associated specifications.  Except as
+expressly permitted herein, You may not otherwise use any package, class or interface naming conventions that appear to originate from
+Original Contributor.
 
 IV.  RESTRICTIONS AND COMMUNITY RESPONSIBILITIES.
 
-As a condition to Your license and other rights and immunities, You must comply with the restrictions and responsibilities set forth below, as  
+As a condition to Your license and other rights and immunities, You must comply with the restrictions and responsibilities set forth below, as
 modified or supplemented, if at all, in Attachment B, Additional Research Use Terms and Conditions.
- 
-A.  Source Code Availability.  You must provide source code and any specifications for Your Error Corrections to Original Contributor as 
-soon as practicable.  You may provide other Contributed Code to Original Contributor at any time, in Your discretion.  Original Contributor 
-may, in its discretion, post Your Contributed Code and Contributed Code Specifications on the Technology Site.  You may post Your 
-Contributed Code and/or Contributed Code Specifications on another website of Your choice; provided, source code of Community Code and 
-Technology Specifications may be provided to Community Members only and only following certification of Community Member status as 
+
+A.  Source Code Availability.  You must provide source code and any specifications for Your Error Corrections to Original Contributor as
+soon as practicable.  You may provide other Contributed Code to Original Contributor at any time, in Your discretion.  Original Contributor
+may, in its discretion, post Your Contributed Code and Contributed Code Specifications on the Technology Site.  You may post Your
+Contributed Code and/or Contributed Code Specifications on another website of Your choice; provided, source code of Community Code and
+Technology Specifications may be provided to Community Members only and only following certification of Community Member status as
 required under Section IV.D.
 
-B.  Notices.  You must reproduce without alteration copyright and other proprietary notices in any Covered Code that You distribute.  The 
-statement Use and Distribution is subject to the Sun Community Source License available at http://sun.com/software/communitysource must 
+B.  Notices.  You must reproduce without alteration copyright and other proprietary notices in any Covered Code that You distribute.  The
+statement Use and Distribution is subject to the Sun Community Source License available at http://sun.com/software/communitysource must
 appear prominently in Your Modifications and, in all cases, in the same file as all Your copyright and other proprietary notices.
 
-C.  Modifications.  You must include a diff file with Your Contributed Code that identifies and details the changes or additions You made, 
-the version of Reference Code or Contributed Code You used and the date of such changes or additions.  In addition, You must provide any 
+C.  Modifications.  You must include a diff file with Your Contributed Code that identifies and details the changes or additions You made,
+the version of Reference Code or Contributed Code You used and the date of such changes or additions.  In addition, You must provide any
 Contributed Code Specifications for Your Contributed Code.  Your Modifications are Covered Code and You expressly agree that
 use and distribution, in whole or in part, of Your Modifications shall only be done in accordance with and subject to this License.
 
-D.  Distribution Requirements.  You may distribute object code of Covered Code to third parties for Research Use only pursuant to a license 
-of Your choice which is consistent with this License.  You may distribute source code of Covered Code and the Technology Specifications 
+D.  Distribution Requirements.  You may distribute object code of Covered Code to third parties for Research Use only pursuant to a license
+of Your choice which is consistent with this License.  You may distribute source code of Covered Code and the Technology Specifications
 for Research Use only to (i) Community Members from whom You have first obtained a certification of status in the form set forth in
-Attachment A-1, and (ii) students from whom You have first obtained an executed acknowledgment in the form set forth in Attachment A-2.  
-You must keep a copy of each such certificate and acknowledgment You obtain and provide a copy to Original Contributor, if requested.  E.  
+Attachment A-1, and (ii) students from whom You have first obtained an executed acknowledgment in the form set forth in Attachment A-2.
+You must keep a copy of each such certificate and acknowledgment You obtain and provide a copy to Original Contributor, if requested.  E.
 Extensions.
 
-1.  You may create and add Interfaces but, unless expressly permitted at the Technology Site, You may not incorporate any Reference Code 
-in Your Interfaces.  If You choose to disclose or permit disclosure of Your Interfaces to even a single third party for the purposes of enabling 
+1.  You may create and add Interfaces but, unless expressly permitted at the Technology Site, You may not incorporate any Reference Code
+in Your Interfaces.  If You choose to disclose or permit disclosure of Your Interfaces to even a single third party for the purposes of enabling
 such third party to independently develop and distribute (directly or indirectly) technology which invokes such Interfaces, You
-must then make the Interfaces open by (a) promptly following completion thereof, publishing to the industry, on a non-confidential basis and 
-free of all copyright restrictions, a reasonably detailed, current and accurate specification for the Interfaces, and (b) as soon as reasonably 
-possible, but in no event more than thirty (30) days following publication of Your specification, making available on reasonable terms and 
+must then make the Interfaces open by (a) promptly following completion thereof, publishing to the industry, on a non-confidential basis and
+free of all copyright restrictions, a reasonably detailed, current and accurate specification for the Interfaces, and (b) as soon as reasonably
+possible, but in no event more than thirty (30) days following publication of Your specification, making available on reasonable terms and
 without discrimination, a reasonably complete and practicable test suite and methodology adequate to create and test implementations of
 the Interfaces by a reasonably skilled technologist.
 
-2.  You shall not assert any intellectual property rights You may have covering Your Interfaces which would necessarily be infringed by the 
+2.  You shall not assert any intellectual property rights You may have covering Your Interfaces which would necessarily be infringed by the
 creation, use or distribution of all reasonable independent implementations of Your specification of such Interfaces by a Community
-Member or Original Contributor.  Nothing herein is intended  to prevent You from enforcing any of Your intellectual property rights 
-covering Your specific implementation of Your Interfaces or functionality using such Interfaces other than as specifically set forth in this 
+Member or Original Contributor.  Nothing herein is intended  to prevent You from enforcing any of Your intellectual property rights
+covering Your specific implementation of Your Interfaces or functionality using such Interfaces other than as specifically set forth in this
 Section IV.E.2.
 
 V.  GOVERNANCE.
 
 A.  License Versions.
 
-Only Original Contributor may promulgate new versions of this License.  Once You have accepted Reference Code, Technology  
-Specifications, Contributed Code and/or Contributed Code Specifications under a version of this License, You may always continue to use 
+Only Original Contributor may promulgate new versions of this License.  Once You have accepted Reference Code, Technology
+Specifications, Contributed Code and/or Contributed Code Specifications under a version of this License, You may always continue to use
 such version of Reference Code, Technology Specifications, Contributed Code and/or Contributed Code Specifications under that version of
-the License.  New code and specifications which You may subsequently choose to accept will be subject to any new License in effect at the 
+the License.  New code and specifications which You may subsequently choose to accept will be subject to any new License in effect at the
 time of Your acceptance of such code and specifications.
 
 B.  Disclaimer Of Warranties.
 
-1.  COVERED CODE AND ALL TECHNOLOGY SPECIFICATIONS AND CONTRIBUTED CODESPECIFICATIONS ARE 
-PROVIDED AS IS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT 
-LIMITATION, WARRANTIES THAT ANY COVERED CODE OR SPECIFICATIONS ARE FREE OF DEFECTS, MERCHANTABLE, 
-FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING OF THIRD PARTY RIGHTS. YOU AGREE THAT YOU BEAR THE 
-ENTIRE RISK IN CONNECTION WITH YOUR USE AND DISTRIBUTION OF ANY AND ALL COVERED CODE OR 
-TECHNOLOGY SPECIFICATIONS OR CONTRIBUTED CODE SPECIFICATIONS UNDER THIS LICENSE.  NO USE OF ANY 
-COVERED CODE OR TECHNOLOGY SPECIFICATIONS OR CONTRIBUTED CODE SPECIFICATIONS IS AUTHORIZED EXCEPT 
+1.  COVERED CODE AND ALL TECHNOLOGY SPECIFICATIONS AND CONTRIBUTED CODESPECIFICATIONS ARE
+PROVIDED AS IS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT
+LIMITATION, WARRANTIES THAT ANY COVERED CODE OR SPECIFICATIONS ARE FREE OF DEFECTS, MERCHANTABLE,
+FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING OF THIRD PARTY RIGHTS. YOU AGREE THAT YOU BEAR THE
+ENTIRE RISK IN CONNECTION WITH YOUR USE AND DISTRIBUTION OF ANY AND ALL COVERED CODE OR
+TECHNOLOGY SPECIFICATIONS OR CONTRIBUTED CODE SPECIFICATIONS UNDER THIS LICENSE.  NO USE OF ANY
+COVERED CODE OR TECHNOLOGY SPECIFICATIONS OR CONTRIBUTED CODE SPECIFICATIONS IS AUTHORIZED EXCEPT
 SUBJECT TO AND IN CONSIDERATION FOR THIS DISCLAIMER.
 
-2.  You understand that, although each Community Member grants the licenses set forth in the License and this Supplement, no assurances 
+2.  You understand that, although each Community Member grants the licenses set forth in the License and this Supplement, no assurances
 are provided by any Community Member that Covered Code or any specifications do not infringe the intellectual property rights of any third
 party.
 
-3.  You acknowledge that Reference Code and Technology Specifications are neither designed nor intended for use in the design, 
+3.  You acknowledge that Reference Code and Technology Specifications are neither designed nor intended for use in the design,
 construction, operation or maintenance of any nuclear facility.
 
 C.  Limitation Of Liability.
 
 1.  Infringement.  Each Community Member disclaims any liability to all other Community Members for claims brought
-by any third party based on infringement of intellectual property rights.  Original Contributor represents that, to its knowledge, it has 
-sufficient copyrights to allow You to use and distribute the Reference Code as herein permitted (including as permitted in any Supplement 
+by any third party based on infringement of intellectual property rights.  Original Contributor represents that, to its knowledge, it has
+sufficient copyrights to allow You to use and distribute the Reference Code as herein permitted (including as permitted in any Supplement
 hereto) and You represent that, to Your knowledge, You have sufficient copyrights to allow each Community Member and Original
-Contributor to use and distribute Your Shared Modifications and Error Corrections as contemplated herein permitted (including as permitted 
-in any Supplements to the License). You agree to notify Original Contributor should You become aware of any potential or actual 
+Contributor to use and distribute Your Shared Modifications and Error Corrections as contemplated herein permitted (including as permitted
+in any Supplements to the License). You agree to notify Original Contributor should You become aware of any potential or actual
 infringement of the Technology or any of Original Contributors intellectual property rights in the Technology, Reference Code or
 Technology Specifications.
 
-2.  Suspension.  If any portion of, or functionality implemented by, the Reference Code, Technology or Technology Specifications becomes 
-the subject of a claim or threatened claim of infringement ("Affected Materials"), Original Contributor may, in its unrestricted discretion, 
-suspend Your rights to use and distribute the Affected Materials under this License.  Such suspension of rights will be effective immediately 
-upon Original Contributor's posting of notice of suspension on the Technology Site.  Original Contributor has no obligation to lift the 
-suspension of rights relative to the Affected Materials until a final, non-appealable determination is made by a court or governmental agency 
-of competent jurisdiction that Original Contributor is legally able, without the payment of a fee or royalty, to reinstate Your rights to the 
+2.  Suspension.  If any portion of, or functionality implemented by, the Reference Code, Technology or Technology Specifications becomes
+the subject of a claim or threatened claim of infringement ("Affected Materials"), Original Contributor may, in its unrestricted discretion,
+suspend Your rights to use and distribute the Affected Materials under this License.  Such suspension of rights will be effective immediately
+upon Original Contributor's posting of notice of suspension on the Technology Site.  Original Contributor has no obligation to lift the
+suspension of rights relative to the Affected Materials until a final, non-appealable determination is made by a court or governmental agency
+of competent jurisdiction that Original Contributor is legally able, without the payment of a fee or royalty, to reinstate Your rights to the
 Affected Materials to the full extent contemplated hereunder.  Upon such determination, Original Contributor will lift the suspension
-by posting a notice to such effect on the Technology Site. Nothing herein shall be construed to prevent You, at Your option and expense, and 
-subject to applicable law and the restrictions and responsibilities set forth in this License and any Supplements, from replacing Reference 
+by posting a notice to such effect on the Technology Site. Nothing herein shall be construed to prevent You, at Your option and expense, and
+subject to applicable law and the restrictions and responsibilities set forth in this License and any Supplements, from replacing Reference
 Code in Affected Materials with non-infringing code or independently negotiating, without compromising or prejudicing Original
 Contributors position, to obtain the rights necessary to use Affected Materials as herein permitted.
 
-3.  Disclaimer.  ORIGINAL CONTRIBUTOR'S LIABILITY TO YOU FOR ALL CLAIMS RELATING TO THIS LICENSE OR ANY 
-SUPPLEMENT HERETO, WHETHER FOR BREACH OR TORT, IS LIMITED TO THE GREATER OF ONE THOUSAND DOLLARS 
-(US$1000.00) OR THE FULL AMOUNT PAID BY YOU FOR THE MATERIALS GIVING RISE TO THE CLAIM, IF ANY.  IN NO 
-EVENT WILL ORIGINAL CONTRIBUTOR BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR 
-CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR ARISING OUT OF THIS LICENSE (INCLUDING, WITHOUT 
-LIMITATION, LOSS OF PROFITS, USE, DATA OR ECONOMIC ADVANTAGE OF ANY SORT), HOWEVER IT ARISES AND ON 
+3.  Disclaimer.  ORIGINAL CONTRIBUTOR'S LIABILITY TO YOU FOR ALL CLAIMS RELATING TO THIS LICENSE OR ANY
+SUPPLEMENT HERETO, WHETHER FOR BREACH OR TORT, IS LIMITED TO THE GREATER OF ONE THOUSAND DOLLARS
+(US$1000.00) OR THE FULL AMOUNT PAID BY YOU FOR THE MATERIALS GIVING RISE TO THE CLAIM, IF ANY.  IN NO
+EVENT WILL ORIGINAL CONTRIBUTOR BE LIABLE FOR ANY INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR ARISING OUT OF THIS LICENSE (INCLUDING, WITHOUT
+LIMITATION, LOSS OF PROFITS, USE, DATA OR ECONOMIC ADVANTAGE OF ANY SORT), HOWEVER IT ARISES AND ON
 ANY THEORY OF LIABILITY WHETHER OR NOT ORIGINAL CONTRIBUTOR HAS BEEN ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGE AND NOTWITHSTANDING FAILURE OF THE ESSENTIAL PURPOSE OF ANY REMEDY.
 
 D.  Termination.
 
 You may terminate this License at any time by notifying Original Contributor in writing.
- 
-All Your rights will terminate under this License if You fail to comply with any of the material terms or conditions of this License and do not 
+
+All Your rights will terminate under this License if You fail to comply with any of the material terms or conditions of this License and do not
 cure such failure in a reasonable period of time after becoming aware of such noncompliance.
 
-If You institute patent litigation against a Community Member with respect to a patent applicable to Community Code, then any patent 
-licenses or covenants granted by such Community Member to You under this License shall terminate as of the date such litigation is filed.  In 
+If You institute patent litigation against a Community Member with respect to a patent applicable to Community Code, then any patent
+licenses or covenants granted by such Community Member to You under this License shall terminate as of the date such litigation is filed.  In
 addition, if You institute patent litigation against any Community Member or Original Contributor alleging that Reference Code,
 Technology or Technology Specifications infringe Your patent(s), then the rights granted to You under Section III.A above will terminate.
 
-Upon termination, You must discontinue all uses and distribution of Community Code, except that You may continue to use, reproduce, 
-prepare derivative works of, display and perform Your Modifications, so long as the license grants and covenants of this license are not 
+Upon termination, You must discontinue all uses and distribution of Community Code, except that You may continue to use, reproduce,
+prepare derivative works of, display and perform Your Modifications, so long as the license grants and covenants of this license are not
 required to do so, for purposes other than to implement functionality designated in any portion of the Technology Specifications.  Properly
-granted sublicenses to third parties will survive termination.  Provisions which, by their nature, should remain in effect following termination 
+granted sublicenses to third parties will survive termination.  Provisions which, by their nature, should remain in effect following termination
 survive.
 
 E.  Miscellaneous.
 
-1.  Trademark.  You agree to comply with Original Contributors Trademark & Logo Usage Requirements, as modified from time to time, 
+1.  Trademark.  You agree to comply with Original Contributors Trademark & Logo Usage Requirements, as modified from time to time,
 available at the Technology Site.  Except as expressly provided in this License, You are granted no rights in or to any Sun, Jini, Jiro or Java
-trademarks now or hereafter used or licensed by Original Contributor (the Sun Trademarks).  You agree not to (a) challenge Original 
-Contributors ownership or use of Sun Trademarks; (b) attempt to register any Sun Trademarks, or any mark or logo substantially similar 
+trademarks now or hereafter used or licensed by Original Contributor (the Sun Trademarks).  You agree not to (a) challenge Original
+Contributors ownership or use of Sun Trademarks; (b) attempt to register any Sun Trademarks, or any mark or logo substantially similar
 thereto; or (c) incorporate any Sun Trademarks into You own trademarks, product names, service marks, company names or domain names.
- 
-2.  Integration and Assignment.  Original Contributor may assign this Research Use License to another by written notification to the other 
+
+2.  Integration and Assignment.  Original Contributor may assign this Research Use License to another by written notification to the other
 party.  This License represents the complete agreement of the parties concerning the subject matter hereof.
 
-3.  Severability.  If any provision of this License is held unenforceable, such provision shall be reformed to the extent necessary to make it 
+3.  Severability.  If any provision of this License is held unenforceable, such provision shall be reformed to the extent necessary to make it
 enforceable unless to do so would defeat the intent of the parties.
 
-4.  Governing Law.  This License is governed by the laws of the United States and the State of California, as applied to contracts entered into 
-and performed in California between California residents.  The United Nations Convention on Contracts for the International Sale of Goods 
+4.  Governing Law.  This License is governed by the laws of the United States and the State of California, as applied to contracts entered into
+and performed in California between California residents.  The United Nations Convention on Contracts for the International Sale of Goods
 shall not apply.  Nor shall any law or regulation which provides that a contract be construed against the drafter.
 
-5.  Dispute Resolution.  a) Any dispute arising out of or relating to this License shall be finally settled by arbitration as set forth in this 
-Section, except that either party may bring an action in a court of competent jurisdiction (which jurisdiction shall be exclusive), relative to 
+5.  Dispute Resolution.  a) Any dispute arising out of or relating to this License shall be finally settled by arbitration as set forth in this
+Section, except that either party may bring an action in a court of competent jurisdiction (which jurisdiction shall be exclusive), relative to
 any dispute relating to such party's  intellectual property rights.  Arbitration will be administered (i) by the American Arbitration Association
-(AAA), (ii) in accordance with the rules of the United Nations Commission on International Trade Law (UNCITRAL) (the Rules) in effect at 
-the time of arbitration, modified as set forth herein, and (iii) the arbitrator will apply the governing laws required under Section V.E.4 above.  
-Judgment upon the award rendered by the arbitrator may be entered in any court having jurisdiction to enforce such award.  The arbitrator 
+(AAA), (ii) in accordance with the rules of the United Nations Commission on International Trade Law (UNCITRAL) (the Rules) in effect at
+the time of arbitration, modified as set forth herein, and (iii) the arbitrator will apply the governing laws required under Section V.E.4 above.
+Judgment upon the award rendered by the arbitrator may be entered in any court having jurisdiction to enforce such award.  The arbitrator
 may not award damages in excess of or of a different type than those permitted by this License and any such award is void.
 
-b) All proceedings will be in English and conducted by a single arbitrator selected in accordance with the Rules who is fluent in English, 
+b) All proceedings will be in English and conducted by a single arbitrator selected in accordance with the Rules who is fluent in English,
 familiar with technology matters pertinent in the dispute and either a retired judge or practicing attorney having at least ten (10) years
-litigation experience.  Venue for arbitration will be in San Francisco, California, unless the parties agree otherwise. Each party will be 
-required to produce documents relied upon in the arbitration and to respond to no more than twenty-five single question interrogatories.  All 
+litigation experience.  Venue for arbitration will be in San Francisco, California, unless the parties agree otherwise. Each party will be
+required to produce documents relied upon in the arbitration and to respond to no more than twenty-five single question interrogatories.  All
 awards are payable in US dollars and may include for the prevailing party (i) pre-judgment interest, (ii) reasonable attorneys
 fees incurred in connection with the arbitration, and (iii) reasonable costs and expenses incurred in enforcing the award.
 
-6.  U.S.  Government.  If this Software is being acquired by or on behalf of the U.S.  Government or by a U.S. Government prime contractor 
+6.  U.S.  Government.  If this Software is being acquired by or on behalf of the U.S.  Government or by a U.S. Government prime contractor
 or subcontractor (at any tier), then the Government's rights in this Software and accompanying documentation shall be only as set forth in
-this license; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense acquisitions) and with 48 CFR 
+this license; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense acquisitions) and with 48 CFR
 2.101 and 12.212 (for non-DoD acquisitions).
 
-7.  International Use.  (a) Covered Code is subject to US export control laws and may be subject to export or import regulations in other 
-countries.  Each party shall comply fully with all such laws and regulations and acknowledges its responsibility to obtain such licenses to 
-export, re-export or import as may be required.  You must pass through these obligations to all Your licensees.  (b) You may not distribute 
-Reference Code or Technology Specifications into countries other than those listed on the Technology Site by Original Contributor, from 
+7.  International Use.  (a) Covered Code is subject to US export control laws and may be subject to export or import regulations in other
+countries.  Each party shall comply fully with all such laws and regulations and acknowledges its responsibility to obtain such licenses to
+export, re-export or import as may be required.  You must pass through these obligations to all Your licensees.  (b) You may not distribute
+Reference Code or Technology Specifications into countries other than those listed on the Technology Site by Original Contributor, from
 time to time.
 
 IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF A COMPANY,
@@ -1069,8 +1069,8 @@
 
 ATTACHMENT A-1 COMMUNITY MEMBER CERTIFICATE
 
-You certify that You are a Licensee in good standing under the Sun Community Source License for the ____________ Technology (fill in  
-applicable Technology and Version) (License) and that You agree to use and distribute code, documentation and information You may obtain 
+You certify that You are a Licensee in good standing under the Sun Community Source License for the ____________ Technology (fill in
+applicable Technology and Version) (License) and that You agree to use and distribute code, documentation and information You may obtain
 pursuant to this certification only in accordance with the terms and subject to the conditions of the License.
 
 Add to the end of the foregoing, as appropriate:
@@ -1090,13 +1090,13 @@
 
 ATTACHMENT A-2 STUDENT ACKNOWLEDGEMENT
 
-You acknowledge that this software and related documentation has been obtained by your educational institution subject to the Sun  
-Community Source License (the License).  You have been provided with access to the software and documentation for use only in 
-connection with your course work as a matriculated student of your educational institution. Commercial use of the software and 
+You acknowledge that this software and related documentation has been obtained by your educational institution subject to the Sun
+Community Source License (the License).  You have been provided with access to the software and documentation for use only in
+connection with your course work as a matriculated student of your educational institution. Commercial use of the software and
 documentation is expressly prohibited.
 
-THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY MATERIALS OF SUN MICROSYSTEMS, INC.  
-PROTECTED BY VARIOUS INTELLECTUAL PROPERTY RIGHTS.  YOUR USE OF THE SOFTWARE AND DOCUMENTATION IS 
+THIS SOFTWARE AND RELATED DOCUMENTATION CONTAINS PROPRIETARY MATERIALS OF SUN MICROSYSTEMS, INC.
+PROTECTED BY VARIOUS INTELLECTUAL PROPERTY RIGHTS.  YOUR USE OF THE SOFTWARE AND DOCUMENTATION IS
 LIMITED.
 
 - - - - - - - - - Add to the end of the foregoing, as
@@ -1120,65 +1120,65 @@
 
 I.  PURPOSE AND EFFECT.
 
-This Commercial Use Supplement General Terms (CUSupp) is required for Commercial Use of Covered Code and, once signed by You and 
-Original Contributor, is operative for all Technologies specified in all Technology Specific Attachment(s) hereto.  The rights and  
+This Commercial Use Supplement General Terms (CUSupp) is required for Commercial Use of Covered Code and, once signed by You and
+Original Contributor, is operative for all Technologies specified in all Technology Specific Attachment(s) hereto.  The rights and
 responsibilities set forth in this CUSupp are additional to those in Your License.
 
 II.  DEFINITIONS.
 
 "Commercial Use" means uses and distributions of Covered Code for any direct or indirect commercial or strategic gain or advantage.
 
-"Compliant Implementation" means Covered Code that fully implements the Technology Specifications and complies with all Test 
+"Compliant Implementation" means Covered Code that fully implements the Technology Specifications and complies with all Test
 Requirements.
 
-"Compliance Materials" means the test programs, guides, documentation and other materials identified in the Technology-Specific 
+"Compliance Materials" means the test programs, guides, documentation and other materials identified in the Technology-Specific
 Attachment(s) for use in establishing that Covered Code is a Compliant Implementation.
 
-"Technology-Specific Attachment(s)" means an attachment or attachments to this CUsupp which contains terms and conditions specific to 
+"Technology-Specific Attachment(s)" means an attachment or attachments to this CUsupp which contains terms and conditions specific to
 the Technology therein identified as well as the specifics of the Compliance Materials and requirements for such Technology.
 
 III.  COMMERCIAL USE RIGHTS.
 
-A.  Subject to and conditioned upon Your compliance with the terms and conditions of Your Research Use license and the additional terms 
-and conditions set forth in this CUSupp and associated Technology-Specific Attachnment(s), including the provisions of Section IV, Original 
+A.  Subject to and conditioned upon Your compliance with the terms and conditions of Your Research Use license and the additional terms
+and conditions set forth in this CUSupp and associated Technology-Specific Attachnment(s), including the provisions of Section IV, Original
 Contributor hereby adds to those rights enumerated under Section III.A.1 of the Research Use license the rights to:
 
-e) use the Compliance Materials to determine whether Covered Code constitutes a Compliant Implementation; f) use, reproduce, display, 
-perform and distribute internally source and object code copies of Compliant Implementations for Commercial Use; g) reproduce and 
-distribute to third parties and Community Members through multiple tiers of distribution object code copies of Compliant Implementations 
+e) use the Compliance Materials to determine whether Covered Code constitutes a Compliant Implementation; f) use, reproduce, display,
+perform and distribute internally source and object code copies of Compliant Implementations for Commercial Use; g) reproduce and
+distribute to third parties and Community Members through multiple tiers of distribution object code copies of Compliant Implementations
 for Commercial Use; and h) reproduce and distribute a copy of the Technology Specifications (which may be reformatted, but
-must remain substantively unchanged) with Compliant Implementations for Commercial Use. 
+must remain substantively unchanged) with Compliant Implementations for Commercial Use.
 
-B.  In addition, Original Contributors covenant under Section III.A.2 is hereby expanded to include Your using, making, having made, 
+B.  In addition, Original Contributors covenant under Section III.A.2 is hereby expanded to include Your using, making, having made,
 selling, importing and distributing Compliant Implementations for Commercial Use insofar as permitted above.
 
 IV.  ADDITIONAL REQUIREMENTS AND COMMUNITY RESPONSIBILITIES.
 
-As a condition to the Commercial Use rights granted above, You must comply with the following restrictions and community responsibilities 
+As a condition to the Commercial Use rights granted above, You must comply with the following restrictions and community responsibilities
 (in addition to those in the License):
 
-F.  Compliance Materials.  Depending on the Technology licensed, Your access to and use of the Compliance Materials may be subject to 
-additional requirements such as entering into a support agreement and trademark license.  Such additional requirements, if any, are as set out 
+F.  Compliance Materials.  Depending on the Technology licensed, Your access to and use of the Compliance Materials may be subject to
+additional requirements such as entering into a support agreement and trademark license.  Such additional requirements, if any, are as set out
 in the Technology-Specific Attachment.  You agree to comply fully with all such applicable requirements.
 
 G.  Compatibility.  Only Compliant Implementations may be used and distributed for Commercial Use.
 
-H.  Commericial Distribution Requirement.  You may distribute object code copies for Commercial Use as herein contemplated under a 
-license agreement of Your choice which is consistent with Your rights and obligations under the License and this CUSupp.  You may provide 
+H.  Commericial Distribution Requirement.  You may distribute object code copies for Commercial Use as herein contemplated under a
+license agreement of Your choice which is consistent with Your rights and obligations under the License and this CUSupp.  You may provide
 warranties, indemnities and/or other additional terms and conditions in Your license agreements, provided that it is clear that such
-additional terms and conditions are offered by You only and You agree to hold each Community Member harmless and indemnify them 
-against any liability arising in connection with such terms and conditions.  You will pay all damages, costs and fees awarded by a court or 
+additional terms and conditions are offered by You only and You agree to hold each Community Member harmless and indemnify them
+against any liability arising in connection with such terms and conditions.  You will pay all damages, costs and fees awarded by a court or
 arbitrator having jurisdiction over the matter or any settlement amount negotiated by You and attributable to such claim.
 
-I.  Defense.  Original Contributor will have the right, but not the obligation, to defend You, at Original Contributor's expense, in connection  
-with a claim that Your Commercial Use of Reference Code is an infringement of a third party's intellectual property rights, in which case 
+I.  Defense.  Original Contributor will have the right, but not the obligation, to defend You, at Original Contributor's expense, in connection
+with a claim that Your Commercial Use of Reference Code is an infringement of a third party's intellectual property rights, in which case
 You agree to cooperate with Original Contributor and Original Contributor will pay all damages costs and fees awarded by a court or
 tribunal of competent jurisdiction, or such settlement amount negotiated by Original Contributor and attributable to such claim.
 
-J.  Notices.  All notices required by the License and this Supplement must be in writing and delivered by means evidenced by delivery receipt 
+J.  Notices.  All notices required by the License and this Supplement must be in writing and delivered by means evidenced by delivery receipt
 and will be effective upon receipt at the addresses specified below.
 
-K.  Relationship.  The relationship created is that of licensor and licensee only.  You hereby waive the benefit of any law or regulation 
+K.  Relationship.  The relationship created is that of licensor and licensee only.  You hereby waive the benefit of any law or regulation
 dealing with the establishment and regulation of franchises or agencies.
 
 Agreed:
@@ -1200,28 +1200,28 @@
 JMX AGENT VERSION 1.0
 
 
-1.  Effect.  This Technology Specific Attachment to the Commercial Use Supplement applies to the JMX Agent, version 1.0, as described on 
-the Technology Site.  The rights and responsibilities set forth in this Technology Specific Attachment are additional to those in Your License 
+1.  Effect.  This Technology Specific Attachment to the Commercial Use Supplement applies to the JMX Agent, version 1.0, as described on
+the Technology Site.  The rights and responsibilities set forth in this Technology Specific Attachment are additional to those in Your License
 and the CUSupp.
 
 
-2.  Term.  Upon execution of the CUSupp by You and Original Contributor, this Commercial Use license shall have an initial term of five 
-years and shall automatically renew for additional one year terms unless either party provides notice to the other no less than 180 days prior 
+2.  Term.  Upon execution of the CUSupp by You and Original Contributor, this Commercial Use license shall have an initial term of five
+years and shall automatically renew for additional one year terms unless either party provides notice to the other no less than 180 days prior
 to an anniversary date.
 
 
-3.  Additional Requirements and Responsibilities.  In addition to the requirements and responsibilities specified in the License and CUSupp, 
+3.  Additional Requirements and Responsibilities.  In addition to the requirements and responsibilities specified in the License and CUSupp,
 and as a condition to exercising the rights granted therein, You agree to the following additional requirements and responsibilities:
 
 
-a) Distribution of Object Code.  Object code versions of Compliant Implementations distributed for Commercial Use must include a 
-description of the specific configurations You used to achieve compliance with the Compliance Materials.  Such description must include the 
+a) Distribution of Object Code.  Object code versions of Compliant Implementations distributed for Commercial Use must include a
+description of the specific configurations You used to achieve compliance with the Compliance Materials.  Such description must include the
 system configuration, applicable operating system and version, and all other required software services and installations, and
-which must be installed for end users to operate such Compliant Implementations.  This information must be publicly available and freely 
+which must be installed for end users to operate such Compliant Implementations.  This information must be publicly available and freely
 and readily accessible to potential end users prior to licensing or purchase of such Compliant Implementations.
 
 
-b) Branding.  You may not claim that You are distributing a JMX Agent Compliant Implementation unless and until You provide your test 
+b) Branding.  You may not claim that You are distributing a JMX Agent Compliant Implementation unless and until You provide your test
 results as required pursuant to Section 7.d) below.
 
 
@@ -1231,11 +1231,11 @@
 4.  Support Programs.
 
 
-a) Support to You.  Technical support is not provided to You by Original Contributor under this License.  You may obtain one or more 
+a) Support to You.  Technical support is not provided to You by Original Contributor under this License.  You may obtain one or more
 support programs from Original Contributor relating to the Technology which are described on the Technology Site.
 
 
-b) Customer Support.  You are responsible for providing technical and maintenance support services to Your customers for Your products 
+b) Customer Support.  You are responsible for providing technical and maintenance support services to Your customers for Your products
 and services incorporating the Compliant Implementation.
 
 
@@ -1248,14 +1248,14 @@
 1.0
 
 
-a) The license set forth in Section III.A.1.e of the CUSupp for the Compliance Materials is effective only upon execution of a separate 
-support agreement between You and Original Contributor (subject to an annual fee) as described on the Technology Site.  The Compliance 
+a) The license set forth in Section III.A.1.e of the CUSupp for the Compliance Materials is effective only upon execution of a separate
+support agreement between You and Original Contributor (subject to an annual fee) as described on the Technology Site.  The Compliance
 Materials for the Technology may be accessed at the Technology Site only upon execution of the support agreement.
 
 
-b) You are not authorized to create derivative works of the Compliance Materials or use the Compliance Materials to test any implementation 
-of the Technology Specifications that are not Covered Code.  You must not publish your test results or make claims of comparative 
-compatibility with respect to other implementations of the Technology Specifications.  In consideration for the license grant in Section 
+b) You are not authorized to create derivative works of the Compliance Materials or use the Compliance Materials to test any implementation
+of the Technology Specifications that are not Covered Code.  You must not publish your test results or make claims of comparative
+compatibility with respect to other implementations of the Technology Specifications.  In consideration for the license grant in Section
 III.A.1.e of the CUSupp, You agree not to develop Your own tests which are intended to validate conformance with the Technology
 Specifications.
 
@@ -1266,27 +1266,27 @@
 a) Definitions.
 
 
-"Added Value" means code which:  (i) has a principal purpose which is substantially different from that of the stand-alone Technology; (ii) 
-represents a significant functional and value enhancement to the Technology; (iii) operates in conjunction with the Technology; and (iv) is 
+"Added Value" means code which:  (i) has a principal purpose which is substantially different from that of the stand-alone Technology; (ii)
+represents a significant functional and value enhancement to the Technology; (iii) operates in conjunction with the Technology; and (iv) is
 not marketed as a technology which replaces or substitutes for the Technology.
 
 
-"Java Classes" means the specific class libraries associated with the Technology to which this Technology Specific Attachment applies as set 
+"Java Classes" means the specific class libraries associated with the Technology to which this Technology Specific Attachment applies as set
 forth on the Technology Site.
 
 
-"Java Runtime Interpreter" means the program(s) which implement the Java virtual machine for the Technology as defined in the Technology 
-Specification. 
+"Java Runtime Interpreter" means the program(s) which implement the Java virtual machine for the Technology as defined in the Technology
+Specification.
 
 
 "Platform Dependent Part" means those Reference Code files of the Technology which are not in a "share" directory or subdirectory thereof.
 
 
-"Shared Part" means those Reference Code files of the Technology which are identified as "shared" (or words of similar meaning) or which 
+"Shared Part" means those Reference Code files of the Technology which are identified as "shared" (or words of similar meaning) or which
 are in any "share" directory or subdirectory thereof, except those files specifically designated by Original Contributor as modifiable.
 
 
-"User's Guide" means the users guide for the Compliance Materials which Sun makes available to You to provide direction in how to use the 
+"User's Guide" means the users guide for the Compliance Materials which Sun makes available to You to provide direction in how to use the
 Compliance Materials and properly interpret the results, as may be revised by Sun from time to time.
 
 
@@ -1297,7 +1297,7 @@
 i) must include Added Value;
 
 ii) must fully comply with the Technology Specifications for     the Technology to which this Technology Specific     Attachment applies;
- 
+
 iii) must include the Shared Part, complete and unmodified;
 
 iv) must not modify the functional behavior of the Java     Runtime Interpreter or the Java Classes;
@@ -1310,15 +1310,15 @@
      "java", "javax", "jini", "net.jini", "sun.hotjava",      "COM.sun" or their equivalents in any subsequent naming      convention.
 
 
-c) Compatibility Testing.  Successful compatibility testing must be completed by You, or at Original Contributor's option, a third party 
-designated by Original Contributor, to conduct such tests, in accordance with the User's Guide, and using the most current version of the 
-applicable Compliance Materials available from Original Contributor one hundred twenty (120) days (two hundred forty [240] days in the 
-case of silicon mplementations) prior to each release of a Compliant Implementation by You for Commercial Use.  In the event that You 
-elect to use a version of Reference Code that is newer than that which is required under this Section 6.c, then You agree to pass the version of 
+c) Compatibility Testing.  Successful compatibility testing must be completed by You, or at Original Contributor's option, a third party
+designated by Original Contributor, to conduct such tests, in accordance with the User's Guide, and using the most current version of the
+applicable Compliance Materials available from Original Contributor one hundred twenty (120) days (two hundred forty [240] days in the
+case of silicon mplementations) prior to each release of a Compliant Implementation by You for Commercial Use.  In the event that You
+elect to use a version of Reference Code that is newer than that which is required under this Section 6.c, then You agree to pass the version of
 the Compliance Materials that corresponds to such newer version of Reference Code.
 
 
-d) Test Results.  You agree to provide to Original Contributor or the third party test facility if applicable, Your test results that demonstrate 
+d) Test Results.  You agree to provide to Original Contributor or the third party test facility if applicable, Your test results that demonstrate
 that Covered Code is a Compliant Implementation, and that Original Contributor may publish or otherwise distribute such test results.
 
 
@@ -1346,27 +1346,27 @@
 JMX INSTRUMENTATION VERSION 1.0
 
 
-1.  Effect.  This Technology Specific Attachment to the Commercial Use Supplement applies to the JMX Instrumentation, version 1.0, as 
+1.  Effect.  This Technology Specific Attachment to the Commercial Use Supplement applies to the JMX Instrumentation, version 1.0, as
 described on the Technology Site.  The rights and responsibilities set forth in this Technology Specific Attachment are additional to those in
-Your License and the CUSupp. 
+Your License and the CUSupp.
 
 
 2.  Term.  Upon execution of the CUSupp by You and Original Contributor, this Commercial Use license shall have an
-initial term of five years and shall automatically renew for additional one year terms unless either party provides notice to the other no less 
+initial term of five years and shall automatically renew for additional one year terms unless either party provides notice to the other no less
 than 180 days prior to an anniversary date.
 
 
-3.  Additional Requirements and Responsibilities.  In addition to the requirements and responsibilities specified in the License and CUSupp, 
+3.  Additional Requirements and Responsibilities.  In addition to the requirements and responsibilities specified in the License and CUSupp,
 and as a condition to exercising the rights granted therein, You agree to the following additional requirements and responsibilities:
 
 
 a) Distribution of Object Code.
 
-Object code versions of Compliant Implementations distributed for Commercial Use: 
+Object code versions of Compliant Implementations distributed for Commercial Use:
 
-i. must be integrated and distributed with the hardware    and/or software that are instrumented (i.e., made   manageable) with the 
-Technology, or must be configured to    instrument an already deployed hardware and/or software    resource; and 
-ii.must not be distributed without the Compliance Materials,    or must not be distributed without notice to the end    users that the 
+i. must be integrated and distributed with the hardware    and/or software that are instrumented (i.e., made   manageable) with the
+Technology, or must be configured to    instrument an already deployed hardware and/or software    resource; and
+ii.must not be distributed without the Compliance Materials,    or must not be distributed without notice to the end    users that the
 Compliance Materials can be freely    downloaded from the Technology Site.
 
 
@@ -1376,11 +1376,11 @@
 4.  Support Programs.
 
 
-a) Support to You.  Technical support is not provided to You by Original Contributor under this License.  You may obtain one or more 
+a) Support to You.  Technical support is not provided to You by Original Contributor under this License.  You may obtain one or more
 support programs from Original Contributor relating to the Technology which are described on the Technology Site.
 
 
-b) Customer Support.  You are responsible for providing technical and maintenance support services to Your customers for Your products 
+b) Customer Support.  You are responsible for providing technical and maintenance support services to Your customers for Your products
 and services incorporating the Compliant Implementation.
 
 
@@ -1396,11 +1396,11 @@
 Compliance Materials:  JMX Instrumentation Conformance Test Tool, version 1.0
 
 
-You are not authorized to create derivative works of the Compliance Materials or use the Compliance Materials to test any implementation of 
-the Technology Specifications that are not Covered Code.  You must not publish your test results or make claims of comparative 
-compatibility with respect to other implementations of the Technology Specifications.  In consideration for the license grant in Section 
+You are not authorized to create derivative works of the Compliance Materials or use the Compliance Materials to test any implementation of
+the Technology Specifications that are not Covered Code.  You must not publish your test results or make claims of comparative
+compatibility with respect to other implementations of the Technology Specifications.  In consideration for the license grant in Section
 III.A.1.e of the CUSupp, You agree not to develop Your own tests which are intended to validate conformance with the Technology
-Specifications. 
+Specifications.
 
 7.  Requirements for Determining Compliance.
 
@@ -1408,27 +1408,27 @@
 a) Definitions.
 
 
-"Added Value" means code which:  (i) has a principal purpose which is substantially different from that of the stand-alone Technology; (ii) 
-represents a significant functional and value enhancement to the Technology; (iii) operates in conjunction with the Technology; and (iv) is 
+"Added Value" means code which:  (i) has a principal purpose which is substantially different from that of the stand-alone Technology; (ii)
+represents a significant functional and value enhancement to the Technology; (iii) operates in conjunction with the Technology; and (iv) is
 not marketed as a technology which replaces or substitutes for the Technology.
 
 
-"Java Classes" means the specific class libraries associated with the Technology to which this Technology Specific Attachment applies as set 
+"Java Classes" means the specific class libraries associated with the Technology to which this Technology Specific Attachment applies as set
 forth on the Technology Site.
 
 
-"Java Runtime Interpreter" means the program(s) which implement the Java virtual machine for the Technology as defined in the Technology 
-Specification. 
+"Java Runtime Interpreter" means the program(s) which implement the Java virtual machine for the Technology as defined in the Technology
+Specification.
 
 
 "Platform Dependent Part" means those Reference Code files of the Technology which are not in a "share" directory or subdirectory thereof.
 
 
-"Shared Part" means those Reference Code files of the Technology which are identified as "shared" (or words of similar meaning) or which 
+"Shared Part" means those Reference Code files of the Technology which are identified as "shared" (or words of similar meaning) or which
 are in any "share" directory or subdirectory thereof, except those files specifically designated by Original Contributor as modifiable.
 
 
-"User's Guide" means the users guide for the Compliance Materials which Sun makes available to You to provide direction in how to use the 
+"User's Guide" means the users guide for the Compliance Materials which Sun makes available to You to provide direction in how to use the
 Compliance Materials and properly interpret the results, as may be revised by Sun from time to time.
 
 
@@ -1439,7 +1439,7 @@
 i) must include Added Value;
 
 ii) must fully comply with the Technology Specifications for    the Technology to which this Technology Specific    Attachment applies;
- 
+
 iii) must include the Shared Part, complete and unmodified;
 
 iv) must not modify the functional behavior of the Java     Runtime Interpreter or the Java Classes;
@@ -1451,22 +1451,22 @@
 vii) must not modify or extend the required public class or     public interface declarations whose names begin with
      "java", "javax", "jini", "net.jini", "sun.hotjava",      "COM.sun" or their equivalents in any subsequent naming      convention;
 
-viii) must be integrated and distributed with the hardware       and/or software that are instrumented (i.e., made       manageable) with the 
+viii) must be integrated and distributed with the hardware       and/or software that are instrumented (i.e., made       manageable) with the
 Technology, or must be configured       to instrument an already deployed hardware and/or       software resource; and
 
-ix) must be configured to run only in conjunction with an     implementation of the JMX Agent Technology version 1.0     from Sun or a third 
+ix) must be configured to run only in conjunction with an     implementation of the JMX Agent Technology version 1.0     from Sun or a third
 party that meets Sun's compatibility     requirements, in binary form and as specified in the     User's Guide.
 
 
-c) Compatibility Testing.  Successful compatibility testing must be completed by You, or at Original Contributor's option, a third party 
-designated by Original Contributor, to conduct such tests, in accordance with the User's Guide, and using the most current version of the 
-applicable Compliance Materials available from Original Contributor one hundred twenty (120) days (two hundred forty [240] days in the 
-case of silicon implementations) prior to each release of a Compliant Implementation by You for Commercial Use.  In the event that You 
-elect to use a version of Reference Code that is newer than that which is required under this Section 7.c, then You agree to pass the version of 
+c) Compatibility Testing.  Successful compatibility testing must be completed by You, or at Original Contributor's option, a third party
+designated by Original Contributor, to conduct such tests, in accordance with the User's Guide, and using the most current version of the
+applicable Compliance Materials available from Original Contributor one hundred twenty (120) days (two hundred forty [240] days in the
+case of silicon implementations) prior to each release of a Compliant Implementation by You for Commercial Use.  In the event that You
+elect to use a version of Reference Code that is newer than that which is required under this Section 7.c, then You agree to pass the version of
 the Compliance Materials that corresponds to such newer version of Reference Code.
 
 
-d) Test Results.  You agree to provide to Original Contributor or the third party test facility if applicable, Your test results that demonstrate 
+d) Test Results.  You agree to provide to Original Contributor or the third party test facility if applicable, Your test results that demonstrate
 that Covered Code is a Compliant Implementation, and that Original Contributor may publish or otherwise distribute such test results.
 
 
@@ -1487,407 +1487,384 @@
 
 Date:____________________ Date:__________________
 
- XVII.  Binary Code License Agreement for Java Naming and Directory Interface ™  version 1.2.1 (jndi and providerutil) and any of 
-the following : 
-LDAP service provider version 1.2.3, 
-NIS service provider version 1.2.1, 
-RMI Registry service provider version 1.2.1, 
-FS Context service provider version 1.2 beta 3 release, 
-COS Naming service provider version 1.2.1, 
-or Demo 
+ XVII.  Binary Code License Agreement for Java Naming and Directory Interface �  version 1.2.1 (jndi and providerutil) and any of
+the following :
+LDAP service provider version 1.2.3,
+NIS service provider version 1.2.1,
+RMI Registry service provider version 1.2.1,
+FS Context service provider version 1.2 beta 3 release,
+COS Naming service provider version 1.2.1,
+or Demo
 
 
 
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software 
-and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer 
-hardware for which the corresponding fee has been paid. 
+1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software
+and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer
+hardware for which the corresponding fee has been paid.
 
-2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by 
-Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other 
-than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, 
-or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction, 
-operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or 
-interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 
+2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by
+Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other
+than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile,
+or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction,
+operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or
+interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
 
-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of 
-the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except 
-for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's 
-option to replace Software media or refund the fee paid for Software. 
+3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of
+the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except
+for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's
+option to replace Software media or refund the fee paid for Software.
 
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE 
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 
+4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
 
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS 
-BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR 
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED 
-TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by 
-you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 
+5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED
+TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by
+you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
 
-6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of 
-Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  
-Upon Termination, you must destroy all copies of Software. 
+6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of
+Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.
+Upon Termination, you must destroy all copies of Software.
 
-7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be 
-subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge 
-that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 
+7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be
+subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge
+that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
 
-8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government 
-prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set 
-forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) 
-and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
+8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government
+prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set
+forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions)
+and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
 
-9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of 
-law rules of any jurisdiction will apply. 
+9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of
+law rules of any jurisdiction will apply.
 
-10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision 
-omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 
+10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision
+omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
 
-11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or 
-contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional 
-terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this 
-Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 
-  
+11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional
+terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this
+Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
 
-XVIII.  Supplemental License Terms for Java Naming and Directory Interface ™ version 1.2.1 (jndi and providerutil) and any of the 
-following : 
-LDAP service provider version 1.2.3, 
-NIS service provider version 1.2.1, 
-RMI Registry service provider version 1.2.1, 
-FS Context service provider version 1.2 beta 3 release, 
-COS Naming service provider version 1.2.1, 
-or Demo 
 
-These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, 
-the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the 
-Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained 
-within the Software. 
+XVIII.  Supplemental License Terms for Java Naming and Directory Interface � version 1.2.1 (jndi and providerutil) and any of the
+following :
+LDAP service provider version 1.2.3,
+NIS service provider version 1.2.1,
+RMI Registry service provider version 1.2.1,
+FS Context service provider version 1.2 beta 3 release,
+COS Naming service provider version 1.2.1,
+or Demo
 
-1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to 
-Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited 
-license to reproduce internally and use internally the binary form of the Software for the sole purpose of designing, developing and testing 
-your Java applets and applications ("Programs"). 
+These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively,
+the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the
+Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained
+within the Software.
 
-2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of 
-these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology 
-Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form only, 
-provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute 
-additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices 
-contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the 
-terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, 
-liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any 
-third party that arises or results from the use or distribution of any and all Programs and/or Software. 
+1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to
+Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited
+license to reproduce internally and use internally the binary form of the Software for the sole purpose of designing, developing and testing
+your Java applets and applications ("Programs").
 
-3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" 
-package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or 
-modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the 
-functionality of the Java Platform, and (ii) is exposed to third party software developers for the purpose of developing additional software 
-which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. 
-You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as 
-"java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. 
+2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of
+these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology
+Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form only,
+provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute
+additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices
+contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the
+terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs,
+liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any
+third party that arises or results from the use or distribution of any and all Programs and/or Software.
 
-4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, 
-STAROFFICE, STARPORTAL and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL 
-and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun 
-Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks 
-inures to Sun's benefit. 
+3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java"
+package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or
+modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the
+functionality of the Java Platform, and (ii) is exposed to third party software developers for the purpose of developing additional software
+which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers.
+You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as
+"java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
 
-5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.  
-Source code may not be redistributed unless expressly provided for in this Agreement. 
+4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE,
+STAROFFICE, STARPORTAL and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL
+and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun
+Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks
+inures to Sun's benefit.
 
-6. Termination for Infringement. Either party may terminate this Agreement immediately should any Software become, or in either party's 
-opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 
+5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.
+Source code may not be redistributed unless expressly provided for in this Agreement.
 
-For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303 
+6. Termination for Infringement. Either party may terminate this Agreement immediately should any Software become, or in either party's
+opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
 
-XIX.  Binary Code License Agreement for Java(TM) Transaction API (JTA) -- Javadoc 1.0.2b 
- 
-Sun Microsystems, Inc. 
+For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303
+
+XIX.  Binary Code License Agreement for Java(TM) Transaction API (JTA) -- Javadoc 1.0.2b
+
+Sun Microsystems, Inc.
 Binary Code License Agreement
- 
 
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software 
-and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer 
-hardware for which the corresponding fee has been paid. 
 
-2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by 
-Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other 
-than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, 
-or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction, 
-operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or 
-interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 
+1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software
+and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer
+hardware for which the corresponding fee has been paid.
 
-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of 
-the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except 
-for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's 
-option to replace Software media or refund the fee paid for Software. 
+2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by
+Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other
+than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile,
+or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction,
+operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or
+interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
 
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE 
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 
+3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of
+the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except
+for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's
+option to replace Software media or refund the fee paid for Software.
 
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS 
-BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR 
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED 
-TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by 
-you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 
+4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
 
-6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of 
-Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  
-Upon Termination, you must destroy all copies of Software. 
+5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS
+BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
+PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED
+TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by
+you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
 
-7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be 
-subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge 
-that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 
+6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of
+Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.
+Upon Termination, you must destroy all copies of Software.
 
-8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government 
-prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set 
-forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) 
-and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
+7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be
+subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge
+that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
 
-9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of 
-law rules of any jurisdiction will apply. 
+8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government
+prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set
+forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions)
+and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
 
-10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision 
-omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 
+9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of
+law rules of any jurisdiction will apply.
 
-11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or 
-contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional 
-terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this 
-Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 
+10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision
+omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
 
+11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional
+terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this
+Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
+
 XX.  Supplemental License Terms for  JAVA(TM) INTERFACE CLASSES JAVA TRANSACTION API (JTA), VERSION 1.0.1a and
 Java Database Connectivity API extension version 2.0
 
-These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, 
-the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the 
-Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained 
-within the Software. 
+These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively,
+the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the
+Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained
+within the Software.
 
-1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to 
-Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited 
-license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of 
-designing, developing and testing your Java applets and applications ("Programs"). 
+1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to
+Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited
+license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of
+designing, developing and testing your Java applets and applications ("Programs").
 
-2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of 
-these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology 
-Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form only, 
-provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute 
-additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices 
-contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the 
-terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, 
-liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any 
-third party that arises or results from the use or distribution of any and all Programs and/or Software. 
+2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of
+these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology
+Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form only,
+provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute
+additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices
+contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the
+terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs,
+liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any
+third party that arises or results from the use or distribution of any and all Programs and/or Software.
 
-3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" 
-package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or 
-modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the 
-functionality of the Java Platform, and (ii) is exposed to third party software developers for the purpose of developing additional software 
-which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. 
-You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as 
-"java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. 
+3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java"
+package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or
+modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the
+functionality of the Java Platform, and (ii) is exposed to third party software developers for the purpose of developing additional software
+which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers.
+You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as
+"java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
 
-4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, 
-STAROFFICE, STARPORTAL and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL 
-and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun 
-Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks 
-inures to Sun's benefit. 
+4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE,
+STAROFFICE, STARPORTAL and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, STAROFFICE, STARPORTAL
+and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun
+Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks
+inures to Sun's benefit.
 
-5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.  
-Source code may not be redistributed unless expressly provided for in this Agreement. 
+5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.
+Source code may not be redistributed unless expressly provided for in this Agreement.
 
-6.  Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's 
-opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 
+6.  Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's
+opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
 
-For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303 
+For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303
 (Form ID#011801)
- 
 
-  
-LICENSE TERMS FOR JUNIT THAT MAY ACCOMPANY THE ARJUNA SOFTWARE 
 
-Common Public License Version 0.5
+--------------------------------------------------------------------------------------
 
-THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE SOFTWARE THAT IS JUNIT 
-AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY OTHER PRODUCTS TERMS ASSOCIATED WITH OTHER 
-ELEMENTS OF THE SOFTWARE.. 
-1. DEFINITIONS 
-"Contribution" means: 
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and 
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A 
-Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such 
-Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed 
-in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program. 
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution 
-alone or when combined with the Program. 
-"Program" means the Contributions distributed in accordance with this Agreement. 
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. 
-2. GRANT OF RIGHTS 
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free 
-copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the 
-Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent 
-license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, 
-if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program 
-if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be 
-covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No 
-hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are 
-provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. 
-Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual 
-property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes 
-sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is 
-required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the 
-Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the 
-copyright license set forth in this Agreement. 
-3. REQUIREMENTS 
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: 
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or 
-conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular 
-purpose; 
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and 
-consequential damages, such as lost profits; 
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; 
-and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a 
-reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form: 
-a) it must be made available under this Agreement; and 
-b) a copy of this Agreement must be included with each copy of the Program. 
-Contributors may not remove or alter any copyright notices contained within the Program. 
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to 
-identify the originator of the Contribution. 
-4. COMMERCIAL DISTRIBUTION 
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this 
-license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product 
-offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the 
-Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other 
-Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other 
-legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial 
-Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply 
-to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor 
-must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and 
-cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may 
-participate in any such claim at its own expense. 
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial 
-Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance 
-claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to 
-defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor 
-to pay any damages as a result, the Commercial Contributor must pay those damages. 
-5. NO WARRANTY 
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT 
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY 
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR 
-PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all 
-risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, 
-compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 
-6. DISCLAIMER OF LIABILITY 
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE 
-ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, 
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-7. GENERAL 
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the 
-remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum 
-extent necessary to make such provision valid and enforceable. 
-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or 
-counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of 
-the date such litigation is filed. In addition, If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim 
-in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such 
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. 
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement 
-and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this 
-Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's 
-obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. 
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and 
-may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of 
-this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial 
-Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of 
-the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to 
-the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may 
-elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) 
-above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by 
-implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. 
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No 
-party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives 
-its rights to a jury trial in any resulting litigation. 
+LICENSE TERMS FOR JUNIT (3.8.2) THAT MAY ACCOMPANY THE SOFTWARE
+per http://junit.sourceforge.net/cpl-v10.html as at 2007-02-20.
 
+Common Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+      b) in the case of each subsequent Contributor:
+
+      i) changes to the Program, and
+
+      ii) additions to the Program;
+
+      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+      a) it complies with the terms and conditions of this Agreement; and
+
+      b) its license agreement:
+
+      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+      a) it must be made available under this Agreement; and
+
+      b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any clai!
 ms or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no !
 rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+
+--------------------------------------------------------------------------------------
+
 LICENSE TERMS FOR LRMP/INRIS THAT MAY ACCOMPANY THE ARJUNA SOFTWARE
 
 
-THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE  SOFTWARE THAT IS 
-LRMP/INRIA SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY THIRD PARTY PRODUCTS TERMS 
-ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE. 
+THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE  SOFTWARE THAT IS
+LRMP/INRIA SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY THIRD PARTY PRODUCTS TERMS
+ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE.
 
 
 LRMP/INRIA
 COPYRIGHT 1997/1998 BY: MASSACHUSETTS INSTITUTE OF TECHNOLOGY (MIT), INRIA
 
-This W3C software is being provided by the copyright holders under the following license. By obtaining, using and/or copying this software, 
+This W3C software is being provided by the copyright holders under the following license. By obtaining, using and/or copying this software,
 you agree that you have read, understood, and will comply with the following terms and conditions:
 
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee or royalty is hereby 
-granted, provided that the full text of this NOTICE appears on ALL copies of the software and documentation or portions thereof, including 
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee or royalty is hereby
+granted, provided that the full text of this NOTICE appears on ALL copies of the software and documentation or portions thereof, including
 modifications, that you make.
 
-THIS SOFTWARE IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, 
-EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, COPYRIGHT HOLDERS MAKE NO 
-REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT 
-THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, 
-TRADEMARKS OR OTHER RIGHTS. COPYRIGHT HOLDERS WILL BEAR NO LIABILITY FOR ANY USE OF THIS SOFTWARE 
+THIS SOFTWARE IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES,
+EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, COPYRIGHT HOLDERS MAKE NO
+REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS. COPYRIGHT HOLDERS WILL BEAR NO LIABILITY FOR ANY USE OF THIS SOFTWARE
 OR DOCUMENTATION.
 
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, 
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific,
 written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
 
 LICENSE TERMS FOR JYACC SOFTWARE THAT MAY ACCOMPANY THE ARJUNA SOFTWARE
 
 
-THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE 
-SOFTWARE THAT IS JYACC SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY THIRD PARTY 
-PRODUCTS TERMS ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE. 
+THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE
+SOFTWARE THAT IS JYACC SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY THIRD PARTY
+PRODUCTS TERMS ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE.
 
 
 JYACC.JAR
 CUP Parser Generator Copyright Notice, License, and Disclaimer
-Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian 
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that both the copyright notice and this permission notice and warranty 
-disclaimer appear in supporting documentation, and that the names of the authors or their employers not be used in advertising or publicity 
-pertaining to distribution of the software without specific, written prior permission. 
+Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that both the copyright notice and this permission notice and warranty
+disclaimer appear in supporting documentation, and that the names of the authors or their employers not be used in advertising or publicity
+pertaining to distribution of the software without specific, written prior permission.
 
-The authors and their employers disclaim all warranties with regard to this software, including all implied warranties of merchantability and 
-fitness. In no event shall the authors or their employers be liable for any special, indirect or consequential damages or any damages 
-whatsoever resulting from loss of use, data or profits, whether in an action of contract, negligence or other tortious action, arising out of or in 
-connection with the use or performance of this software. 
+The authors and their employers disclaim all warranties with regard to this software, including all implied warranties of merchantability and
+fitness. In no event shall the authors or their employers be liable for any special, indirect or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether in an action of contract, negligence or other tortious action, arising out of or in
+connection with the use or performance of this software.
 
 
 LICENSE TERMS FOR JLEX SOFTWARE THAT MAY ACCOMPANY THE ARJUNA SOFTWARE
 
 
-THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE 
-SOFTWARE THAT IS JLEX SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY THIRD PARTY PRODUCTS 
-TERMS ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE. 
+THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE
+SOFTWARE THAT IS JLEX SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY THIRD PARTY PRODUCTS
+TERMS ASSOCIATED WITH OTHER ELEMENTS OF THE SOFTWARE.
 
 
 JLex:
 A lexical analyzer generator for Java(TM)
 
 Elliot Berk
-Department of Computer Science, Princeton University 
+Department of Computer Science, Princeton University
 
 Version 1.2, May 5, 1997
 
@@ -1899,13 +1876,13 @@
 
 --------------------------------------------------------------------------------
 6.1 Credits
-The treatment of lexical analyzer generators given in Alan Holub's Compiler Design in C (Prentice-Hall, 1990) provided a starting point for 
-my implementation. 
+The treatment of lexical analyzer generators given in Alan Holub's Compiler Design in C (Prentice-Hall, 1990) provided a starting point for
+my implementation.
 
-Discussions with Professor Andrew Appel of the Princeton University Computer Science Department provided guidance in the design of 
-JLex. 
+Discussions with Professor Andrew Appel of the Princeton University Computer Science Department provided guidance in the design of
+JLex.
 
-Java is a trademark of Sun Microsystems Incorporated. 
+Java is a trademark of Sun Microsystems Incorporated.
 
 
 
@@ -1916,19 +1893,19 @@
 
 
 6.2 Copyright
-JLex COPYRIGHT NOTICE, LICENSE AND DISCLAIMER. 
+JLex COPYRIGHT NOTICE, LICENSE AND DISCLAIMER.
 
-Copyright 1996 by Elliot Joel Berk. 
+Copyright 1996 by Elliot Joel Berk.
 
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that both the copyright notice and this permission notice and warranty 
-disclaimer appear in supporting documentation, and that the name of Elliot Joel Berk not be used in advertising or publicity pertaining to 
-distribution of the software without specific, written prior permission. 
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that both the copyright notice and this permission notice and warranty
+disclaimer appear in supporting documentation, and that the name of Elliot Joel Berk not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior permission.
 
-Elliot Joel Berk disclaims all warranties with regard to this software, including all implied warranties of merchantability and fitness. In no 
-event shall Elliot Joel Berk be liable for any special, indirect or consequential damages or any damages whatsoever resulting from loss of use, 
-data or profits, whether in an action of contract, negligence or other tortious action, arising out of or in connection with the use or 
-performance of this software. 
+Elliot Joel Berk disclaims all warranties with regard to this software, including all implied warranties of merchantability and fitness. In no
+event shall Elliot Joel Berk be liable for any special, indirect or consequential damages or any damages whatsoever resulting from loss of use,
+data or profits, whether in an action of contract, negligence or other tortious action, arising out of or in connection with the use or
+performance of this software.
 
 
 
@@ -1942,12 +1919,12 @@
 LICENSE TERMS FOR GNU SOFTWARE THAT MAY ACCOMPANY THE ARJUNA SOFTWARE
 
 
-THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE  SOFTWARE THAT IS GNU 
-SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY THIRD PARTY PRODUCTS TERMS ASSOCIATED 
-WITH OTHER ELEMENTS OF THE SOFTWARE. 
- 
+THE TERMS AND CONDITIONS APPEARING BELOW APPLY ONLY TO THAT PORTION OF THE  SOFTWARE THAT IS GNU
+SOFTWARE AND DOES NOT OVERRIDE ANY ARJUNA SOFTWARE OR ANY THIRD PARTY PRODUCTS TERMS ASSOCIATED
+WITH OTHER ELEMENTS OF THE SOFTWARE.
+
 GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999 
+Version 2.1, February 1999
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
@@ -1957,279 +1934,279 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By 
-contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change 
-free software--to make sure the software is free for all its users. 
+The licenses for most software are designed to take away your freedom to share and change it. By
+contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
 This license, the Lesser General Public License, applies to some specially designated software packages--
-typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it 
-too, but we suggest you first think carefully about whether this license or the ordinary General Public 
-License is the better strategy to use in any particular case, based on the explanations below. 
-When we speak of free software, we are referring to freedom of use, not price. Our General Public 
-Licenses are designed to make sure that you have the freedom to distribute copies of free software (and 
-charge for this service if you wish); that you receive source code or can get it if you want it; that you can 
-change the software and use pieces of it in new free programs; and that you are informed that you can do 
-these things. 
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to 
-ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you 
-distribute copies of the library or if you modify it. 
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the 
-recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source 
-code. If you link other code with the library, you must provide complete object files to the recipients, so 
-that they can relink them with the library after making changes to the library and recompiling it. And you 
-must show them these terms so they know their rights. 
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this 
-license, which gives you legal permission to copy, distribute and/or modify the library. 
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. 
-Also, if the library is modified by someone else and passed on, the recipients should know that what they 
-have is not the original version, so that the original author's reputation will not be affected by problems 
-that might be introduced by others. 
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make 
-sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive 
-license from a patent holder. Therefore, we insist that any patent license obtained for a version of the 
-library must be consistent with the full freedom of use specified in this license. 
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. 
-This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite 
-different from the ordinary General Public License. We use this license for certain libraries in order to 
-permit linking those libraries into non-free programs. 
-When a program is linked with a library, whether statically or using a shared library, the combination of 
-the two is legally speaking a combined work, a derivative of the original library. The ordinary General 
-Public License therefore permits such linking only if the entire combination fits its criteria of freedom. 
-The Lesser General Public License permits more lax criteria for linking other code with the library. 
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom 
-than the ordinary General Public License. It also provides other free software developers Less of an 
-advantage over competing non-free programs. These disadvantages are the reason we use the ordinary 
-General Public License for many libraries. However, the Lesser license provides advantages in certain 
-special circumstances. 
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a 
-certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed 
-to use the library. A more frequent case is that a free library does the same job as widely used non-free 
-libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the 
-Lesser General Public License. 
-In other cases, permission to use a particular library in non-free programs enables a greater number of 
+typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it
+too, but we suggest you first think carefully about whether this license or the ordinary General Public
+License is the better strategy to use in any particular case, based on the explanations below.
+When we speak of free software, we are referring to freedom of use, not price. Our General Public
+Licenses are designed to make sure that you have the freedom to distribute copies of free software (and
+charge for this service if you wish); that you receive source code or can get it if you want it; that you can
+change the software and use pieces of it in new free programs; and that you are informed that you can do
+these things.
+To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to
+ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you
+distribute copies of the library or if you modify it.
+For example, if you distribute copies of the library, whether gratis or for a fee, you must give the
+recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide complete object files to the recipients, so
+that they can relink them with the library after making changes to the library and recompiling it. And you
+must show them these terms so they know their rights.
+We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this
+license, which gives you legal permission to copy, distribute and/or modify the library.
+To protect each distributor, we want to make it very clear that there is no warranty for the free library.
+Also, if the library is modified by someone else and passed on, the recipients should know that what they
+have is not the original version, so that the original author's reputation will not be affected by problems
+that might be introduced by others.
+Finally, software patents pose a constant threat to the existence of any free program. We wish to make
+sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive
+license from a patent holder. Therefore, we insist that any patent license obtained for a version of the
+library must be consistent with the full freedom of use specified in this license.
+Most GNU software, including some libraries, is covered by the ordinary GNU General Public License.
+This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite
+different from the ordinary General Public License. We use this license for certain libraries in order to
+permit linking those libraries into non-free programs.
+When a program is linked with a library, whether statically or using a shared library, the combination of
+the two is legally speaking a combined work, a derivative of the original library. The ordinary General
+Public License therefore permits such linking only if the entire combination fits its criteria of freedom.
+The Lesser General Public License permits more lax criteria for linking other code with the library.
+We call this license the "Lesser" General Public License because it does Less to protect the user's freedom
+than the ordinary General Public License. It also provides other free software developers Less of an
+advantage over competing non-free programs. These disadvantages are the reason we use the ordinary
+General Public License for many libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+For example, on rare occasions, there may be a special need to encourage the widest possible use of a
+certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed
+to use the library. A more frequent case is that a free library does the same job as widely used non-free
+libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the
+Lesser General Public License.
+In other cases, permission to use a particular library in non-free programs enables a greater number of
 people to use a large body of free software. For example, permission to use the GNU C Library in non-
-free programs enables many more people to use the whole GNU operating system, as well as its variant, 
-the GNU/Linux operating system. 
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that 
-the user of a program that is linked with the Library has the freedom and the wherewithal to run that 
-program using a modified version of the Library. 
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to 
-the difference between a "work based on the library" and a "work that uses the library". The former 
-contains code derived from the library, whereas the latter must be combined with the library in order to 
-run. 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION 
+free programs enables many more people to use the whole GNU operating system, as well as its variant,
+the GNU/Linux operating system.
+Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that
+the user of a program that is linked with the Library has the freedom and the wherewithal to run that
+program using a modified version of the Library.
+The precise terms and conditions for copying, distribution and modification follow. Pay close attention to
+the difference between a "work based on the library" and a "work that uses the library". The former
+contains code derived from the library, whereas the latter must be combined with the library in order to
+run.
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION
 AND MODIFICATION
-0. This License Agreement applies to any software library or other program which contains a notice 
-placed by the copyright holder or other authorized party saying it may be distributed under the terms of 
-this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". 
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked 
-with application programs (which use some of those functions and data) to form executables. 
-The "Library", below, refers to any such software library or work which has been distributed under these 
-terms. A "work based on the Library" means either the Library or any derivative work under copyright 
-law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications 
-and/or translated straightforwardly into another language. (Hereinafter, translation is included without 
-limitation in the term "modification".) 
-"Source code" for a work means the preferred form of the work for making modifications to it. For a 
-library, complete source code means all the source code for all modules it contains, plus any associated 
-interface definition files, plus the scripts used to control compilation and installation of the library. 
-Activities other than copying, distribution and modification are not covered by this License; they are 
-outside its scope. The act of running a program using the Library is not restricted, and output from such a 
-program is covered only if its contents constitute a work based on the Library (independent of the use of 
-the Library in a tool for writing it). Whether that is true depends on what the Library does and what the 
-program that uses the Library does. 
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in 
-any medium, provided that you conspicuously and appropriately publish on each copy an appropriate 
-copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the 
-absence of any warranty; and distribute a copy of this License along with the Library. 
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer 
-warranty protection in exchange for a fee. 
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on 
-the Library, and copy and distribute such modifications or work under the terms of Section 1 above, 
-provided that you also meet all of these conditions: 
-?	a) The modified work must itself be a software library. 
-?	b) You must cause the files modified to carry prominent notices stating that you changed the files 
-and the date of any change. 
-?	c) You must cause the whole of the work to be licensed at no charge to all third parties under the 
-terms of this License. 
-?	d) If a facility in the modified Library refers to a function or a table of data to be supplied by an 
-application program that uses the facility, other than as an argument passed when the facility is 
-invoked, then you must make a good faith effort to ensure that, in the event an application does 
-not supply such function or table, the facility still operates, and performs whatever part of its 
-purpose remains meaningful. 
+0. This License Agreement applies to any software library or other program which contains a notice
+placed by the copyright holder or other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
+A "library" means a collection of software functions and/or data prepared so as to be conveniently linked
+with application programs (which use some of those functions and data) to form executables.
+The "Library", below, refers to any such software library or work which has been distributed under these
+terms. A "work based on the Library" means either the Library or any derivative work under copyright
+law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications
+and/or translated straightforwardly into another language. (Hereinafter, translation is included without
+limitation in the term "modification".)
+"Source code" for a work means the preferred form of the work for making modifications to it. For a
+library, complete source code means all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation and installation of the library.
+Activities other than copying, distribution and modification are not covered by this License; they are
+outside its scope. The act of running a program using the Library is not restricted, and output from such a
+program is covered only if its contents constitute a work based on the Library (independent of the use of
+the Library in a tool for writing it). Whether that is true depends on what the Library does and what the
+program that uses the Library does.
+1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in
+any medium, provided that you conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the
+absence of any warranty; and distribute a copy of this License along with the Library.
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer
+warranty protection in exchange for a fee.
+2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on
+the Library, and copy and distribute such modifications or work under the terms of Section 1 above,
+provided that you also meet all of these conditions:
+?	a) The modified work must itself be a software library.
+?	b) You must cause the files modified to carry prominent notices stating that you changed the files
+and the date of any change.
+?	c) You must cause the whole of the work to be licensed at no charge to all third parties under the
+terms of this License.
+?	d) If a facility in the modified Library refers to a function or a table of data to be supplied by an
+application program that uses the facility, other than as an argument passed when the facility is
+invoked, then you must make a good faith effort to ensure that, in the event an application does
+not supply such function or table, the facility still operates, and performs whatever part of its
+purpose remains meaningful.
 (For example, a function in a library to compute square roots has a purpose that is entirely well-
 defined independent of the application. Therefore, Subsection 2d requires that any application-
-supplied function or table used by this function must be optional: if the application does not 
-supply it, the square root function must still compute square roots.) 
-These requirements apply to the modified work as a whole. If identifiable sections of that work are 
-not derived from the Library, and can be reasonably considered independent and separate works in 
-themselves, then this License, and its terms, do not apply to those sections when you distribute 
-them as separate works. But when you distribute the same sections as part of a whole which is a 
-work based on the Library, the distribution of the whole must be on the terms of this License, 
-whose permissions for other licensees extend to the entire whole, and thus to each and every part 
-regardless of who wrote it. 
-Thus, it is not the intent of this section to claim rights or contest your rights to work written 
-entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or 
-collective works based on the Library. 
-In addition, mere aggregation of another work not based on the Library with the Library (or with a 
-work based on the Library) on a volume of a storage or distribution medium does not bring the 
-other work under the scope of this License. 
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to 
-a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they 
-refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer 
-version than version 2 of the ordinary GNU General Public License has appeared, then you can specify 
-that version instead if you wish.) Do not make any other change in these notices. 
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General 
-Public License applies to all subsequent copies and derivative works made from that copy. 
-This option is useful when you wish to copy part of the code of the Library into a program that is not a 
-library. 
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object 
-code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with 
-the complete corresponding machine-readable source code, which must be distributed under the terms of 
-Sections 1 and 2 above on a medium customarily used for software interchange. 
-If distribution of object code is made by offering access to copy from a designated place, then offering 
-equivalent access to copy the source code from the same place satisfies the requirement to distribute the 
-source code, even though third parties are not compelled to copy the source along with the object code. 
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the 
-Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in 
-isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. 
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative 
-of the Library (because it contains portions of the Library), rather than a "work that uses the library". The 
-executable is therefore covered by this License. Section 6 states terms for distribution of such executables. 
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object 
-code for the work may be a derivative work of the Library even though the source code is not. Whether 
-this is true is especially significant if the work can be linked without the Library, or if the work is itself a 
-library. The threshold for this to be true is not precisely defined by law. 
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small 
-macros and small inline functions (ten lines or less in length), then the use of the object file is 
-unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code 
-plus portions of the Library will still fall under Section 6.) 
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work 
-under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or 
-not they are linked directly with the Library itself. 
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" 
-with the Library to produce a work containing portions of the Library, and distribute that work under 
-terms of your choice, provided that the terms permit modification of the work for the customer's own use 
-and reverse engineering for debugging such modifications. 
-You must give prominent notice with each copy of the work that the Library is used in it and that the 
-Library and its use are covered by this License. You must supply a copy of this License. If the work 
-during execution displays copyright notices, you must include the copyright notice for the Library among 
-them, as well as a reference directing the user to the copy of this License. Also, you must do one of these 
-things: 
-?	a) Accompany the work with the complete corresponding machine-readable source code for the 
-Library including whatever changes were used in the work (which must be distributed under 
-Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the 
-complete machine-readable "work that uses the Library", as object code and/or source code, so 
-that the user can modify the Library and then relink to produce a modified executable containing 
-the modified Library. (It is understood that the user who changes the contents of definitions files 
-in the Library will not necessarily be able to recompile the application to use the modified 
-definitions.) 
-?	b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is 
-one that (1) uses at run time a copy of the library already present on the user's computer system, 
-rather than copying library functions into the executable, and (2) will operate properly with a 
+supplied function or table used by this function must be optional: if the application does not
+supply it, the square root function must still compute square roots.)
+These requirements apply to the modified work as a whole. If identifiable sections of that work are
+not derived from the Library, and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same sections as part of a whole which is a
+work based on the Library, the distribution of the whole must be on the terms of this License,
+whose permissions for other licensees extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+Thus, it is not the intent of this section to claim rights or contest your rights to work written
+entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or
+collective works based on the Library.
+In addition, mere aggregation of another work not based on the Library with the Library (or with a
+work based on the Library) on a volume of a storage or distribution medium does not bring the
+other work under the scope of this License.
+3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to
+a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they
+refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer
+version than version 2 of the ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in these notices.
+Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General
+Public License applies to all subsequent copies and derivative works made from that copy.
+This option is useful when you wish to copy part of the code of the Library into a program that is not a
+library.
+4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object
+code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with
+the complete corresponding machine-readable source code, which must be distributed under the terms of
+Sections 1 and 2 above on a medium customarily used for software interchange.
+If distribution of object code is made by offering access to copy from a designated place, then offering
+equivalent access to copy the source code from the same place satisfies the requirement to distribute the
+source code, even though third parties are not compelled to copy the source along with the object code.
+5. A program that contains no derivative of any portion of the Library, but is designed to work with the
+Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in
+isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
+However, linking a "work that uses the Library" with the Library creates an executable that is a derivative
+of the Library (because it contains portions of the Library), rather than a "work that uses the library". The
+executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
+When a "work that uses the Library" uses material from a header file that is part of the Library, the object
+code for the work may be a derivative work of the Library even though the source code is not. Whether
+this is true is especially significant if the work can be linked without the Library, or if the work is itself a
+library. The threshold for this to be true is not precisely defined by law.
+If such an object file uses only numerical parameters, data structure layouts and accessors, and small
+macros and small inline functions (ten lines or less in length), then the use of the object file is
+unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code
+plus portions of the Library will still fall under Section 6.)
+Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work
+under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or
+not they are linked directly with the Library itself.
+6. As an exception to the Sections above, you may also combine or link a "work that uses the Library"
+with the Library to produce a work containing portions of the Library, and distribute that work under
+terms of your choice, provided that the terms permit modification of the work for the customer's own use
+and reverse engineering for debugging such modifications.
+You must give prominent notice with each copy of the work that the Library is used in it and that the
+Library and its use are covered by this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the copyright notice for the Library among
+them, as well as a reference directing the user to the copy of this License. Also, you must do one of these
+things:
+?	a) Accompany the work with the complete corresponding machine-readable source code for the
+Library including whatever changes were used in the work (which must be distributed under
+Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the
+complete machine-readable "work that uses the Library", as object code and/or source code, so
+that the user can modify the Library and then relink to produce a modified executable containing
+the modified Library. (It is understood that the user who changes the contents of definitions files
+in the Library will not necessarily be able to recompile the application to use the modified
+definitions.)
+?	b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is
+one that (1) uses at run time a copy of the library already present on the user's computer system,
+rather than copying library functions into the executable, and (2) will operate properly with a
 modified version of the library, if the user installs one, as long as the modified version is interface-
-compatible with the version that the work was made with. 
-?	c) Accompany the work with a written offer, valid for at least three years, to give the same user 
-the materials specified in Subsection 6a, above, for a charge no more than the cost of performing 
-this distribution. 
-?	d) If distribution of the work is made by offering access to copy from a designated place, offer 
-equivalent access to copy the above specified materials from the same place. 
-?	e) Verify that the user has already received a copy of these materials or that you have already sent 
-this user a copy. 
-For an executable, the required form of the "work that uses the Library" must include any data and utility 
-programs needed for reproducing the executable from it. However, as a special exception, the materials to 
-be distributed need not include anything that is normally distributed (in either source or binary form) with 
-the major components (compiler, kernel, and so on) of the operating system on which the executable runs, 
-unless that component itself accompanies the executable. 
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that 
-do not normally accompany the operating system. Such a contradiction means you cannot use both them 
-and the Library together in an executable that you distribute. 
-7. You may place library facilities that are a work based on the Library side-by-side in a single library 
-together with other library facilities not covered by this License, and distribute such a combined library, 
-provided that the separate distribution of the work based on the Library and of the other library facilities is 
-otherwise permitted, and provided that you do these two things: 
-?	a) Accompany the combined library with a copy of the same work based on the Library, 
-uncombined with any other library facilities. This must be distributed under the terms of the 
-Sections above. 
-?	b) Give prominent notice with the combined library of the fact that part of it is a work based on 
-the Library, and explaining where to find the accompanying uncombined form of the same work. 
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided 
-under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library 
-is void, and will automatically terminate your rights under this License. However, parties who have 
-received copies, or rights, from you under this License will not have their licenses terminated so long as 
-such parties remain in full compliance. 
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants 
-you permission to modify or distribute the Library or its derivative works. These actions are prohibited by 
-law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work 
-based on the Library), you indicate your acceptance of this License to do so, and all its terms and 
-conditions for copying, distributing or modifying the Library or works based on it. 
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically 
-receives a license from the original licensor to copy, distribute, link with or modify the Library subject to 
-these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the 
-rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason 
-(not limited to patent issues), conditions are imposed on you (whether by court order, agreement or 
-otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of 
-this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License 
-and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For 
-example, if a patent license would not permit royalty-free redistribution of the Library by all those who 
-receive copies directly or indirectly through you, then the only way you could satisfy both it and this 
-License would be to refrain entirely from distribution of the Library. 
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the 
-balance of the section is intended to apply, and the section as a whole is intended to apply in other 
-circumstances. 
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or 
-to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the 
-free software distribution system which is implemented by public license practices. Many people have 
-made generous contributions to the wide range of software distributed through that system in reliance on 
-consistent application of that system; it is up to the author/donor to decide if he or she is willing to 
-distribute software through any other system and a licensee cannot impose that choice. 
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this 
-License. 
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by 
-copyrighted interfaces, the original copyright holder who places the Library under this License may add 
-an explicit geographical distribution limitation excluding those countries, so that distribution is permitted 
-only in or among countries not thus excluded. In such case, this License incorporates the limitation as if 
-written in the body of this License. 
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public 
-License from time to time. Such new versions will be similar in spirit to the present version, but may 
-differ in detail to address new problems or concerns. 
-Each version is given a distinguishing version number. If the Library specifies a version number of this 
-License which applies to it and "any later version", you have the option of following the terms and 
-conditions either of that version or of any later version published by the Free Software Foundation. If the 
-Library does not specify a license version number, you may choose any version ever published by the 
-Free Software Foundation. 
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions 
-are incompatible with these, write to the author to ask for permission. For software which is copyrighted 
-by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions 
-for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our 
-free software and of promoting the sharing and reuse of software generally. 
-NO WARRANTY 
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR 
-THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
-PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO 
-THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE 
-LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 
-REPAIR OR CORRECTION. 
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
-REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES 
-ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT 
-LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES 
-SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE 
-WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN 
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+compatible with the version that the work was made with.
+?	c) Accompany the work with a written offer, valid for at least three years, to give the same user
+the materials specified in Subsection 6a, above, for a charge no more than the cost of performing
+this distribution.
+?	d) If distribution of the work is made by offering access to copy from a designated place, offer
+equivalent access to copy the above specified materials from the same place.
+?	e) Verify that the user has already received a copy of these materials or that you have already sent
+this user a copy.
+For an executable, the required form of the "work that uses the Library" must include any data and utility
+programs needed for reproducing the executable from it. However, as a special exception, the materials to
+be distributed need not include anything that is normally distributed (in either source or binary form) with
+the major components (compiler, kernel, and so on) of the operating system on which the executable runs,
+unless that component itself accompanies the executable.
+It may happen that this requirement contradicts the license restrictions of other proprietary libraries that
+do not normally accompany the operating system. Such a contradiction means you cannot use both them
+and the Library together in an executable that you distribute.
+7. You may place library facilities that are a work based on the Library side-by-side in a single library
+together with other library facilities not covered by this License, and distribute such a combined library,
+provided that the separate distribution of the work based on the Library and of the other library facilities is
+otherwise permitted, and provided that you do these two things:
+?	a) Accompany the combined library with a copy of the same work based on the Library,
+uncombined with any other library facilities. This must be distributed under the terms of the
+Sections above.
+?	b) Give prominent notice with the combined library of the fact that part of it is a work based on
+the Library, and explaining where to find the accompanying uncombined form of the same work.
+8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided
+under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library
+is void, and will automatically terminate your rights under this License. However, parties who have
+received copies, or rights, from you under this License will not have their licenses terminated so long as
+such parties remain in full compliance.
+9. You are not required to accept this License, since you have not signed it. However, nothing else grants
+you permission to modify or distribute the Library or its derivative works. These actions are prohibited by
+law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work
+based on the Library), you indicate your acceptance of this License to do so, and all its terms and
+conditions for copying, distributing or modifying the Library or works based on it.
+10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically
+receives a license from the original licensor to copy, distribute, link with or modify the Library subject to
+these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
+11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason
+(not limited to patent issues), conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of
+this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License
+and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For
+example, if a patent license would not permit royalty-free redistribution of the Library by all those who
+receive copies directly or indirectly through you, then the only way you could satisfy both it and this
+License would be to refrain entirely from distribution of the Library.
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the
+balance of the section is intended to apply, and the section as a whole is intended to apply in other
+circumstances.
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or
+to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the
+free software distribution system which is implemented by public license practices. Many people have
+made generous contributions to the wide range of software distributed through that system in reliance on
+consistent application of that system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that choice.
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this
+License.
+12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by
+copyrighted interfaces, the original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries, so that distribution is permitted
+only in or among countries not thus excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public
+License from time to time. Such new versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number. If the Library specifies a version number of this
+License which applies to it and "any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by the Free Software Foundation. If the
+Library does not specify a license version number, you may choose any version ever published by the
+Free Software Foundation.
+14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions
+are incompatible with these, write to the author to ask for permission. For software which is copyrighted
+by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions
+for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our
+free software and of promoting the sharing and reuse of software generally.
+NO WARRANTY
+15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO
+THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE
+LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT
+LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES
+SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE
+WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 END OF TERMS AND CONDITIONS
 How to Apply These Terms to Your New Libraries
-If you develop a new library, and you want it to be of the greatest possible use to the public, we 
-recommend making it free software that everyone can redistribute and change. You can do so by 
-permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General 
-Public License). 
-To apply these terms, attach the following notices to the library. It is safest to attach them to the start of 
-each source file to most effectively convey the exclusion of warranty; and each file should have at least 
-the "copyright" line and a pointer to where the full notice is found. 
+If you develop a new library, and you want it to be of the greatest possible use to the public, we
+recommend making it free software that everyone can redistribute and change. You can do so by
+permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General
+Public License).
+To apply these terms, attach the following notices to the library. It is safest to attach them to the start of
+each source file to most effectively convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
 one line to give the library's name and an idea of what it does.
 Copyright (C) year  name of author
 
@@ -2246,16 +2223,16 @@
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Also add information on how to contact you by electronic and paper mail. 
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a 
-"copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: 
+Also add information on how to contact you by electronic and paper mail.
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a
+"copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:
 Yoyodyne, Inc., hereby disclaims all copyright interest in
 the library `Frob' (a library for tweaking knobs) written
 by James Random Hacker.
 
 signature of Ty Coon, 1 April 1990
 Ty Coon, President of Vice
-That's all there is to it! 
+That's all there is to it!
 
 -------------------------------------------------------------------------------
 Java Service Wrapper licence:
@@ -2264,22 +2241,22 @@
 
 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, sub-license, and/or 
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sub-license, and/or
 sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following 
+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 
-NON-INFRINGEMENT. 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 
+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
+NON-INFRINGEMENT. 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.
 




More information about the jboss-svn-commits mailing list