Format text

Signed-off-by: Mattias Andrée <m@maandree.se>

3 files changed, 483 insertions, 95 deletions

diff --git a/common/Frameworx b/common/Frameworx
index 26fea49..ed65f12 100644
--- a/common/Frameworx
+++ b/common/Frameworx
@@ -1,67 +1,196 @@
 THE FRAMEWORX OPEN LICENSE 1.0 (Frameworx-1.0)
-This License Agreement, The Frameworx Open License 1.0, has been entered into between The Frameworx Company and you, the licensee hereunder, effective as of Your acceptance of the Frameworx Code Base or an Downstream Distribution (each as defined below).
+
+This License Agreement, The Frameworx Open License 1.0, has been
+entered into between The Frameworx Company and you, the licensee
+hereunder, effective as of Your acceptance of the Frameworx Code Base
+or an Downstream Distribution (each as defined below).
 
 AGREEMENT BACKGROUND
-The Frameworx Company is committed to the belief that open source software results in better quality, greater technical and product innovation in the market place and a more empowered and productive developer and end-user community. Our objective is to ensure that the Frameworx Code Base, and the source code for improvements and innovations to it, remain free and open to the community.To further these beliefs and objectives, we are distributing the Frameworx Code Base, without royalties and in source code form, to the community pursuant to this License Agreement.
+The Frameworx Company is committed to the belief that open source
+software results in better quality, greater technical and product
+innovation in the market place and a more empowered and productive
+developer and end-user community. Our objective is to ensure that the
+Frameworx Code Base, and the source code for improvements and
+innovations to it, remain free and open to the community.To further
+these beliefs and objectives, we are distributing the Frameworx Code
+Base, without royalties and in source code form, to the community
+pursuant to this License Agreement.
 
 AGREEMENT TERMS
 The Frameworx Company and You have agreed as follows:
