incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1220726 [5/6] - in /incubator/ooo/branches/alg/svgreplacement: ./ ext_sources/ main/ main/beanshell/ main/berkeleydb/ main/bridges/source/cpp_uno/cc50_solaris_intel/ main/bridges/source/cpp_uno/cc50_solaris_sparc/ main/bridges/source/cpp_u...
Date Mon, 19 Dec 2011 13:03:57 GMT
Modified: incubator/ooo/branches/alg/svgreplacement/main/readlicense_oo/source/license/license_en-US.html
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/readlicense_oo/source/license/license_en-US.html?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/readlicense_oo/source/license/license_en-US.html (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/readlicense_oo/source/license/license_en-US.html Mon Dec 19 13:03:54 2011
@@ -1,447 +1,202 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:st1="urn:schemas-microsoft-com:office:smarttags"
-xmlns="http://www.w3.org/TR/REC-html40">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en"><head>
+    <title>Apache License, Version 2.0</title>
+    
+    <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
+  </head>
+
+  <body>
+    <div id="page" class="container_16">
+      <div id="header" class="grid_8">
+        <img src="license_en-US_files/feather-small.gif" alt="The Apache Software Foundation">
+        <h1>The Apache Software Foundation</h1>
+        <h2>Apache License, Version 2.0</h2>
+      </div>
+     <div class="clear"></div>
+      <div id="content" class="grid_16"><div class="section-content"><p>Apache License<br><br>Version 2.0, January 2004<br><br>
+<a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
+<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
+<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
+<p>"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.</p>
+<p>"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.</p>
+<p>"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control with
+that entity. For the purposes of this definition, "control" means (i) the
+power, direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty
+percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.</p>
+<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.</p>
+<p>"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.</p>
+<p>"Object" form shall mean any form resulting from mechanical transformation
+or translation of a Source form, including but not limited to compiled
+object code, generated documentation, and conversions to other media types.</p>
+<p>"Work" shall mean the work of authorship, whether in Source or Object form,
+made available under the License, as indicated by a copyright notice that
+is included in or attached to the work (an example is provided in the
+Appendix below).</p>
+<p>"Derivative Works" shall mean any work, whether in Source or Object form,
+that is based on (or derived from) the Work and for which the editorial
+revisions, annotations, elaborations, or other modifications represent, as
+a whole, an original work of authorship. For the purposes of this License,
+Derivative Works shall not include works that remain separable from, or
+merely link (or bind by name) to the interfaces of, the Work and Derivative
+Works thereof.</p>
+<p>"Contribution" shall mean any work of authorship, including the original
+version of the Work and any modifications or additions to that Work or
+Derivative Works thereof, that is intentionally submitted to Licensor for
+inclusion in the Work by the copyright owner or by an individual or Legal
+Entity authorized to submit on behalf of the copyright owner. For the
+purposes of this definition, "submitted" means any form of electronic,
+verbal, or written communication sent to the Licensor or its
+representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems that
+are managed by, or on behalf of, the Licensor for the purpose of discussing
+and improving the Work, but excluding communication that is conspicuously
+marked or otherwise designated in writing by the copyright owner as "Not a
+Contribution."</p>
+<p>"Contributor" shall mean Licensor and any individual or Legal Entity on
+behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.</p>
+<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. Subject to the
+terms and conditions of this License, each Contributor hereby grants to You
+a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of, publicly
+display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.</p>
+<p><strong><a name="patent">3. Grant of Patent License</a></strong>. Subject to the terms
+and conditions of this License, each Contributor hereby grants to You a
+perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made, use,
+offer to sell, sell, import, and otherwise transfer the Work, where such
+license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by
+combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent litigation against
+any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that the Work or a Contribution incorporated within the Work constitutes
+direct or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate as of the
+date such litigation is filed.</p>
+<p><strong><a name="redistribution">4. Redistribution</a></strong>. You may reproduce and
+distribute copies of the Work or Derivative Works thereof in any medium,
+with or without modifications, and in Source or Object form, provided that
+You meet the following conditions:</p>
+<ol>
+<li>
+<p>You must give any other recipients of the Work or Derivative Works a
+copy of this License; and</p>
+</li>
+<li>
+<p>You must cause any modified files to carry prominent notices stating
+that You changed the files; and</p>
+</li>
+<li>
+<p>You must retain, in the Source form of any Derivative Works that You
+distribute, all copyright, patent, trademark, and attribution notices from
+the Source form of the Work, excluding those notices that do not pertain to
+any part of the Derivative Works; and</p>
+</li>
+<li>
+<p>If the Work includes a "NOTICE" text file as part of its distribution,
+then any Derivative Works that You distribute must include a readable copy
+of the attribution notices contained within such NOTICE file, excluding
+those notices that do not pertain to any part of the Derivative Works, in
+at least one of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or documentation,
+if provided along with the Derivative Works; or, within a display generated
+by the Derivative Works, if and wherever such third-party notices normally
+appear. The contents of the NOTICE file are for informational purposes only
+and do not modify the License. You may add Your own attribution notices
+within Derivative Works that You distribute, alongside or as an addendum to
+the NOTICE text from the Work, provided that such additional attribution
+notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may
+provide additional or different license terms and conditions for use,
+reproduction, or distribution of Your modifications, or for any such
+Derivative Works as a whole, provided Your use, reproduction, and
+distribution of the Work otherwise complies with the conditions stated in
+this License.</p>
+</li>
+</ol>
+<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. Unless You
+explicitly state otherwise, any Contribution intentionally submitted for
+inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the
+terms of any separate license agreement you may have executed with Licensor
+regarding such Contributions.</p>
+<p><strong><a name="trademarks">6. Trademarks</a></strong>. This License does not grant
+permission to use the trade names, trademarks, service marks, or product
+names of the Licensor, except as required for reasonable and customary use
+in describing the origin of the Work and reproducing the content of the
+NOTICE file.</p>
+<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. Unless required by
+applicable law or agreed to in writing, Licensor provides the Work (and
+each Contributor provides its Contributions) 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. You
+are solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise
+of permissions under this License.</p>
+<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. In no event and
+under no legal theory, whether in tort (including negligence), contract, or
+otherwise, unless required by applicable law (such as deliberate and
+grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a result
+of this License or out of the use or inability to use the Work (including
+but not limited to damages for loss of goodwill, work stoppage, computer
+failure or malfunction, or any and all other commercial damages or losses),
+even if such Contributor has been advised of the possibility of such
+damages.</p>
+<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
+While redistributing the Work or Derivative Works thereof, You may choose
+to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this License.
+However, in accepting such obligations, You may act only on Your own behalf
+and on Your sole responsibility, not on behalf of any other Contributor,
+and only if You agree to indemnify, defend, and hold each Contributor
+harmless for any liability incurred by, or claims asserted against, such
+Contributor by reason of your accepting any such warranty or additional
+liability.</p>
+<p>END OF TERMS AND CONDITIONS</p>
+<h1 id="apply">APPENDIX: How to apply the Apache License to your work</h1>
+<p>To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included
+on the same "printed page" as the copyright notice for easier
+identification within third-party archives.</p>
+<div class="codehilite"><pre>   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+</pre></div></div></div>
+      <div class="clear"></div>
+    </div>      
+    <div class="clear"></div>
+    
+    </div>
+    <div id="copyright" class="container_16">
+      <p>Copyright © 2011 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+    </div>
+  
 
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=utf-8">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 10">
-<meta name=Originator content="Microsoft Word 10">
-<link rel=File-List href="LICENSE-2.0_files/filelist.xml">
-<title>Apache License, Version 2.0</title>
-<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
- name="stockticker"/>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Author>Pedro F. Giffuni</o:Author>
-  <o:Template>Normal</o:Template>
-  <o:LastAuthor>Pedro F. Giffuni</o:LastAuthor>
-  <o:Revision>3</o:Revision>
-  <o:TotalTime>2</o:TotalTime>
-  <o:Created>2011-10-31T20:50:00Z</o:Created>
-  <o:LastSaved>2011-10-31T20:52:00Z</o:LastSaved>
-  <o:Pages>3</o:Pages>
-  <o:Words>1583</o:Words>
-  <o:Characters>8707</o:Characters>
-  <o:Lines>72</o:Lines>
-  <o:Paragraphs>20</o:Paragraphs>
-  <o:CharactersWithSpaces>10270</o:CharactersWithSpaces>
-  <o:Version>10.6870</o:Version>
- </o:DocumentProperties>
- <o:OfficeDocumentSettings>
-  <o:AllowPNG/>
-  <o:PixelsPerInch>120</o:PixelsPerInch>
-  <o:TargetScreenSize>1024x768</o:TargetScreenSize>
- </o:OfficeDocumentSettings>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:SpellingState>Clean</w:SpellingState>
-  <w:GrammarState>Clean</w:GrammarState>
-  <w:HyphenationZone>21</w:HyphenationZone>
-  <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- </w:WordDocument>
-</xml><![endif]--><!--[if !mso]><object
- classid="clsid:38481807-CA0E-42D2-BF39-B33AF135CC4D" id=ieooui></object>
-<style>
-st1\:*{behavior:url(#ieooui) }
-</style>
-<![endif]-->
-<style>
-<!--
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0cm;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-h1
-	{mso-margin-top-alt:auto;
-	margin-right:0cm;
-	mso-margin-bottom-alt:auto;
-	margin-left:0cm;
-	mso-pagination:widow-orphan;
-	mso-outline-level:1;
-	font-size:24.0pt;
-	font-family:"Times New Roman";
-	font-weight:bold;}
-h2
-	{mso-margin-top-alt:auto;
-	margin-right:0cm;
-	mso-margin-bottom-alt:auto;
-	margin-left:0cm;
-	mso-pagination:widow-orphan;
-	mso-outline-level:2;
-	font-size:18.0pt;
-	font-family:"Times New Roman";
-	font-weight:bold;}
-a:link, span.MsoHyperlink
-	{color:blue;
-	text-decoration:underline;
-	text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
-	{color:blue;
-	text-decoration:underline;
-	text-underline:single;}
-p
-	{mso-margin-top-alt:auto;
-	margin-right:0cm;
-	mso-margin-bottom-alt:auto;
-	margin-left:0cm;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-pre
-	{margin:0cm;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-	font-size:10.0pt;
-	font-family:"Courier New";
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:612.0pt 792.0pt;
-	margin:70.85pt 3.0cm 70.85pt 3.0cm;
-	mso-header-margin:36.0pt;
-	mso-footer-margin:36.0pt;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
- /* List Definitions */
- @list l0
-	{mso-list-id:949624310;
-	mso-list-template-ids:896030612;}
-@list l0:level1
-	{mso-level-tab-stop:36.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-@list l0:level2
-	{mso-level-tab-stop:72.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-@list l0:level3
-	{mso-level-tab-stop:108.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-@list l0:level4
-	{mso-level-tab-stop:144.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-@list l0:level5
-	{mso-level-tab-stop:180.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-@list l0:level6
-	{mso-level-tab-stop:216.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-@list l0:level7
-	{mso-level-tab-stop:252.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-@list l0:level8
-	{mso-level-tab-stop:288.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-@list l0:level9
-	{mso-level-tab-stop:324.0pt;
-	mso-level-number-position:left;
-	text-indent:-18.0pt;}
-ol
-	{margin-bottom:0cm;}
-ul
-	{margin-bottom:0cm;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
-	{mso-style-name:"Table Normal";
-	mso-tstyle-rowband-size:0;
-	mso-tstyle-colband-size:0;
-	mso-style-noshow:yes;
-	mso-style-parent:"";
-	mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
-	mso-para-margin:0cm;
-	mso-para-margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:10.0pt;
-	font-family:"Times New Roman";}
-</style>
-<![endif]-->
-<meta property="og:image" content="http://www.apache.org/images/asf_logo.gif">
-<link rel=stylesheet type="text/css" media=screen href="css/style.css">
-<link rel=stylesheet type="text/css" media=screen href="css/code.css">
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License.  You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License. -->
-<script  type="text/javascript" src="/js/jquery.js">
-</script>
-
-<script  type="text/javascript" src="/js/apache_boot.js">
-</script>
-<!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="1026"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
-  <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body lang=ES-CO link=blue vlink=blue style='tab-interval:35.4pt'>
-
-<div class=Section1>
-
-<div id=content>
-
-<div>
-
-<p align=center style='text-align:center'><span lang=EN style='mso-ansi-language:
-EN'>Apache License<br>
-</br>Version 2.0, January 2004<br>
-<a href="http://www.apache.org/licenses/"></br>http://www.apache.org/licenses/</a><o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>TERMS </span><st1:stockticker><span
- lang=EN style='mso-ansi-language:EN'>AND</span></st1:stockticker><span
-lang=EN style='mso-ansi-language:EN'> CONDITIONS FOR USE, REPRODUCTION, </span><st1:stockticker><span
- lang=EN style='mso-ansi-language:EN'>AND</span></st1:stockticker><span
-lang=EN style='mso-ansi-language:EN'> DISTRIBUTION<o:p></o:p></span></p>
-
-<p><a name=definitions><strong><span lang=EN style='mso-ansi-language:EN'>1.
-Definitions</span></strong></a><span style='mso-bookmark:definitions'></span><span
-lang=EN style='mso-ansi-language:EN'>.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;License&quot; shall mean the
-terms and conditions for use, reproduction, and distribution as defined by
-Sections 1 through 9 of this document.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;Licensor&quot; shall mean
-the copyright owner or entity authorized by the copyright owner that is
-granting the License.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;Legal Entity&quot; shall mean
-the union of the acting entity and all other entities that control, are
-controlled by, or are under common control with that entity. For the purposes
-of this definition, &quot;control&quot; means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;You&quot; (or
-&quot;Your&quot;) shall mean an individual or Legal Entity exercising permissions
-granted by this License.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;Source&quot; form shall
-mean the preferred form for making modifications, including but not limited to
-software source code, documentation source, and configuration files.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;Object&quot; form shall
-mean any form resulting from mechanical transformation or translation of a
-Source form, including but not limited to compiled object code, generated
-documentation, and conversions to other media types.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;Work&quot; shall mean the
-work of authorship, whether in Source or Object form, made available under the
-License, as indicated by a copyright notice that is included in or attached to
-the work (an example is provided in the Appendix below).<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;Derivative Works&quot;
-shall mean any work, whether in Source or Object form, that is based on (or
-derived from) the Work and for which the editorial revisions, annotations,
-elaborations, or other modifications represent, as a whole, an original work of
-authorship. For the purposes of this License, Derivative Works shall not
-include works that remain separable from, or merely link (or bind by name) to
-the interfaces of, the Work and Derivative Works thereof.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;Contribution&quot; shall
-mean any work of authorship, including the original version of the Work and any
-modifications or additions to that Work or Derivative Works thereof, that is
-intentionally submitted to Licensor for inclusion in the Work by the copyright
-owner or by an individual or Legal Entity authorized to submit on behalf of the
-copyright owner. For the purposes of this definition, &quot;submitted&quot;
-means any form of electronic, verbal, or written communication sent to the
-Licensor or its representatives, including but not limited to communication on
-electronic mailing lists, source code control systems, and issue tracking
-systems that are managed by, or on behalf of, the Licensor for the purpose of
-discussing and improving the Work, but excluding communication that is
-conspicuously marked or otherwise designated in writing by the copyright owner
-as &quot;Not a Contribution.&quot;<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>&quot;Contributor&quot; shall
-mean Licensor and any individual or Legal Entity on behalf of whom a
-Contribution has been received by Licensor and subsequently incorporated within
-the Work.<o:p></o:p></span></p>
-
-<p><a name=copyright><strong><span lang=EN style='mso-ansi-language:EN'>2.
-Grant of Copyright License</span></strong></a><span style='mso-bookmark:copyright'></span><span
-lang=EN style='mso-ansi-language:EN'>. Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable copyright license to
-reproduce, prepare Derivative Works of, publicly display, publicly perform,
-sublicense, and distribute the Work and such Derivative Works in Source or
-Object form.<o:p></o:p></span></p>
-
-<p><a name=patent><strong><span lang=EN style='mso-ansi-language:EN'>3. Grant
-of Patent License</span></strong></a><span style='mso-bookmark:patent'></span><span
-lang=EN style='mso-ansi-language:EN'>. Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
-section) patent license to make, have made, use, offer to sell, sell, import,
-and otherwise transfer the Work, where such license applies only to those
-patent claims licensable by such Contributor that are necessarily infringed by
-their Contribution(s) alone or by combination of their Contribution(s) with the
-Work to which such Contribution(s) was submitted. If You institute patent
-litigation against any entity (including a cross-claim or counterclaim in a
-lawsuit) alleging that the Work or a Contribution incorporated within the Work
-constitutes direct or contributory patent infringement, then any patent
-licenses granted to You under this License for that Work shall terminate as of
-the date such litigation is filed.<o:p></o:p></span></p>
-
-<p><a name=redistribution><strong><span lang=EN style='mso-ansi-language:EN'>4.
-Redistribution</span></strong></a><span style='mso-bookmark:redistribution'></span><span
-lang=EN style='mso-ansi-language:EN'>. You may reproduce and distribute copies
-of the Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You meet the
-following conditions:<o:p></o:p></span></p>
-
-<p style='margin-left:36.0pt;text-indent:-18.0pt;mso-list:l0 level1 lfo2;
-tab-stops:list 36.0pt'><![if !supportLists]><span lang=EN style='mso-ansi-language:
-EN'><span style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span dir=LTR><span lang=EN style='mso-ansi-language:
-EN'>You must give any other recipients of the Work or Derivative Works a copy
-of this License; and<o:p></o:p></span></span></p>
-
-<p style='margin-left:36.0pt;text-indent:-18.0pt;mso-list:l0 level1 lfo2;
-tab-stops:list 36.0pt'><![if !supportLists]><span lang=EN style='mso-ansi-language:
-EN'><span style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span dir=LTR><span lang=EN style='mso-ansi-language:
-EN'>You must cause any modified files to carry prominent notices stating that
-You changed the files; and<o:p></o:p></span></span></p>
-
-<p style='margin-left:36.0pt;text-indent:-18.0pt;mso-list:l0 level1 lfo2;
-tab-stops:list 36.0pt'><![if !supportLists]><span lang=EN style='mso-ansi-language:
-EN'><span style='mso-list:Ignore'>3.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span dir=LTR><span lang=EN style='mso-ansi-language:
-EN'>You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from the
-Source form of the Work, excluding those notices that do not pertain to any
-part of the Derivative Works; and<o:p></o:p></span></span></p>
-
-<p style='margin-left:36.0pt;text-indent:-18.0pt;mso-list:l0 level1 lfo2;
-tab-stops:list 36.0pt'><![if !supportLists]><span lang=EN style='mso-ansi-language:
-EN'><span style='mso-list:Ignore'>4.<span style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</span></span></span><![endif]><span dir=LTR><span lang=EN style='mso-ansi-language:
-EN'>If the Work includes a &quot;NOTICE&quot; text file as part of its
-distribution, then any Derivative Works that You distribute must include a
-readable copy of the attribution notices contained within such NOTICE file,
-excluding those notices that do not pertain to any part of the Derivative
-Works, in at least one of the following places: within a NOTICE text file
-distributed as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or, within a
-display generated by the Derivative Works, if and wherever such third-party
-notices normally appear. The contents of the NOTICE file are for informational
-purposes only and do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside or as an
-addendum to the NOTICE text from the Work, provided that such additional
-attribution notices cannot be construed as modifying the License. You may add
-Your own copyright statement to Your modifications and may provide additional
-or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a
-whole, provided Your use, reproduction, and distribution of the Work otherwise
-complies with the conditions stated in this License.<o:p></o:p></span></span></p>
-
-<p><a name=contributions><strong><span lang=EN style='mso-ansi-language:EN'>5.
-Submission of Contributions</span></strong></a><span style='mso-bookmark:contributions'></span><span
-lang=EN style='mso-ansi-language:EN'>. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the Work by You to
-the Licensor shall be under the terms and conditions of this License, without
-any additional terms or conditions. Notwithstanding the above, nothing herein
-shall supersede or modify the terms of any separate license agreement you may
-have executed with Licensor regarding such Contributions.<o:p></o:p></span></p>
-
-<p><a name=trademarks><strong><span lang=EN style='mso-ansi-language:EN'>6.
-Trademarks</span></strong></a><span style='mso-bookmark:trademarks'></span><span
-lang=EN style='mso-ansi-language:EN'>. This License does not grant permission
-to use the trade names, trademarks, service marks, or product names of the
-Licensor, except as required for reasonable and customary use in describing the
-origin of the Work and reproducing the content of the NOTICE file.<o:p></o:p></span></p>
-
-<p><strong><span lang=EN style='mso-ansi-language:EN'>7. Disclaimer of Warranty</span></strong><a
-name=no-warranty></a><span lang=EN style='mso-ansi-language:EN'>. Unless
-required by applicable law or agreed to in writing, Licensor provides the Work
-(and each Contributor provides its Contributions) on an &quot;AS IS&quot;
-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. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.<o:p></o:p></span></p>
-
-<p><strong><span lang=EN style='mso-ansi-language:EN'>8. Limitation of
-Liability</span></strong><a name=no-liability></a><span lang=EN
-style='mso-ansi-language:EN'>. In no event and under no legal theory, whether
-in tort (including negligence), contract, or otherwise, unless required by
-applicable law (such as deliberate and grossly negligent acts) or agreed to in
-writing, shall any Contributor be liable to You for damages, including any
-direct, indirect, special, incidental, or consequential damages of any
-character arising as a result of this License or out of the use or inability to
-use the Work (including but not limited to damages for loss of goodwill, work
-stoppage, computer failure or malfunction, or any and all other commercial
-damages or losses), even if such Contributor has been advised of the
-possibility of such damages.<o:p></o:p></span></p>
-
-<p><a name=additional><strong><span lang=EN style='mso-ansi-language:EN'>9.
-Accepting Warranty or Additional Liability</span></strong></a><span
-style='mso-bookmark:additional'></span><span lang=EN style='mso-ansi-language:
-EN'>. While redistributing the Work or Derivative Works thereof, You may choose
-to offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License.
-However, in accepting such obligations, You may act only on Your own behalf and
-on Your sole responsibility, not on behalf of any other Contributor, and only
-if You agree to indemnify, defend, and hold each Contributor harmless for any
-liability incurred by, or claims asserted against, such Contributor by reason
-of your accepting any such warranty or additional liability.<o:p></o:p></span></p>
-
-<p><span lang=EN style='mso-ansi-language:EN'>END OF TERMS </span><st1:stockticker><span
- lang=EN style='mso-ansi-language:EN'>AND</span></st1:stockticker><span
-lang=EN style='mso-ansi-language:EN'> CONDITIONS<o:p></o:p></span></p>
-
-<h1 id=apply><span lang=EN style='mso-ansi-language:EN'>APPENDIX: How to apply
-the Apache License to your work<o:p></o:p></span></h1>
-
-<p><span lang=EN style='mso-ansi-language:EN'>To apply the Apache License to
-your work, attach the following boilerplate notice, with the fields enclosed by
-brackets &quot;[]&quot; replaced with your own identifying information. (Don't
-include the brackets!) The text should be enclosed in the appropriate comment
-syntax for the file format. We also recommend that a file or class name and
-description of purpose be included on the same &quot;printed page&quot; as the
-copyright notice for easier identification within third-party archives.<o:p></o:p></span></p>
-
-<div><pre><span lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>Copyright [yyyy] [name of copyright owner]<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><o:p>&nbsp;</o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>you may not use this file except in compliance with the License.<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>You may obtain a copy of the License at<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><o:p>&nbsp;</o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>       </span>http://www.apache.org/licenses/LICENSE-2.0<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><o:p>&nbsp;</o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>Unless required by applicable law or agreed to in writing, software<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>distributed under the License is distributed on an &quot;AS IS&quot; BASIS,<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>See the License for the specific language governing permissions and<o:p></o:p></span></pre><pre><span
-lang=EN style='mso-ansi-language:EN'><span style='mso-spacerun:yes'>   </span>limitations under the License.<o:p></o:p></span></pre></div>
-
-</div>
-
-</div>
-
-</div>
-
-</body>
-
-</html>
+</body></html>

Modified: incubator/ooo/branches/alg/svgreplacement/main/readlicense_oo/source/license/license_en-US.rtf
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/readlicense_oo/source/license/license_en-US.rtf?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/readlicense_oo/source/license/license_en-US.rtf (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/readlicense_oo/source/license/license_en-US.rtf Mon Dec 19 13:03:54 2011
@@ -86,8 +86,8 @@
 {\listoverride\listid146365542\listoverridecount0\ls4}{\listoverride\listid1048803543\listoverridecount0\ls5}{\listoverride\listid1288466756\listoverridecount0\ls6}{\listoverride\listid562569307\listoverridecount0\ls7}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0
 \sb0\sa0}{\pgp\ipgp13\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp1\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp9\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp9\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp9\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp8\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp2\itap0\li0\ri0\sb0\sa0}{\pgp
 \ipgp3\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp9\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp1\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp13\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp1\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp9\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp13\itap0\li0\ri0\sb0\sa0}}
-{\*\rsidtbl \rsid4290690\rsid10049454\rsid14643580\rsid16266304}{\*\generator Microsoft Word 10.0.6866;}{\info{\title Apache License, Version 2.0}{\author Pedro F. Giffuni}{\operator Pedro F. Giffuni}{\creatim\yr2011\mo10\dy31\hr15\min50}
-{\revtim\yr2011\mo10\dy31\hr15\min51}{\version3}{\edmins1}{\nofpages3}{\nofwords1585}{\nofchars8721}{\nofcharsws10286}{\vern16393}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 urn:schemas-microsoft-com:office:smarttags}}
+{\*\rsidtbl \rsid2240674\rsid4290690\rsid10049454\rsid14643580\rsid14768512\rsid16266304}{\*\generator Microsoft Word 10.0.6866;}{\info{\title Apache License, Version 2.0}{\author Apache Software Foundation}{\operator Pedro F. Giffuni}
+{\creatim\yr2011\mo10\dy31\hr15\min50}{\revtim\yr2011\mo12\dy8\hr16\min8}{\version4}{\edmins2}{\nofpages3}{\nofwords1595}{\nofchars8711}{\nofcharsws10261}{\vern16393}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 urn:schemas-microsoft-com:office:smarttags}}
 \paperw12240\paperh15840\margl1701\margr1701\margt1417\margb1417\gutter0\ltrsect \deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\grfdocevents0\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180
 \dghorigin1701\dgvorigin1984\dghshow1\dgvshow1\jexpand\viewkind5\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\allowfieldendsel\rsidroot14643580 \fet0
 {\*\wgrffmtfilter 013f}\ltrpar \sectd \ltrsect\linex0\endnhere\pgbrdropt32\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnqc\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnqc\pnstart1\pnindent720\pnhang {\pntxta .}}
@@ -97,77 +97,77 @@
 \af1\afs16\alang1025 \ltrch \v\f1\fs16\lang9226\langfe9226\cgrid\langnp9226\langfenp9226 {\rtlch \af1 \ltrch \insrsid10049454\charrsid16266304 Bottom of Form
 \par }\pard\plain \ltrpar\s17\qc \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\ipgp8\pararsid16266304 \rtlch \af0\afs24\alang1025 \ltrch \fs24\lang9226\langfe9226\cgrid\langnp9226\langfenp9226 {
 \rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454\charrsid16266304 Apache License\line Version 2.0, January 2004\line }{\field\fldedit{\*\fldinst {\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454\charrsid16266304  HYPERL
-INK "http://www.apache.org/licenses/" }{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid16266304\charrsid16266304 {\*\datafield 
+INK "http://www.apache.org/licenses/" }{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid2240674\charrsid16266304 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b5800000068007400740070003a002f002f007700770077002e006100700061006300680065002e006f00720067002f006c006900630065006e007300650073002f000000795881f43b1d7f48af2c825dc48527630000
-0000a5ab0000}}}{\fldrslt {\rtlch \af0 \ltrch \cs15\ul\cf2\lang9\langfe9226\langnp9\insrsid10049454\charrsid16266304 http://www.apache.org/licenses/}}}\sectd \ltrsect\linex0\endnhere\pgbrdropt32\sectlinegrid360\sectdefaultcl\sftnbj {\rtlch \af0 \ltrch 
+0000a5ab000000}}}{\fldrslt {\rtlch \af0 \ltrch \cs15\ul\cf2\lang9\langfe9226\langnp9\insrsid10049454\charrsid16266304 http://www.apache.org/licenses/}}}\sectd \ltrsect\linex0\endnhere\pgbrdropt32\sectlinegrid360\sectdefaultcl\sftnbj {\rtlch \af0 \ltrch 
 \lang9\langfe9226\langnp9\insrsid10049454\charrsid16266304 
 \par }\pard \ltrpar\s17\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\ipgp8 {\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 TERMS {\*\xmlopen\xmlns1{\factoidname stockticker}}AND
 {\*\xmlclose} CONDITIONS FOR USE, REPRODUCTION, {\*\xmlopen\xmlns1{\factoidname stockticker}}AND{\*\xmlclose} DISTRIBUTION
 \par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart definitions}1. Definitions}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend definitions}.
 \par "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
 \par "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-\par "Legal Entity" shall mean the union of the acting entity and a
-ll other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contra
-ct or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+\par "Legal Entity" shall mean the union of the acting entity and al
+l other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contrac
+t or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 \par "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
 \par "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
 \par "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
 \par "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-\par "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisi
-ons, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the in
-terfaces of, the Work and Derivative Works thereof.
-\par "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to 
-Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communic
-a
-tion sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discuss
-ing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+\par "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisio
+ns, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the int
+erfaces of, the Work and Derivative Works thereof.
+\par "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to L
+icensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communica
+t
+ion sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussi
+ng and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
 \par "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
 \par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart copyright}2. Grant of Copyright License}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend copyright}
-. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, no
-n-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non
+-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
 \par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart patent}3. Grant of Patent License}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend patent}
-. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, 
-use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(
-s
-) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes dir
-ect or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-\par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart redistribution}4. Redistribution}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend redistribution}. You may reproduce and distribute copies
- of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, u
+se, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s
+)
+ with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes dire
+ct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+\par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart redistribution}4. Redistribution}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend redistribution}. You may reproduce and distribute copies 
+of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
 \par {\listtext\pard\plain\ltrpar \s17 \rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 \hich\af0\dbch\af0\loch\f0 1.\tab}}\pard \ltrpar\s17\ql \fi-360\li720\ri0\sb100\sa100\sbauto1\saauto1\widctlpar
 \jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0\ipgp8 {\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 You must give any other recipients of the Work or Derivative Works a copy of this License; and
 \par {\listtext\pard\plain\ltrpar \s17 \rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 \hich\af0\dbch\af0\loch\f0 2.\tab}You must cause any modified files to carry prominent notices stating that You changed the files; and
 \par {\listtext\pard\plain\ltrpar \s17 \rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 \hich\af0\dbch\af0\loch\f0 3.\tab}
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices fr
-om the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices fro
+m the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
 \par {\listtext\pard\plain\ltrpar \s17 \rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 \hich\af0\dbch\af0\loch\f0 4.\tab}
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a read
-able copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivati
-v
-e Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for inform
-a
-tional purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices canno
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a reada
+ble copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivativ
+e
+ Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informa
 t
- be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Deriv
-ative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+ional purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot
+ 
+be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Deriva
+tive Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
 \par }\pard \ltrpar\s17\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\ipgp8 {\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart contributions}
