You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2011/08/25 11:10:48 UTC

svn commit: r1161452 - in /pivot/trunk: ci-builds-on-jenkins/lib/cpl-v10.html ci-builds-on-jenkins/lib/junit-LICENSE-CPL.txt demos/src/org/apache/pivot/demos/styles/color_scheme_builder_window.bxml

Author: smartini
Date: Thu Aug 25 09:10:47 2011
New Revision: 1161452

URL: http://svn.apache.org/viewvc?rev=1161452&view=rev
Log:
trim-whitespace

Modified:
    pivot/trunk/ci-builds-on-jenkins/lib/cpl-v10.html
    pivot/trunk/ci-builds-on-jenkins/lib/junit-LICENSE-CPL.txt
    pivot/trunk/demos/src/org/apache/pivot/demos/styles/color_scheme_builder_window.bxml

Modified: pivot/trunk/ci-builds-on-jenkins/lib/cpl-v10.html
URL: http://svn.apache.org/viewvc/pivot/trunk/ci-builds-on-jenkins/lib/cpl-v10.html?rev=1161452&r1=1161451&r2=1161452&view=diff
==============================================================================
--- pivot/trunk/ci-builds-on-jenkins/lib/cpl-v10.html (original)
+++ pivot/trunk/ci-builds-on-jenkins/lib/cpl-v10.html Thu Aug 25 09:10:47 2011
@@ -19,10 +19,10 @@
 b) in the case of each subsequent Contributor:</FONT></UL>
 
 
-<UL><FONT SIZE="2">i)	 	changes to the Program, and</FONT></UL>
+<UL><FONT SIZE="2">i)         changes to the Program, and</FONT></UL>
 
 
-<UL><FONT SIZE="2">ii)		additions to the Program;</FONT></UL>
+<UL><FONT SIZE="2">ii)        additions to the Program;</FONT></UL>
 
 
 <UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.  </FONT><FONT SIZE="2">A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf.  </FONT><FONT SIZE="2">Contributions do not include additions to the Program which:  (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.  </FONT></UL>
@@ -38,25 +38,25 @@ b) in the case of each subsequent Contri
 <P><FONT SIZE="2"><B></B></FONT>
 <P><FONT SIZE="2"><B>2.  GRANT OF RIGHTS</B></FONT>
 
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a)	</FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.</FONT></UL>
+<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a)    </FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.</FONT></UL>
 
 
 <UL><FONT SIZE="2"></FONT></UL>
 
 
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) 	Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form.  This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents.  The patent license shall not apply to any other combinations which include the Contribution.  No hardware per se is licensed hereunder.   </FONT></UL>
+<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b)     Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form.  This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents.  The patent license shall not apply to any other combinations which include the Contribution.  No hardware per se is licensed hereunder.   </FONT></UL>
 
 
 <UL><FONT SIZE="2"></FONT></UL>
 
 
-<UL><FONT SIZE="2">c)	Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity.  Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise.  As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any.  For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.</FONT></UL>
+<UL><FONT SIZE="2">c)    Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity.  Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise.  As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any.  For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.</FONT></UL>
 
 
 <UL><FONT SIZE="2"></FONT></UL>
 
 
-<UL><FONT SIZE="2">d)	Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL>
+<UL><FONT SIZE="2">d)    Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL>
 
 
 <UL><FONT SIZE="2"></FONT></UL>
@@ -64,32 +64,32 @@ b) in the case of each subsequent Contri
 <P><FONT SIZE="2"><B>3.  REQUIREMENTS</B></FONT>
 <P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT>
 
-<UL><FONT SIZE="2">a)	it complies with the terms and conditions of this Agreement; and</FONT></UL>
+<UL><FONT SIZE="2">a)    it complies with the terms and conditions of this Agreement; and</FONT></UL>
 
 
-<UL><FONT SIZE="2">b)	its license agreement:</FONT></UL>
+<UL><FONT SIZE="2">b)    its license agreement:</FONT></UL>
 
 
-<UL><FONT SIZE="2">i)	effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL>
+<UL><FONT SIZE="2">i)    effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL>
 
 
-<UL><FONT SIZE="2">ii) 	effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
+<UL><FONT SIZE="2">ii)     effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
 
 
-<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2">	states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
+<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2">    states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
 
 
-<UL><FONT SIZE="2">iv)	states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
+<UL><FONT SIZE="2">iv)    states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
 
 
 <UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL>
 
 <P><FONT SIZE="2">When the Program is made available in source code form:</FONT>
 