-1.Definitions.The following terms have the following respective meanings:
-
-(a)     Frameworx Code Base means the software developed by The Frameworx Company and made available under this License Agreement
-
-(b)     Downstream Distribution means any direct or indirect release, distribution or remote availability of software (i) that directly or indirectly contains, or depends for its intended functioning on, the Frameworx Code Base or any portion or element thereof and (ii) in which rights to use and distribute such Frameworx Code Base software depend, directly or indirectly, on the License provided in Section 2 below.
-
-(c)     "Source Code" to any software means the preferred form for making modifications to that software, including any associated documentation, interface definition files and compilation or installation scripts, or any version thereof that has been compressed or archived, and can be reconstituted, using an appropriate and generally available archival or compression technology.
-
-(d)     Value-Added Services means any commercial or fee-based software-related service, including without limitation: system or application development or consulting; technical or end-user support or training; distribution maintenance, configuration or versioning; or outsourced, hosted or network-based application services.
-
-2. License Grant. Subject to the terms and conditions hereof, The Frameworx Company hereby grants You a non-exclusive license (the License), subject to third party intellectual property claims, and for no fee other than a nominal charge reflecting the costs of physical distribution, to:
-
-(a)     use the Frameworx Code Base, in either Source Code or machine-readable form;
-
-(b)     make modifications, additions and deletions to the content or structure of the Frameworx Code Base; or
-
-(c)     create larger works or derivative works including the Frameworx Code Base or any portion or element thereof; and
-
-(d)     release, distribute or make available, either generally or to any specific third-party, any of the foregoing in Source Code or binary form.
-
-3. License Conditions. The grant of the License under Section 1 hereof, and your exercise of all rights in connection with this License Agreement, will remain subject to the following terms and conditions, as well as to the other provisions hereof:
-
-(a)     Complete Source Code for any Downstream Distribution directly or indirectly made by You that contains, or depends for its intended functionality on, the Frameworx Code Base, or any portion or element thereof, shall be made freely available to all users thereof on terms and conditions no more restrictive, and no less favorable for any user (including, without limitation, with regard to Source Code availability and royalty-free use) than those terms and conditions provided in this License Agreement.
-
-(b)     Any Value-Added Services that you offer or provide, directly or indirectly, in relation to any Downstream Distribution shall be offered and provided on commercial terms that are reasonably commensurate to the fair market value of such Value-Added Services. In addition, the terms and conditions on which any such Value Added Services are so offered or provided shall be consistent with, and shall fully support, the intent and purpose of this License Agreement.
-
-(c)     All Downstream Distributions shall:
-
-                               (i)            include all portions and elements of the Frameworx Code Base required to build the Source Code of such Downstream Distribution into a fully functional machine-executable system, or additional build scripts or comparable software necessary and sufficient for such purposes;
-
-                             (ii)            include, in each file containing any portion or element of the Frameworx Code Base, the following identifying legend: This file contains software that has been made available under The Frameworx Open License 1.0. Use and distribution hereof are subject to the restrictions set forth therein.
-
-                            (iii)            include all other copyright notices, authorship credits, warranty disclaimers (including that provided in Section 6 below), legends, documentation, annotations and comments contained in the Frameworx Code Base as provided to You hereunder;
-
-                            (iv)            contain an unaltered copy of the html file named frameworx_community_invitation.html included within the Frameworx Code Base that acknowledges new users and provides them with information on the Frameworx Code Base community;
-
-                              (v)            contain an unaltered copy of the text file named the_frameworx_license.txt included within the Frameworx Code Base that includes a text copy of the form of this License Agreement; and
-
-                            (vi)            prominently display to any viewer or user of the Source Code of such Open Downstream Distribution, in the place and manner normally used for such displays, the following legend:
-
-Source code licensed under from The Frameworx Company is contained herein, and such source code has been obtained either under The Frameworx Open License, or another license granted by The Frameworx Company. Use and distribution hereof is subject to the restrictions provided in the relevant such license and to the copyrights of the licensor thereunder. A copy of The Frameworx Open License is provided in a file named the_frameworx_license.txt and included herein, and may also be available for inspection at http://www.frameworx.com.
-
-4. Restrictions on Open Downstream Distributions. Each Downstream Distribution made by You, and by any party directly or indirectly obtaining rights to the Frameworx Code Base through You, shall be made subject to a license grant or agreement to the extent necessary so that each distributee under that Downstream Distribution will be subject to the same restrictions on re-distribution and use as are binding on You hereunder. You may satisfy this licensing requirement either by:
-
-(a)     requiring as a condition to any Downstream Distribution made by you, or by any direct or indirect distributee of Your Downstream Distribution (or any portion or element thereof), that each distributee under the relevant Downstream Distribution obtain a direct license (on the same terms and conditions as those in this License Agreement) from The Frameworx Company; or
-
-(b)     sub-licensing all (and not less than all) of Your rights and obligations hereunder to that distributee, including (without limitation) Your obligation to require distributees to be bound by license restrictions as contemplated by this Section 4 above.
-
-The Frameworx Company hereby grants to you all rights to sub-license your rights hereunder as necessary to fully effect the intent and purpose of this Section 4 above, provided, however, that your rights and obligations hereunder shall be unaffected by any such sublicensing. In addition, The Frameworx Company expressly retains all rights to take all appropriate action (including legal action) against any such direct or indirect sub-licensee to ensure its full compliance with the intent and purposes of this License Agreement.
-
-5. Intellectual Property. Except as expressly provided herein, this License Agreement preserves and respects Your and The Frameworx Companys respective intellectual property rights, including, in the case of The Frameworx Company, its copyrights and patent rights relating to the Frameworx Code Base.
-
-6. Warranty Disclaimer. THE SOFTWARE LICENSED HEREUNDER IS PROVIDED ``AS IS.'' ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT, ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE LICENSOR OF THIS SOFTWARE, 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.
-
-7. License Violation. The License, and all of your rights thereunder, shall be deemed automatically terminated and void as of any Downstream Distribution directly or indirectly made or facilitated by You that violates the provisions of this License Agreement, provided, however, that this License Agreement shall survive any such termination in order to remedy the effects of such violation. This License Agreement shall be binding on the legal successors and assigns of the parties hereto.
-
-Your agreement to the foregoing as of the date hereof has been evidenced by your acceptance of the relevant software distribution hereunder.
+1. Definitions.The following terms have the following respective
+meanings:
+
+  (a) Frameworx Code Base means the software developed by The
+  Frameworx Company and made available under this License Agreement
+
+  (b) Downstream Distribution means any direct or indirect release,
+  distribution or remote availability of software (i) that directly or
+  indirectly contains, or depends for its intended functioning on, the
+  Frameworx Code Base or any portion or element thereof and (ii) in
+  which rights to use and distribute such Frameworx Code Base software
+  depend, directly or indirectly, on the License provided in Section 2
+  below.
+
+  (c) "Source Code" to any software means the preferred form for
+  making modifications to that software, including any associated
+  documentation, interface definition files and compilation or
+  installation scripts, or any version thereof that has been
+  compressed or archived, and can be reconstituted, using an
+  appropriate and generally available archival or compression
+  technology.
+
+  (d) Value-Added Services means any commercial or fee-based
+  software-related service, including without limitation: system or
+  application development or consulting; technical or end-user support
+  or training; distribution maintenance, configuration or versioning;
+  or outsourced, hosted or network-based application services.
+
+2. License Grant. Subject to the terms and conditions hereof, The
+Frameworx Company hereby grants You a non-exclusive license (the
+License), subject to third party intellectual property claims, and for
+no fee other than a nominal charge reflecting the costs of physical
+distribution, to:
+
+  (a) use the Frameworx Code Base, in either Source Code or
+  machine-readable form;
+
+  (b) make modifications, additions and deletions to the content or
+  structure of the Frameworx Code Base; or
+
+  (c) create larger works or derivative works including the Frameworx
+  Code Base or any portion or element thereof; and
+
+  (d) release, distribute or make available, either generally or to
+  any specific third-party, any of the foregoing in Source Code or
+  binary form.
+
+3. License Conditions. The grant of the License under Section 1
+hereof, and your exercise of all rights in connection with this
+License Agreement, will remain subject to the following terms and
+conditions, as well as to the other provisions hereof:
+
+  (a) Complete Source Code for any Downstream Distribution directly or
+  indirectly made by You that contains, or depends for its intended
+  functionality on, the Frameworx Code Base, or any portion or element
+  thereof, shall be made freely available to all users thereof on
+  terms and conditions no more restrictive, and no less favorable for
+  any user (including, without limitation, with regard to Source Code
+  availability and royalty-free use) than those terms and conditions
+  provided in this License Agreement.
+
+  (b) Any Value-Added Services that you offer or provide, directly or
+  indirectly, in relation to any Downstream Distribution shall be
+  offered and provided on commercial terms that are reasonably
+  commensurate to the fair market value of such Value-Added
+  Services. In addition, the terms and conditions on which any such
+  Value Added Services are so offered or provided shall be consistent
+  with, and shall fully support, the intent and purpose of this
+  License Agreement.
+
+  (c) All Downstream Distributions shall:
+
+    (i) include all portions and elements of the Frameworx Code Base
+    required to build the Source Code of such Downstream Distribution
+    into a fully functional machine-executable system, or additional
+    build scripts or comparable software necessary and sufficient for
+    such purposes;
+
+    (ii) include, in each file containing any portion or element of
+    the Frameworx Code Base, the following identifying legend: This
+    file contains software that has been made available under The
+    Frameworx Open License 1.0. Use and distribution hereof are
+    subject to the restrictions set forth therein.
+
+    (iii) include all other copyright notices, authorship credits,
+    warranty disclaimers (including that provided in Section 6 below),
+    legends, documentation, annotations and comments contained in the
+    Frameworx Code Base as provided to You hereunder;
+
+    (iv) contain an unaltered copy of the html file named
+    frameworx_community_invitation.html included within the Frameworx
+    Code Base that acknowledges new users and provides them with
+    information on the Frameworx Code Base community;
+
+    (v) contain an unaltered copy of the text file named
+    the_frameworx_license.txt included within the Frameworx Code Base
+    that includes a text copy of the form of this License Agreement;
+    and
+
+    (vi) prominently display to any viewer or user of the Source Code
+    of such Open Downstream Distribution, in the place and manner
+    normally used for such displays, the following legend:
+
+      Source code licensed under from The Frameworx Company is
+      contained herein, and such source code has been obtained either
+      under The Frameworx Open License, or another license granted by
+      The Frameworx Company. Use and distribution hereof is subject to
+      the restrictions provided in the relevant such license and to
+      the copyrights of the licensor thereunder. A copy of The
+      Frameworx Open License is provided in a file named
+      the_frameworx_license.txt and included herein, and may also be
+      available for inspection at http://www.frameworx.com.
+
+4. Restrictions on Open Downstream Distributions. Each Downstream
+Distribution made by You, and by any party directly or indirectly
+obtaining rights to the Frameworx Code Base through You, shall be made
+subject to a license grant or agreement to the extent necessary so
+that each distributee under that Downstream Distribution will be
+subject to the same restrictions on re-distribution and use as are
+binding on You hereunder. You may satisfy this licensing requirement
+either by:
+
+  (a) requiring as a condition to any Downstream Distribution made by
+  you, or by any direct or indirect distributee of Your Downstream
+  Distribution (or any portion or element thereof), that each
+  distributee under the relevant Downstream Distribution obtain a
+  direct license (on the same terms and conditions as those in this
+  License Agreement) from The Frameworx Company; or
+
+  (b) sub-licensing all (and not less than all) of Your rights and
+  obligations hereunder to that distributee, including (without
+  limitation) Your obligation to require distributees to be bound by
+  license restrictions as contemplated by this Section 4 above.
+
+The Frameworx Company hereby grants to you all rights to sub-license
+your rights hereunder as necessary to fully effect the intent and
+purpose of this Section 4 above, provided, however, that your rights
+and obligations hereunder shall be unaffected by any such
+sublicensing. In addition, The Frameworx Company expressly retains all
+rights to take all appropriate action (including legal action) against
+any such direct or indirect sub-licensee to ensure its full compliance
+with the intent and purposes of this License Agreement.
+
+5. Intellectual Property. Except as expressly provided herein, this
+License Agreement preserves and respects Your and The Frameworx
+Companys respective intellectual property rights, including, in the
+case of The Frameworx Company, its copyrights and patent rights
+relating to the Frameworx Code Base.
+
+6. Warranty Disclaimer. THE SOFTWARE LICENSED HEREUNDER IS PROVIDED
+``AS IS.'' ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, AND NON-INFRINGEMENT, ARE HEREBY DISCLAIMED. IN NO
+EVENT SHALL THE LICENSOR OF THIS SOFTWARE, 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.
+
+7. License Violation. The License, and all of your rights thereunder,
+shall be deemed automatically terminated and void as of any Downstream
+Distribution directly or indirectly made or facilitated by You that
+violates the provisions of this License Agreement, provided, however,
+that this License Agreement shall survive any such termination in
+order to remedy the effects of such violation. This License Agreement
+shall be binding on the legal successors and assigns of the parties
+hereto.
+
+Your agreement to the foregoing as of the date hereof has been
+evidenced by your acceptance of the relevant software distribution
+hereunder.
 
 (C) THE FRAMEWORX COMPANY 2003