-5. Submission of Contributions}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend contributions}. Unless You explicitly state otherwise, any Contrib
-ution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the ter
-ms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+5. Submission of Contributions}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend contributions}. Unless You explicitly state otherwise, any Contribu
+tion intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the term
+s of any separate license agreement you may have executed with Licensor regarding such Contributions.
 \par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart trademarks}6. Trademarks}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend trademarks}
-. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licen
-sor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licens
+or, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
 \par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart no-warranty}{\*\bkmkend no-warranty}7. Disclaimer of Warranty}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 
-. Unless required by applicable law or agreed to in writing, Licens
-or provides the Work (and each Contributor provides its Contributions) 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, ME
-RCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+. Unless required by applicable law or agreed to in writing, Licenso
+r provides the Work (and each Contributor provides its Contributions) 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, MER
+CHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
 \par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart no-liability}{\*\bkmkend no-liability}8. Limitation of Liability}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 
-. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Cont
-ributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages f
-or loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contr
+ibutor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages fo
+r loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
 \par }{\rtlch \ab\af0 \ltrch \cs20\b\lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkstart additional}9. Accepting Warranty or Additional Liability}{\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 {\*\bkmkend additional}
-. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting 
-such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted
- against, such Contributor by reason of your accepting any such warranty or additional liability.
+. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting s
+uch obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted 
+against, such Contributor by reason of your accepting any such warranty or additional liability.
 \par END OF TERMS {\*\xmlopen\xmlns1{\factoidname stockticker}}AND{\*\xmlclose} CONDITIONS
 \par }\pard\plain \ltrpar\s1\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0\ipgp8 \rtlch \ab\af0\afs48\alang1025 \ltrch 
 \b\fs48\lang9226\langfe9226\kerning36\cgrid\langnp9226\langfenp9226 {\rtlch \af0 \ltrch \lang9\langfe9226\langnp9\insrsid10049454 APPENDIX: How to apply the Apache License to your work

Modified: incubator/ooo/branches/alg/svgreplacement/main/rhino/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/rhino/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/rhino/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/rhino/makefile.mk Mon Dec 19 13:03:54 2011
@@ -30,7 +30,15 @@ PRJ=.
 PRJNAME=ooo_rhino
 TARGET=ooo_rhino
 
-.IF "$(SOLAR_JAVA)"!=""
+.IF "$(SOLAR_JAVA)"==""
+all:
+        @echo java disabled
+
+.ELIF "$(ENABLE_JAVASCRIPT)"!="YES"
+all:
+        @echo javascript support disabled
+.ELSE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
@@ -65,12 +73,4 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
-#.ELSE
-#all:
-#        @echo rhino disabled
-#.ENDIF
-
-.ELSE
-all:
-        @echo java disabled
 .ENDIF

Modified: incubator/ooo/branches/alg/svgreplacement/main/saxon/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/saxon/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/saxon/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/saxon/makefile.mk Mon Dec 19 13:03:54 2011
@@ -35,14 +35,23 @@ TARGET=saxon
 .INCLUDE :	settings.mk
 .INCLUDE : antsettings.mk
 
-.IF "$(DISABLE_SAXON)" == ""
-
-.IF "$(SOLAR_JAVA)" != ""
 .IF "$(SYSTEM_SAXON)" == "YES"
+
 all:
-        @echo "An already available installation of saxon should exist on your system."
+	@echo "An already available installation of saxon should exist on your system."
 	@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
+
+.ELIF "$(DISABLE_SAXON)" == "YES"
+
+all:
+	@echo Support for saxon is disabled.
+
+.ELIF "$(SOLAR_JAVA)" == ""
+
+all:
+	@echo No Java support.  Can not compile saxon.
+
+.ELSE
 
 # --- Files --------------------------------------------------------
 
@@ -57,19 +66,10 @@ BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolar
 
 OUT2CLASS= saxon-build$/9.0.0.7$/bj$/saxon9.jar
 
-.ELSE			# $(SOLAR_JAVA)!= ""
-nojava:
-	@echo "Not building $(PRJNAME) because Java is disabled"
-.ENDIF			# $(SOLAR_JAVA)!= ""
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
-.IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
-.ENDIF
 
-.ELSE
-all:
-	@echo "saxon disabled"
-.ENDIF
+.ENDIF # "$(SOLAR_JAVA)" == ""

Modified: incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/file_library_ooo.scp?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/file_library_ooo.scp Mon Dec 19 13:03:54 2011
@@ -193,21 +193,6 @@ End
 
 #endif
 
-#ifndef SYSTEM_DB
-
-File gid_File_Lib_Db
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX));
-  #else
-    Name = "libdb47.dll";
-  #endif
-End
-
-#endif
-
 #ifdef UNX
 #ifdef ENABLE_GTK
 #ifdef ENABLE_SYSTRAY_GTK