-<UL><FONT SIZE="2">a)	it must be made available under this Agreement; and </FONT></UL>
+<UL><FONT SIZE="2">a)    it must be made available under this Agreement; and </FONT></UL>
 
 
-<UL><FONT SIZE="2">b)	a copy of this Agreement must be included with each copy of the Program.  </FONT></UL>
+<UL><FONT SIZE="2">b)    a copy of this Agreement must be included with each copy of the Program.  </FONT></UL>
 
 <P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT>
 <P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program.  </FONT>

Modified: pivot/trunk/ci-builds-on-jenkins/lib/junit-LICENSE-CPL.txt
URL: http://svn.apache.org/viewvc/pivot/trunk/ci-builds-on-jenkins/lib/junit-LICENSE-CPL.txt?rev=1161452&r1=1161451&r2=1161452&view=diff
==============================================================================
--- pivot/trunk/ci-builds-on-jenkins/lib/junit-LICENSE-CPL.txt (original)
+++ pivot/trunk/ci-builds-on-jenkins/lib/junit-LICENSE-CPL.txt Thu Aug 25 09:10:47 2011
@@ -10,8 +10,8 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UND
 
 a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
 b) in the case of each subsequent Contributor:
-i)	 changes to the Program, and
-ii)	 additions to the Program;
+i)     changes to the Program, and
+ii)     additions to the Program;
 where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
 
 "Contributor" means any person or entity that distributes the Program.
@@ -28,24 +28,24 @@ where such changes and/or additions to t
 
 2. GRANT OF RIGHTS
 
-a)	Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+a)    Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
 b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c)	Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d)	Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+c)    Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+d)    Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
 3. REQUIREMENTS
 
 A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
 
-a)	it complies with the terms and conditions of this Agreement; and
-b)	its license agreement:
-i)	effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+a)    it complies with the terms and conditions of this Agreement; and
+b)    its license agreement:
+i)    effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
 ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii)	states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv)	states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+iii)    states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iv)    states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
 When the Program is made available in source code form:
 
-a)	it must be made available under this Agreement; and
-b)	a copy of this Agreement must be included with each copy of the Program.
+a)    it must be made available under this Agreement; and
+b)    a copy of this Agreement must be included with each copy of the Program.
 
 Contributors may not remove or alter any copyright notices contained within the Program.
 

Modified: pivot/trunk/demos/src/org/apache/pivot/demos/styles/color_scheme_builder_window.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/styles/color_scheme_builder_window.bxml?rev=1161452&r1=1161451&r2=1161452&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/styles/color_scheme_builder_window.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/styles/color_scheme_builder_window.bxml Thu Aug 25 09:10:47 2011
@@ -52,14 +52,14 @@ limitations under the License.
 
                     <TablePane.Row height="1*">
                         <BoxPane orientation="vertical" styles="{fill:true, verticalAlignment:'bottom'}">
-                            <PushButton bxml:id="copyToClipboardButton" buttonData="Copy" 
-                            	tooltipText="Click to copy color data in Clipboard"/>
+                            <PushButton bxml:id="copyToClipboardButton" buttonData="Copy"
+                                tooltipText="Click to copy color data in Clipboard"/>
                         </BoxPane>
                     </TablePane.Row>
                     <TablePane.Row height="1*">
                         <BoxPane orientation="vertical" styles="{fill:true, verticalAlignment:'bottom'}">
-                            <PushButton bxml:id="resetPaletteButton" buttonData="Reset" 
-                            	tooltipText="Click to reset color data to theme default"/>
+                            <PushButton bxml:id="resetPaletteButton" buttonData="Reset"
+                                tooltipText="Click to reset color data to theme default"/>
                         </BoxPane>
                     </TablePane.Row>
                 </TablePane>