diff --git a/common/YPL1.0 b/common/YPL1.0
index 4693eb7..9000a75 100644
--- a/common/YPL1.0
+++ b/common/YPL1.0
@@ -1,47 +1,177 @@
 Yahoo! Public License, Version 1.0 (YPL)
-This Yahoo! Public License (this "Agreement") is a legal agreement that describes the terms under which Yahoo! Inc., a Delaware corporation having its principal place of business at 701 First Avenue, Sunnyvale, California 94089 ("Yahoo!") will provide software to you via download or otherwise ("Software"). By using the Software, you, an individual or an entity ("You") agree to the terms of this Agreement.
 
-In consideration of the mutual promises and upon the terms and conditions set forth below, the parties agree as follows:
+This Yahoo! Public License (this "Agreement") is a legal agreement
+that describes the terms under which Yahoo! Inc., a Delaware
+corporation having its principal place of business at 701 First
+Avenue, Sunnyvale, California 94089 ("Yahoo!") will provide software
+to you via download or otherwise ("Software"). By using the Software,
+you, an individual or an entity ("You") agree to the terms of this
+Agreement.
+
+In consideration of the mutual promises and upon the terms and
+conditions set forth below, the parties agree as follows:
 
 
 1. Grant of Copyright License
 
-1.1   - Subject to the terms and conditions of this Agreement, Yahoo! hereby grants to You, under any and all of its copyright interest in and to the Software, a royalty-free, non-exclusive, non-transferable license to copy, modify, compile, execute, and distribute the Software and Modifications. For the purposes of this Agreement, any change to, addition to, or abridgement of the Software made by You is a "Modification;" however, any file You add to the Software that does not contain any part of the Software is not a "Modification."
-1.2   - If You are an individual acting on behalf of a corporation or other entity, Your use of the Software or any Modification is subject to Your having the authority to bind such corporation or entity to this Agreement. Providing copies to persons within such corporation or entity is not considered distribution for purposes of this Agreement.
-1.3   - For the Software or any Modification You distribute in source code format, You must do so only under the terms of this Agreement, and You must include a complete copy of this Agreement with Your distribution. With respect to any Modification You distribute in source code format, the terms of this Agreement will apply to You in the same way those terms apply to Yahoo! with respect to the Software. In other words, when You are distributing Modifications under this Agreement, You "stand in the shoes" of Yahoo! in terms of the rights You grant and how the terms and conditions apply to You and the licensees of Your Modifications. Notwithstanding the foregoing, when You "stand in the shoes" of Yahoo!, You are not subject to the jurisdiction provision under Section 7, which requires all disputes under this Agreement to be subject to the jurisdiction of federal or state courts of northern California.
-1.4   - For the Software or any Modification You distribute in compiled or object code format, You must also provide recipients with access to the Software or Modification in source code format along with a complete copy of this Agreement. The distribution of the Software or Modifications in compiled or object code format may be under a license of Your choice, provided that You are in compliance with the terms of this Agreement. In addition, You must make absolutely clear that any license terms applying to such Software or Modification that differ from this Agreement are offered by You alone and not by Yahoo!, and that such license does not restrict recipients from exercising rights in the source code to the Software granted by Yahoo! under this Agreement or rights in the source code to any Modification granted by You as described in Section 1.3.
-1.5   - This Agreement does not limit Your right to distribute files that are entirely Your own work (i.e., which do not incorporate any portion of the Software and are not Modifications) under any terms You choose.
+1.1 - Subject to the terms and conditions of this Agreement, Yahoo!
+hereby grants to You, under any and all of its copyright interest in
+and to the Software, a royalty-free, non-exclusive, non-transferable
+license to copy, modify, compile, execute, and distribute the Software
+and Modifications. For the purposes of this Agreement, any change to,
+addition to, or abridgement of the Software made by You is a
+"Modification;" however, any file You add to the Software that does
+not contain any part of the Software is not a "Modification."
+
+1.2 - If You are an individual acting on behalf of a corporation or
+other entity, Your use of the Software or any Modification is subject
+to Your having the authority to bind such corporation or entity to
+this Agreement. Providing copies to persons within such corporation or
+entity is not considered distribution for purposes of this Agreement.
+
+1.3 - For the Software or any Modification You distribute in source
+code format, You must do so only under the terms of this Agreement,
+and You must include a complete copy of this Agreement with Your
+distribution. With respect to any Modification You distribute in
+source code format, the terms of this Agreement will apply to You in
+the same way those terms apply to Yahoo! with respect to the
+Software. In other words, when You are distributing Modifications
+under this Agreement, You "stand in the shoes" of Yahoo! in terms of
+the rights You grant and how the terms and conditions apply to You and
+the licensees of Your Modifications. Notwithstanding the foregoing,
+when You "stand in the shoes" of Yahoo!, You are not subject to the
+jurisdiction provision under Section 7, which requires all disputes
+under this Agreement to be subject to the jurisdiction of federal or
+state courts of northern California.
+
+1.4 - For the Software or any Modification You distribute in compiled
+or object code format, You must also provide recipients with access to
+the Software or Modification in source code format along with a
+complete copy of this Agreement. The distribution of the Software or
+Modifications in compiled or object code format may be under a license
+of Your choice, provided that You are in compliance with the terms of
+this Agreement. In addition, You must make absolutely clear that any
+license terms applying to such Software or Modification that differ
+from this Agreement are offered by You alone and not by Yahoo!, and
+that such license does not restrict recipients from exercising rights
+in the source code to the Software granted by Yahoo! under this
+Agreement or rights in the source code to any Modification granted by
+You as described in Section 1.3.
+
+1.5 - This Agreement does not limit Your right to distribute files
+that are entirely Your own work (i.e., which do not incorporate any
+portion of the Software and are not Modifications) under any terms You
+choose.
 
 
 2. Support
 