Modified: incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/file_ooo.scp?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/file_ooo.scp Mon Dec 19 13:03:54 2011
@@ -399,27 +399,23 @@ End
 
 #endif
 
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_BSH
+#if defined SOLAR_JAVA && defined ENABLE_BEANSHELL && ! defined SYSTEM_BSH
 STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
 #endif
-#endif
 
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_LUCENE
+#if defined SOLAR_JAVA && ! defined SYSTEM_LUCENE
 STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 )
 STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 )
 #endif
-#endif
 
-#ifdef SOLAR_JAVA
+
 STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
-#endif
 
-#ifdef SOLAR_JAVA
+#if defined SOLAR_JAVA && defined ENABLE_JAVASCRIPT
 STD_JAR_FILE( gid_File_Jar_Js, js )
 #endif
 
+
 #ifdef SOLAR_JAVA
 
 #ifndef MACOSX
@@ -465,10 +461,14 @@ End
 
 #ifdef SOLAR_JAVA
 STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
+#ifdef ENABLE_BEANSHELL
 STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
+#endif
 STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
+#ifdef ENABLE_JAVASCRIPT
 STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
 #endif
+#endif
 
 #ifdef SOLAR_JAVA
 
@@ -1210,11 +1210,13 @@ File gid_File_Share_Registry_Ctl_Xcd
     Name (my) = "ctl.xcd";
 End
 