-Yahoo! has no obligation to provide technical support or updates to You. Nothing in this Agreement requires Yahoo! to enter into any license with You for any other edition of the Software.
+Yahoo! has no obligation to provide technical support or updates to
+You. Nothing in this Agreement requires Yahoo! to enter into any
+license with You for any other edition of the Software.
 
 
 3. Intellectual Property Rights
 
-3.1	     - Except for the license expressly granted under copyright in Section 1.1, no rights, licenses or forbearances are granted or may arise in relation to this Agreement whether expressly, by implication, exhaustion, estoppel or otherwise. All rights, including all intellectual property rights, that are not expressly granted under this Agreement are hereby reserved.
-3.2	     - In any copy of the Software or in any Modification you create, You must retain and reproduce, any and all copyright, patent, trademark, and attribution notices that are included in the Software in the same form as they appear in the Software. This includes the preservation of attribution notices in the form of trademarks or logos that exist within a user interface of the Software.
-3.3	     - This license does not grant You rights to use any party's name, logo, or trademarks, except solely as necessary to comply with Section 3.2.
+3.1 - Except for the license expressly granted under copyright in
+Section 1.1, no rights, licenses or forbearances are granted or may
+arise in relation to this Agreement whether expressly, by implication,
+exhaustion, estoppel or otherwise. All rights, including all
+intellectual property rights, that are not expressly granted under
+this Agreement are hereby reserved.
+
+3.2 - In any copy of the Software or in any Modification you create,
+You must retain and reproduce, any and all copyright, patent,
+trademark, and attribution notices that are included in the Software
+in the same form as they appear in the Software. This includes the
+preservation of attribution notices in the form of trademarks or logos
+that exist within a user interface of the Software.
+
+3.3 - This license does not grant You rights to use any party's name,
+logo, or trademarks, except solely as necessary to comply with Section
+3.2.
 
 
 4. Disclaimer of Warranties
 
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND. YAHOO! MAKES NO WARRANTIES, WHETHER EXPRESS, IMPLIED, OR STATUTORY REGARDING OR RELATING TO THE SOFTWARE. SPECIFICALLY, YAHOO! DOES NOT WARRANT THAT THE SOFTWARE WILL BE ERROR FREE OR WILL PERFORM IN AN UNINTERRUPTED MANNER. TO THE GREATEST EXTENT ALLOWED BY LAW, YAHOO! SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF YAHOO! HAD BEEN INFORMED OF SUCH PURPOSE), AND NONINFRINGEMENT WITH RESPECT TO THE SOFTWARE, ANY MODIFICATIONS THERETO AND WITH RESPECT TO THE USE OF THE FOREGOING.
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY
+KIND. YAHOO! MAKES NO WARRANTIES, WHETHER EXPRESS, IMPLIED, OR
+STATUTORY REGARDING OR RELATING TO THE SOFTWARE. SPECIFICALLY, YAHOO!
+DOES NOT WARRANT THAT THE SOFTWARE WILL BE ERROR FREE OR WILL PERFORM
+IN AN UNINTERRUPTED MANNER. TO THE GREATEST EXTENT ALLOWED BY LAW,
+YAHOO! SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF YAHOO! HAD
+BEEN INFORMED OF SUCH PURPOSE), AND NONINFRINGEMENT WITH RESPECT TO
+THE SOFTWARE, ANY MODIFICATIONS THERETO AND WITH RESPECT TO THE USE OF
+THE FOREGOING.
 
 
 5. Limitation of Liability
 
-IN NO EVENT WILL YAHOO! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION LOSS OF PROFITS, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, COST OF COVER) IN CONNECTION WITH OR ARISING OUT OF OR RELATING TO THE FURNISHING, PERFORMANCE OR USE OF THE SOFTWARE OR ANY OTHER RIGHTS GRANTED HEREUNDER, WHETHER ALLEGED AS A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, AND EVEN IF YAHOO! HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+IN NO EVENT WILL YAHOO! BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES OF ANY KIND
+(INCLUDING WITHOUT LIMITATION LOSS OF PROFITS, LOSS OF USE, BUSINESS
+INTERRUPTION, LOSS OF DATA, COST OF COVER) IN CONNECTION WITH OR
+ARISING OUT OF OR RELATING TO THE FURNISHING, PERFORMANCE OR USE OF
+THE SOFTWARE OR ANY OTHER RIGHTS GRANTED HEREUNDER, WHETHER ALLEGED AS
+A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, AND
+EVEN IF YAHOO! HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
 
 6. Term and Termination
 
-6.1  - This Agreement will continue in effect unless and until terminated earlier pursuant to this Section 6.
-6.2  - In the event Yahoo! determines that You have breached this Agreement, Yahoo! may terminate this Agreement.
-6.3  - All licenses granted hereunder shall terminate upon the termination of this Agreement. Termination will be in addition to any rights and remedies available to Yahoo! at law or equity or under this Agreement.
-6.4  - Termination of this Agreement will not affect the provisions regarding reservation of rights (Section 3.1), provisions disclaiming or limiting Yahoo!'s liability (Sections 4 and 5), Termination (Section 6) or Miscellaneous (Section 7), which provisions will survive termination of this Agreement.
+6.1 - This Agreement will continue in effect unless and until
+terminated earlier pursuant to this Section 6.
+
+6.2 - In the event Yahoo! determines that You have breached this
+Agreement, Yahoo! may terminate this Agreement.
+
+6.3 - All licenses granted hereunder shall terminate upon the
+termination of this Agreement. Termination will be in addition to any
+rights and remedies available to Yahoo! at law or equity or under this
+Agreement.
+
+6.4 - Termination of this Agreement will not affect the provisions
+regarding reservation of rights (Section 3.1), provisions disclaiming
+or limiting Yahoo!'s liability (Sections 4 and 5), Termination
+(Section 6) or Miscellaneous (Section 7), which provisions will
+survive termination of this Agreement.
 
 
 7. Miscellaneous