+#ifdef ENABLE_BEANSHELL
 File gid_File_Scripts_Beanshell
     Dir = gid_Dir_Share_Scripts;
     ARCHIVE_TXT_FILE_BODY;
     Name = "ScriptsBeanShell.zip";
 End
+#endif
 
 #ifdef SOLAR_JAVA
 File gid_File_Scripts_Java
@@ -1224,11 +1226,13 @@ File gid_File_Scripts_Java
 End
 #endif
 
+#ifdef ENABLE_JAVASCRIPT 
 File gid_File_Scripts_Javascript
     Dir = gid_Dir_Share_Scripts;
     ARCHIVE_TXT_FILE_BODY;
     Name = "ScriptsJavaScript.zip";
 End
+#endif
 
 // new user interface configuration files
 File gid_File_Share_Config_Sofficecfg_uiconfig_Zip

Modified: incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/makefile.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/makefile.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/scp2/source/ooo/makefile.mk Mon Dec 19 13:03:54 2011
@@ -120,10 +120,6 @@ SCPDEFS+=-DSYSTEM_LIBXSLT
 SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
 .ENDIF
 
-.IF "$(SYSTEM_DB)" == "YES"
-SCPDEFS+=-DSYSTEM_DB
-.ENDIF
-
 .IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
 SCPDEFS+=-DUSE_SYSTEM_STL
 .ENDIF