-This Agreement contains the entire agreement of the parties with respect to the subject matter of this Agreement and supersedes all previous communications, representations, understandings and agreements, either oral or written, between the parties with respect to said subject matter. The relationship of the parties hereunder is that of independent contractors, and this Agreement will not be construed as creating an agency, partnership, joint venture or any other form of legal association between the parties. If any term, condition, or provision in this Agreement is found to be invalid, unlawful or unenforceable to any extent, this Agreement will be construed in a manner that most closely effectuates the intent of this Agreement. Such invalid term, condition or provision will be severed from the remaining terms, conditions and provisions, which will continue to be valid and enforceable to the fullest extent permitted by law. This Agreement will be interpreted and construed in accordance with the laws of the State of California and the United States of America, without regard to conflict of law principles. The U.N. Convention on Contracts for the International Sale of Goods shall not apply to this Agreement. All disputes arising out of this Agreement involving Yahoo! or any of its subsidiaries shall be subject to the jurisdiction of the federal or state courts of northern California, with venue lying in Santa Clara County, California. No rights may be assigned, no obligations may be delegated, and this Agreement may not be transferred by You, in whole or in part, whether voluntary or by operation of law, including by way of sale of assets, merger or consolidation, without the prior written consent of Yahoo!, and any purported assignment, delegation or transfer without such consent shall be void ab initio. Any waiver of the provisions of this Agreement or of a party's rights or remedies under this Agreement must be in writing to be effective. Failure, neglect or delay by a party to enforce the provisions of this Agreement or its rights or remedies at any time, will not be construed or be deemed to be a waiver of such party's rights under this Agreement and will not in any way affect the validity of the whole or any part of this Agreement or prejudice such party's right to take subsequent action.
+
+This Agreement contains the entire agreement of the parties with
+respect to the subject matter of this Agreement and supersedes all
+previous communications, representations, understandings and
+agreements, either oral or written, between the parties with respect
+to said subject matter. The relationship of the parties hereunder is
+that of independent contractors, and this Agreement will not be
+construed as creating an agency, partnership, joint venture or any
+other form of legal association between the parties. If any term,
+condition, or provision in this Agreement is found to be invalid,
+unlawful or unenforceable to any extent, this Agreement will be
+construed in a manner that most closely effectuates the intent of this
+Agreement. Such invalid term, condition or provision will be severed
+from the remaining terms, conditions and provisions, which will
+continue to be valid and enforceable to the fullest extent permitted
+by law. This Agreement will be interpreted and construed in accordance
+with the laws of the State of California and the United States of
+America, without regard to conflict of law principles. The
+U.N. Convention on Contracts for the International Sale of Goods shall
+not apply to this Agreement. All disputes arising out of this
+Agreement involving Yahoo! or any of its subsidiaries shall be subject
+to the jurisdiction of the federal or state courts of northern
+California, with venue lying in Santa Clara County, California. No
+rights may be assigned, no obligations may be delegated, and this
+Agreement may not be transferred by You, in whole or in part, whether
+voluntary or by operation of law, including by way of sale of assets,
+merger or consolidation, without the prior written consent of Yahoo!,
+and any purported assignment, delegation or transfer without such
+consent shall be void ab initio. Any waiver of the provisions of this
+Agreement or of a party's rights or remedies under this Agreement must
+be in writing to be effective. Failure, neglect or delay by a party to
+enforce the provisions of this Agreement or its rights or remedies at
+any time, will not be construed or be deemed to be a waiver of such
+party's rights under this Agreement and will not in any way affect the
+validity of the whole or any part of this Agreement or prejudice such
+party's right to take subsequent action.
diff --git a/common/YPL1.1 b/common/YPL1.1
index 855dbbe..0158569 100644
--- a/common/YPL1.1
+++ b/common/YPL1.1
@@ -1,48 +1,177 @@
 Yahoo! Public License, Version 1.1 (YPL)
-This Yahoo! Public License (this "Agreement") is a legal agreement that describes the terms under which Yahoo! Inc., a Delaware corporation having its principal place of business at 701 First Avenue, Sunnyvale, California 94089 ("Yahoo!") will provide software to you via download or otherwise ("Software"). By using the Software, you, an individual or an entity ("You") agree to the terms of this Agreement.
 
-In consideration of the mutual promises and upon the terms and conditions set forth below, the parties agree as follows:
+This Yahoo! Public License (this "Agreement") is a legal agreement
+that describes the terms under which Yahoo! Inc., a Delaware
+corporation having its principal place of business at 701 First
+Avenue, Sunnyvale, California 94089 ("Yahoo!") will provide software
+to you via download or otherwise ("Software"). By using the Software,
+you, an individual or an entity ("You") agree to the terms of this
+Agreement.
+
+In consideration of the mutual promises and upon the terms and
+conditions set forth below, the parties agree as follows:
 
 
 1. Grant of Copyright License
 
-1.1	- Subject to the terms and conditions of this Agreement, Yahoo! hereby grants to You, under any and all of its copyright interest in and to the Software, a royalty-free, non-exclusive, non-transferable license to copy, modify, compile, execute, and distribute the Software and Modifications. For the purposes of this Agreement, any change to, addition to, or abridgement of the Software made by You is a "Modification;" however, any file You add to the Software that does not contain any part of the Software is not a "Modification."
-1.2	- If You are an individual acting on behalf of a corporation or other entity, Your use of the Software or any Modification is subject to Your having the authority to bind such corporation or entity to this Agreement. Providing copies to persons within such corporation or entity is not considered distribution for purposes of this Agreement.
-1.3	- For the Software or any Modification You distribute in source code format, You must do so only under the terms of this Agreement, and You must include a complete copy of this Agreement with Your distribution. With respect to any Modification You distribute in source code format, the terms of this Agreement will apply to You in the same way those terms apply to Yahoo! with respect to the Software. In other words, when You are distributing Modifications under this Agreement, You "stand in the shoes" of Yahoo! in terms of the rights You grant and how the terms and conditions apply to You and the licensees of Your Modifications. Notwithstanding the foregoing, when You "stand in the shoes" of Yahoo!, You are not subject to the jurisdiction provision under Section 7, which requires all disputes under this Agreement to be subject to the jurisdiction of federal or state courts of northern California.
-1.4	- For the Software or any Modification You distribute in compiled or object code format, You must also provide recipients with access to the Software or Modification in source code format along with a complete copy of this Agreement. The distribution of the Software or Modifications in compiled or object code format may be under a license of Your choice, provided that You are in compliance with the terms of this Agreement. In addition, You must make absolutely clear that any license terms applying to such Software or Modification that differ from this Agreement are offered by You alone and not by Yahoo!, and that such license does not restrict recipients from exercising rights in the source code to the Software granted by Yahoo! under this Agreement or rights in the source code to any Modification granted by You as described in Section 1.3.
-1.5	- This Agreement does not limit Your right to distribute files that are entirely Your own work (i.e., which do not incorporate any portion of the Software and are not Modifications) under any terms You choose.
+1.1 - Subject to the terms and conditions of this Agreement, Yahoo!
+hereby grants to You, under any and all of its copyright interest in
+and to the Software, a royalty-free, non-exclusive, non-transferable
+license to copy, modify, compile, execute, and distribute the Software
+and Modifications. For the purposes of this Agreement, any change to,
+addition to, or abridgement of the Software made by You is a
+"Modification;" however, any file You add to the Software that does
+not contain any part of the Software is not a "Modification."
+
+1.2 - If You are an individual acting on behalf of a corporation or
+other entity, Your use of the Software or any Modification is subject
+to Your having the authority to bind such corporation or entity to
+this Agreement. Providing copies to persons within such corporation or
+entity is not considered distribution for purposes of this Agreement.
+
+1.3 - For the Software or any Modification You distribute in source
+code format, You must do so only under the terms of this Agreement,
+and You must include a complete copy of this Agreement with Your
+distribution. With respect to any Modification You distribute in
+source code format, the terms of this Agreement will apply to You in
+the same way those terms apply to Yahoo! with respect to the
+Software. In other words, when You are distributing Modifications
+under this Agreement, You "stand in the shoes" of Yahoo! in terms of
+the rights You grant and how the terms and conditions apply to You and
+the licensees of Your Modifications. Notwithstanding the foregoing,
+when You "stand in the shoes" of Yahoo!, You are not subject to the
+jurisdiction provision under Section 7, which requires all disputes
+under this Agreement to be subject to the jurisdiction of federal or
+state courts of northern California.
+
+1.4 - For the Software or any Modification You distribute in compiled
+or object code format, You must also provide recipients with access to
+the Software or Modification in source code format along with a
+complete copy of this Agreement. The distribution of the Software or
+Modifications in compiled or object code format may be under a license
+of Your choice, provided that You are in compliance with the terms of
+this Agreement. In addition, You must make absolutely clear that any
+license terms applying to such Software or Modification that differ
+from this Agreement are offered by You alone and not by Yahoo!, and
+that such license does not restrict recipients from exercising rights
+in the source code to the Software granted by Yahoo! under this
+Agreement or rights in the source code to any Modification granted by
+You as described in Section 1.3.
+
+1.5 - This Agreement does not limit Your right to distribute files
+that are entirely Your own work (i.e., which do not incorporate any
+portion of the Software and are not Modifications) under any terms You
+choose.
 
 
 2. Support
 