@@ -178,6 +174,14 @@ SCPDEFS+=\
 SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
 .ENDIF
 
+.IF "$(ENABLE_BEANSHELL)" == "YES"
+SCPDEFS+=-DENABLE_BEANSHELL
+.ENDIF
+
+.IF "$(ENABLE_JAVASCRIPT)" == "YES"
+SCPDEFS+=-DENABLE_JAVASCRIPT
+.ENDIF
+
 .IF "$(SYSTEM_HSQLDB)" == "YES"
 SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
 .ENDIF
@@ -186,7 +190,7 @@ SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\"
 SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\"
 .ENDIF
 
-.IF "$(DISABLE_SAXON)" == "TRUE"
+.IF "$(DISABLE_SAXON)" == "YES"
 SCPDEFS+=-DDISABLE_SAXON
 .ENDIF
 

Modified: incubator/ooo/branches/alg/svgreplacement/main/scripting/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/scripting/java/build.xml?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/scripting/java/build.xml (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/scripting/java/build.xml Mon Dec 19 13:03:54 2011
@@ -45,6 +45,15 @@
   <property environment="env"/>
   <property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/>
 
+  <target name="eval_environment">
+    <condition property="with_rhino">
+      <equals arg1="${env.ENABLE_JAVASCRIPT}" arg2="YES" />
+    </condition>
+    <condition property="with_beanshell">
+      <equals arg1="${env.ENABLE_BEANSHELL}" arg2="YES" />
+    </condition>
+  </target>
+
   <!-- ==================== classpath setting ============================ -->
   <path id="idlclasspath">
     <pathelement location="${solar.jar}/jurt.jar"/>
@@ -95,10 +104,12 @@
   </target>
 
   <!-- ======================== Compile Classes ========================== -->
-  <target name="compile" depends="prepare">
+  <target name="compile" depends="prepare, eval_environment">
     <javac srcdir="com" destdir="${jardir}"
          includes="**/*.java" classpathref="idlclasspath"
          debug="${debug}" optimize="${optimize}" deprecation="off">
+      <exclude name="**/provider/javascript/*.java" unless="with_rhino" />
+      <exclude name="**/provider/beanshell/*.java" unless="with_beanshell" />
       <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
     </javac>
     <javac srcdir="Framework/" destdir="${jardir}"
@@ -156,7 +167,7 @@
   </target>
 
   <!-- ===================== jar ========================= -->
-  <target name="jar" depends="compile">
+  <target name="jar.provider.java" depends="compile">
     <jar jarfile="${jardir}/ScriptProviderForJava.jar"
          basedir="${jardir}">
         <manifest>
@@ -168,7 +179,9 @@
         </manifest>
         <include name="**/provider/java/*.class"/>
     </jar>
+  </target>
 
+  <target name="jar.provider.beanshell" depends="compile" if="with_beanshell">
     <jar jarfile="${jardir}/ScriptProviderForBeanShell.jar"
          basedir="${jardir}">
         <manifest>
@@ -183,7 +196,9 @@
           <include name="**/provider/beanshell/*.bsh"/>
         </fileset>
     </jar>
+  </target>
 
+  <target name="jar.provider.javascript" depends="compile" if="with_rhino">
     <jar jarfile="${jardir}/ScriptProviderForJavaScript.jar"
          basedir="${jardir}">
         <manifest>
@@ -198,7 +213,9 @@
           <include name="**/provider/javascript/*.js"/>
         </fileset>
     </jar>
+  </target>
 
+  <target name="jar.scriptframework" depends="compile">
     <jar jarfile="${jardir}/ScriptFramework.jar"
          basedir="${jardir}">
         <manifest>
@@ -214,7 +231,9 @@
         <include name="**/container/*.class"/>
         <include name="**/io/*.class"/>
     </jar>
+  </target>
 
+  <target name="jar" depends="jar.provider.java,jar.provider.beanshell,jar.provider.javascript,jar.scriptframework">
   </target>
 
   <target name="idesupport.jar" depends="idesupport.compile">

Modified: incubator/ooo/branches/alg/svgreplacement/main/scripting/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/scripting/prj/build.lst?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/scripting/prj/build.lst (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/scripting/prj/build.lst Mon Dec 19 13:03:54 2011
@@ -1,4 +1,4 @@
-tc	scripting	:	oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
+tc	scripting	:	oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 RHINO:rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
 tc	scripting									usr1	-	all	tc1_mkout NULL
 tc	scripting\inc								nmake	-	all	tc1_inc NULL
 tc	scripting\source\provider				nmake	-	all	tc1_scriptingprovider tc1_inc NULL

Modified: incubator/ooo/branches/alg/svgreplacement/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/set_soenv.in?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/set_soenv.in (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/set_soenv.in Mon Dec 19 13:03:54 2011
@@ -90,7 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV
      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
 	 $PROEXT, $TARFILE_LOCATION,
-     $DISABLE_SAXON, $ENABLE_HUNSPELL, $ENABLE_HYPHEN,
+     $ENABLE_HUNSPELL, $ENABLE_HYPHEN,
      $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
 #
 #-------------------------------------------
@@ -1768,7 +1768,6 @@ if ( $platform =~ m/cygwin/ )
    chomp($tmpdir);
    ToFile( "TMPDIR",     $tmpdir,            "e" );
 }
-ToFile( "DISABLE_SAXON",	"@DISABLE_SAXON@", "e" );
 ToFile( "ENABLE_HUNSPELL",	"@ENABLE_HUNSPELL@", "e" );
 ToFile( "ENABLE_HYPHEN",	"@ENABLE_HYPHEN@", "e" );
 
@@ -1929,9 +1928,6 @@ ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EM
 ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
 ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );
 ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
-ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
-ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
-ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
 ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
 ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
 ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
@@ -1946,8 +1942,11 @@ ToFile( "LUCENE_CORE_JAR",   "@LUCENE_CO
 ToFile( "LUCENE_ANALYZERS_JAR",   "@LUCENE_ANALYZERS_JAR@",  "e" );
 ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
 ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
+ToFile( "ENABLE_BEANSHELL", "@ENABLE_BEANSHELL@",  "e" );
 ToFile( "SYSTEM_SAXON",      "@SYSTEM_SAXON@",     "e" );
 ToFile( "SAXON_JAR",         "@SAXON_JAR@",        "e" );
+ToFile( "DISABLE_SAXON",     "@DISABLE_SAXON@",    "e" );
+ToFile( "ENABLE_JAVASCRIPT", "@ENABLE_JAVASCRIPT@","e" );
 ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
 ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
 ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );

Modified: incubator/ooo/branches/alg/svgreplacement/main/sfx2/source/dialog/splitwin.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/sfx2/source/dialog/splitwin.cxx?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/sfx2/source/dialog/splitwin.cxx (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/sfx2/source/dialog/splitwin.cxx Mon Dec 19 13:03:54 2011
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -61,9 +61,9 @@ using namespace ::rtl;
 struct SfxDock_Impl
 {
 	sal_uInt16 				nType;
-	SfxDockingWindow*	pWin;			// This window has SplitWindow
+	SfxDockingWindow*	pWin;			// SplitWindow hat dieses Fenster
 	sal_Bool				bNewLine;
-	sal_Bool				bHide;			// SplitWindow had this window
+	sal_Bool				bHide;			// SplitWindow hatte dieses Fenster
 	long				nSize;
 };
 
@@ -75,9 +75,9 @@ class SfxEmptySplitWin_Impl : public Spl
 {
 /*  [Beschreibung]
 
-	SfxEmptySplitWin_Impldow is an empty split window replacing the SfxSplitWindow
-	in AutoHide mode. It works as a placeholder to receive mouse MouseMoves.
-	the actual light split window display
+	Das SfxEmptySplitWin_Impldow ist ein leeres SplitWindow, das das SfxSplitWindow
+	im AutoHide-Modus ersetzt. Es dient nur als Platzhalter, um MouseMoves
+	zu empfangen und ggf. das eigentlichte SplitWindow einzublenden
 */
 friend class SfxSplitWindow;
 
@@ -154,9 +154,9 @@ void SfxEmptySplitWin_Impl::FadeIn()
 	pOwner->Show_Impl();
 	if ( bAutoHide )
 	{
-		// Put timer to close; the caller must make sure it is,
-		// that the window does not stay or leave ( z.B. by setting the
-		// Focus mode or modal )
+		// Timer zum Schlie\sen aufsetzen; der Aufrufer mu\s selbst sicherstellen,
+		// da\s das Window nicht gleich wieder zu geht ( z.B. durch Setzen des
+		// Focus oder einen modal mode )
 		aLastPos = GetPointerPosPixel();
 		aTimer.Start();
 	}
@@ -434,13 +434,13 @@ void SfxSplitWindow::InsertWindow( SfxDo
 
 /*  [Beschreibung]
 
-	To insert SfxDockingWindows with no position can also be transfered.
-	The SfxSplitWindow then searches out the noted recently transfered
-	to the newly SfxDockingWindow or it depends on the last.
+	Zum Einf"ugen von SfxDockingWindows kann auch keine Position "ubergeben
+	werden. Das SfxSplitWindow sucht dann die zuletzt gemerkte zu dem
+	"ubergebenen SfxDockingWindow heraus oder h"angt es als letztes neu an.
 
 */
 {
-	short nLine = -1;    	// so first window can be set to 0 nLine high
+	short nLine = -1;    	// damit erstes Fenster nLine auf 0 hochsetzen kann
 	sal_uInt16 nL;
 	sal_uInt16 nPos = 0;
 	sal_Bool bNewLine = sal_True;
@@ -452,33 +452,33 @@ void SfxSplitWindow::InsertWindow( SfxDo
 		SfxDock_Impl *pDock = (*pDockArr)[n];
 		if ( pDock->bNewLine )
 		{
-			// The window opens a new line
+			// Das Fenster er"offnet eine neue Zeile
 			if ( pFoundDock )
-				// But behind the window just inserted
+				// Aber hinter dem gerade eingef"ugten Fenster
 				break;
 
-			// new line
+			// Neue Zeile
 			nPos = 0;
 			bNewLine = sal_True;
 		}
 
 		if ( pDock->pWin )
 		{
-			// It is at this point just a window
+			// Es gibt an dieser Stelle gerade ein Fenster
 			if ( bNewLine && !pFoundDock )
 			{
-				// It is not known, in which real line is the one
+				// Bisher ist nicht bekannt, in welcher realen Zeile es liegt
 				GetWindowPos( pDock->pWin, nL, nPos );
 				nLine = (short) nL;
 			}
 
 			if ( !pFoundDock )
 			{
-				// before the window is attached
+				// Fenster liegt vor dem eingef"ugten
 				nPos++;
 			}
 
-			// Line is now open
+			// Zeile ist schon er"offnet
 			bNewLine = sal_False;
 			if ( pFoundDock )
 				break;
@@ -486,16 +486,16 @@ void SfxSplitWindow::InsertWindow( SfxDo
 
 		if ( pDock->nType == pDockWin->GetType() )
 		{
-			DBG_ASSERT( !pFoundDock && !pDock->pWin, "Window is already available!");
+			DBG_ASSERT( !pFoundDock && !pDock->pWin, "Fenster ist schon vorhanden!");
 			pFoundDock = pDock;
 			if ( !bNewLine )
 				break;
 			else
 			{
-				// It was most recently a new series started, but not found a 
-				// window above it, so keep looking if nochein window follows
-				// this line to bNewLine to set correctly. But it must be nLine
-				// or nPos shouldn't be changed.
+				// Es wurde zuletzt eine neue Reihe gestartet, aber noch kein
+				// darin liegendes Fenster gefunden; daher weitersuchen, ob noch
+				// ein Fenster in dieser Zeile folgt, um bNewLine korrekt zu setzen.
+				// Dabei darf aber nLine oder nPos nicht mehr ver"andert werden!
 				nLine++;
 			}
 		}
@@ -528,7 +528,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(
 
 /*  [Beschreibung]
 
-	The DockinWindow is no longer stored in the  internal data.
+	Das DockingWindow wird nicht mehr in den internen Daten gespeichert.
 */
 
 {
@@ -607,16 +607,15 @@ void SfxSplitWindow::InsertWindow( SfxDo
 	pDock->bNewLine = bNewLine;
 	pDock->pWin = pDockWin;
 
-	DBG_ASSERT( nPos==0 || !bNewLine, "Wrong Parameter!");
+	DBG_ASSERT( nPos==0 || !bNewLine, "Falsche Paramenter!");
 	if ( bNewLine )
 		nPos = 0;
 
-	// The window introduced before the first window are suffices that the
-	// body or a greater position as the pDockWin.
+	// Das Fenster mu\s vor dem ersten Fenster eingef"ugt werden, das die
+	// gleiche oder eine gr"o\sere Position hat als pDockWin.
 	sal_uInt16 nCount = pDockArr->Count();
-	sal_uInt16 nLastWindowIdx(0);
 
-	// If window not found, is inserted as the first
+	// Wenn gar kein Fenster gefunden wird, wird als erstes eingef"ugt
 	sal_uInt16 nInsertPos = 0;
 	for ( sal_uInt16 n=0; n<nCount; n++ )
 	{
@@ -628,31 +627,26 @@ void SfxSplitWindow::InsertWindow( SfxDo
 			// Wenn kein geeignetes Fenster hinter der gew"unschten Einf"ugeposition
 			// gefunden wird, wird am Ende eingef"ugt
 			nInsertPos = nCount;
-			nLastWindowIdx = n;
 			sal_uInt16 nL=0, nP=0;
 			GetWindowPos( pD->pWin, nL, nP );
 
 			if ( (nL == nLine && nP == nPos) || nL > nLine )
 			{
-				DBG_ASSERT( nL == nLine || bNewLine || nPos > 0, "Wrong Parameter!" );
+				DBG_ASSERT( nL == nLine || bNewLine || nPos > 0, "Falsche Parameter!" );
 				if ( nL == nLine && nPos == 0 && !bNewLine )
 				{
-					DBG_ASSERT(pD->bNewLine, "No new line?");
+					DBG_ASSERT(pD->bNewLine, "Keine neue Zeile?");
 
 					// Das Fenster wird auf nPos==0 eingeschoben
 					pD->bNewLine = sal_False;
 					pDock->bNewLine = sal_True;
 				}
 
-				nInsertPos = n != 0 ? nLastWindowIdx + 1 : 0;    // ignore all non-windows after the last window
+				nInsertPos = n;
 				break;
 			}
 		}
 	}
-    if (nInsertPos == nCount && nLastWindowIdx != nCount - 1)
-    {
-        nInsertPos = nLastWindowIdx + 1;    // ignore all non-windows after the last window
-    }
 
 	pDockArr->Insert(pDock, nInsertPos);
 	InsertWindow_Impl( pDock, rSize, nLine, nPos, bNewLine );

Modified: incubator/ooo/branches/alg/svgreplacement/main/solenv/gbuild/platform/freebsd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/solenv/gbuild/platform/freebsd.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/solenv/gbuild/platform/freebsd.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/solenv/gbuild/platform/freebsd.mk Mon Dec 19 13:03:54 2011
@@ -1,27 +1,21 @@
 #*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
 #
 #*************************************************************************
 

Modified: incubator/ooo/branches/alg/svgreplacement/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/solenv/gbuild/platform/os2.mk?rev=1220726&r1=1220725&r2=1220726&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/solenv/gbuild/platform/os2.mk (original)
+++ incubator/ooo/branches/alg/svgreplacement/main/solenv/gbuild/platform/os2.mk Mon Dec 19 13:03:54 2011
@@ -1,27 +1,21 @@
 #*************************************************************************
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
 #
 #*************************************************************************
 



Mime
View raw message