-Yahoo! has no obligation to provide technical support or updates to You. Nothing in this Agreement requires Yahoo! to enter into any license with You for any other edition of the Software.
+Yahoo! has no obligation to provide technical support or updates to
+You. Nothing in this Agreement requires Yahoo! to enter into any
+license with You for any other edition of the Software.
 
 
 3. Intellectual Property Rights
 
-3.1	- Except for the license expressly granted under copyright in Section 1.1, no rights, licenses or forbearances are granted or may arise in relation to this Agreement whether expressly, by implication, exhaustion, estoppel or otherwise. All rights, including all intellectual property rights, that are not expressly granted under this Agreement are hereby reserved.
-3.2	- In any copy of the Software or in any Modification you create, You must retain and reproduce, any and all copyright, patent, trademark, and attribution notices that are included in the Software in the same form as they appear in the Software. This includes the preservation of attribution notices in the form of trademarks or logos that exist within a user interface of the Software.
-3.3	- This license does not grant You rights to use any party's name, logo, or trademarks, except solely as necessary to comply with Section 3.2.
+3.1 - Except for the license expressly granted under copyright in
+Section 1.1, no rights, licenses or forbearances are granted or may
+arise in relation to this Agreement whether expressly, by implication,
+exhaustion, estoppel or otherwise. All rights, including all
+intellectual property rights, that are not expressly granted under
+this Agreement are hereby reserved.
+
+3.2 - In any copy of the Software or in any Modification you create,
+You must retain and reproduce, any and all copyright, patent,
+trademark, and attribution notices that are included in the Software
+in the same form as they appear in the Software. This includes the
+preservation of attribution notices in the form of trademarks or logos
+that exist within a user interface of the Software.
+
+3.3 - This license does not grant You rights to use any party's name,
+logo, or trademarks, except solely as necessary to comply with Section
+3.2.
 
 
 4. Disclaimer of Warranties
 
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND. YAHOO! MAKES NO WARRANTIES, WHETHER EXPRESS, IMPLIED, OR STATUTORY REGARDING OR RELATING TO THE SOFTWARE. SPECIFICALLY, YAHOO! DOES NOT WARRANT THAT THE SOFTWARE WILL BE ERROR FREE OR WILL PERFORM IN AN UNINTERRUPTED MANNER. TO THE GREATEST EXTENT ALLOWED BY LAW, YAHOO! SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF YAHOO! HAD BEEN INFORMED OF SUCH PURPOSE), AND NONINFRINGEMENT WITH RESPECT TO THE SOFTWARE, ANY MODIFICATIONS THERETO AND WITH RESPECT TO THE USE OF THE FOREGOING.
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY
+KIND. YAHOO! MAKES NO WARRANTIES, WHETHER EXPRESS, IMPLIED, OR
+STATUTORY REGARDING OR RELATING TO THE SOFTWARE. SPECIFICALLY, YAHOO!
+DOES NOT WARRANT THAT THE SOFTWARE WILL BE ERROR FREE OR WILL PERFORM
+IN AN UNINTERRUPTED MANNER. TO THE GREATEST EXTENT ALLOWED BY LAW,
+YAHOO! SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE (EVEN IF YAHOO! HAD
+BEEN INFORMED OF SUCH PURPOSE), AND NONINFRINGEMENT WITH RESPECT TO
+THE SOFTWARE, ANY MODIFICATIONS THERETO AND WITH RESPECT TO THE USE OF
+THE FOREGOING.
 
 
 5. Limitation of Liability
 
-IN NO EVENT WILL YAHOO! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES OF ANY KIND (INCLUDING WITHOUT LIMITATION LOSS OF PROFITS, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, COST OF COVER) IN CONNECTION WITH OR ARISING OUT OF OR RELATING TO THE FURNISHING, PERFORMANCE OR USE OF THE SOFTWARE OR ANY OTHER RIGHTS GRANTED HEREUNDER, WHETHER ALLEGED AS A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, AND EVEN IF YAHOO! HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+IN NO EVENT WILL YAHOO! BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES OF ANY KIND
+(INCLUDING WITHOUT LIMITATION LOSS OF PROFITS, LOSS OF USE, BUSINESS
+INTERRUPTION, LOSS OF DATA, COST OF COVER) IN CONNECTION WITH OR
+ARISING OUT OF OR RELATING TO THE FURNISHING, PERFORMANCE OR USE OF
+THE SOFTWARE OR ANY OTHER RIGHTS GRANTED HEREUNDER, WHETHER ALLEGED AS
+A BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, AND
+EVEN IF YAHOO! HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
 
 6. Term and Termination
 
-6.1	- This Agreement will continue in effect unless and until terminated earlier pursuant to this Section 6.
-6.2	- In the event You violate the terms of this Agreement, Yahoo! may terminate this Agreement.
-6.3	- All licenses granted hereunder shall terminate upon the termination of this Agreement. Termination will be in addition to any rights and remedies available to Yahoo! at law or equity or under this Agreement.
-6.4	- Termination of this Agreement will not affect the provisions regarding reservation of rights (Section 3.1), provisions disclaiming or limiting Yahoo!'s liability (Sections 4 and 5), Termination (Section 6) or Miscellaneous (Section 7), which provisions will survive termination of this Agreement.
+6.1 - This Agreement will continue in effect unless and until
+terminated earlier pursuant to this Section 6.
+
+6.2 - In the event You violate the terms of this Agreement, Yahoo! may
+terminate this Agreement.
+
+6.3 - All licenses granted hereunder shall terminate upon the
+termination of this Agreement. Termination will be in addition to any
+rights and remedies available to Yahoo! at law or equity or under this
+Agreement.
+
+6.4 - Termination of this Agreement will not affect the provisions
+regarding reservation of rights (Section 3.1), provisions disclaiming
+or limiting Yahoo!'s liability (Sections 4 and 5), Termination
+(Section 6) or Miscellaneous (Section 7), which provisions will
+survive termination of this Agreement.
 
 
 7. Miscellaneous
 
-This Agreement contains the entire agreement of the parties with respect to the subject matter of this Agreement and supersedes all previous communications, representations, understandings and agreements, either oral or written, between the parties with respect to said subject matter. The relationship of the parties hereunder is that of independent contractors, and this Agreement will not be construed as creating an agency, partnership, joint venture or any other form of legal association between the parties. If any term, condition, or provision in this Agreement is found to be invalid, unlawful or unenforceable to any extent, this Agreement will be construed in a manner that most closely effectuates the intent of this Agreement. Such invalid term, condition or provision will be severed from the remaining terms, conditions and provisions, which will continue to be valid and enforceable to the fullest extent permitted by law. This Agreement will be interpreted and construed in accordance with the laws of the State of California and the United States of America, without regard to conflict of law principles. The U.N. Convention on Contracts for the International Sale of Goods shall not apply to this Agreement. All disputes arising out of this Agreement involving Yahoo! or any of its subsidiaries shall be subject to the jurisdiction of the federal or state courts of northern California, with venue lying in Santa Clara County, California. No rights may be assigned, no obligations may be delegated, and this Agreement may not be transferred by You, in whole or in part, whether voluntary or by operation of law, including by way of sale of assets, merger or consolidation, without the prior written consent of Yahoo!, and any purported assignment, delegation or transfer without such consent shall be void ab initio. Any waiver of the provisions of this Agreement or of a party's rights or remedies under this Agreement must be in writing to be effective. Failure, neglect or delay by a party to enforce the provisions of this Agreement or its rights or remedies at any time, will not be construed or be deemed to be a waiver of such party's rights under this Agreement and will not in any way affect the validity of the whole or any part of this Agreement or prejudice such party's right to take subsequent action.
+This Agreement contains the entire agreement of the parties with
+respect to the subject matter of this Agreement and supersedes all
+previous communications, representations, understandings and
+agreements, either oral or written, between the parties with respect
+to said subject matter. The relationship of the parties hereunder is
+that of independent contractors, and this Agreement will not be
+construed as creating an agency, partnership, joint venture or any
+other form of legal association between the parties. If any term,
+condition, or provision in this Agreement is found to be invalid,
+unlawful or unenforceable to any extent, this Agreement will be
+construed in a manner that most closely effectuates the intent of this
+Agreement. Such invalid term, condition or provision will be severed
+from the remaining terms, conditions and provisions, which will
+continue to be valid and enforceable to the fullest extent permitted
+by law. This Agreement will be interpreted and construed in accordance
+with the laws of the State of California and the United States of
+America, without regard to conflict of law principles. The
+U.N. Convention on Contracts for the International Sale of Goods shall
+not apply to this Agreement. All disputes arising out of this
+Agreement involving Yahoo! or any of its subsidiaries shall be subject
+to the jurisdiction of the federal or state courts of northern
+California, with venue lying in Santa Clara County, California. No
+rights may be assigned, no obligations may be delegated, and this
+Agreement may not be transferred by You, in whole or in part, whether
+voluntary or by operation of law, including by way of sale of assets,
+merger or consolidation, without the prior written consent of Yahoo!,
+and any purported assignment, delegation or transfer without such
+consent shall be void ab initio. Any waiver of the provisions of this
+Agreement or of a party's rights or remedies under this Agreement must
+be in writing to be effective. Failure, neglect or delay by a party to
+enforce the provisions of this Agreement or its rights or remedies at
+any time, will not be construed or be deemed to be a waiver of such
+party's rights under this Agreement and will not in any way affect the
+validity of the whole or any part of this Agreement or prejudice such
+party's right to take subsequent action.