directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r696578 [2/2] - in /directory/studio/trunk: ./ apacheds-configuration-help/META-INF/ apacheds-help/META-INF/ docs/ jars/META-INF/ ldapbrowser-core/META-INF/ ldapbrowser-feature/META-INF/ ldapbrowser-help/META-INF/ ldapbrowser-ui/META-INF/ l...
Date Thu, 18 Sep 2008 07:00:24 GMT
Modified: directory/studio/trunk/test-integration-core/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-core/META-INF/LICENSE.txt?rev=696578&r1=696577&r2=696578&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-core/META-INF/LICENSE.txt (original)
+++ directory/studio/trunk/test-integration-core/META-INF/LICENSE.txt Thu Sep 18 00:00:23
2008
@@ -203,10 +203,14 @@
 
 --------------------------------------------------------------------------------
 
-ANTLR 2 License

We reserve no legal rights to the ANTLR--it is fully in the public domain.
An 
+ANTLR 2 License
+
+We reserve no legal rights to the ANTLR--it is fully in the public domain. An 
 individual or company may do whatever they wish with source code distributed 
 with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR,
- or its output, into commerical software.

We encourage users to develop software with ANTLR.
However, we do ask that 
+ or its output, into commerical software.
+
+We encourage users to develop software with ANTLR. However, we do ask that 
 credit is given to us for developing ANTLR. By "credit", we mean that if you 
 use ANTLR or incorporate any source code into one of your programs (commercial 
 product, research project, or otherwise) that you acknowledge this fact 
@@ -250,11 +254,3 @@
 OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. 
-
---------------------------------------------------------------------------------
-
-    IVY License
-
-Copyright (c) 1998, Regents of the University of California
All rights reserved.
Redistribution
and use in source and binary forms, with or without
modification, are permitted provided that
the following conditions are met:

    * Redistributions of source code must retain the above
copyright
      notice, this list of conditions and the following disclaimer.
    * Redistributions
in binary form must reproduce the above copyright
      notice, this list of conditions and
the following disclaimer in the
      documentation and/or other materials provided with the
distribution.
    * Neither the name of the University of California, Berkeley nor the
  
   names of its contributors may be used to endorse or promote products
      derived from
this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE
LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: directory/studio/trunk/test-integration-ui/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/META-INF/LICENSE.txt?rev=696578&r1=696577&r2=696578&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/META-INF/LICENSE.txt (original)
+++ directory/studio/trunk/test-integration-ui/META-INF/LICENSE.txt Thu Sep 18 00:00:23 2008
@@ -203,10 +203,14 @@
 
 --------------------------------------------------------------------------------
 
-ANTLR 2 License

We reserve no legal rights to the ANTLR--it is fully in the public domain.
An 
+ANTLR 2 License
+
+We reserve no legal rights to the ANTLR--it is fully in the public domain. An 
 individual or company may do whatever they wish with source code distributed 
 with ANTLR or the code generated by ANTLR, including the incorporation of ANTLR,
- or its output, into commerical software.

We encourage users to develop software with ANTLR.
However, we do ask that 
+ or its output, into commerical software.
+
+We encourage users to develop software with ANTLR. However, we do ask that 
 credit is given to us for developing ANTLR. By "credit", we mean that if you 
 use ANTLR or incorporate any source code into one of your programs (commercial 
 product, research project, or otherwise) that you acknowledge this fact 
@@ -250,11 +254,3 @@
 OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. 
-
---------------------------------------------------------------------------------
-
-    IVY License
-
-Copyright (c) 1998, Regents of the University of California
All rights reserved.
Redistribution
and use in source and binary forms, with or without
modification, are permitted provided that
the following conditions are met:

    * Redistributions of source code must retain the above
copyright
      notice, this list of conditions and the following disclaimer.
    * Redistributions
in binary form must reproduce the above copyright
      notice, this list of conditions and
the following disclaimer in the
      documentation and/or other materials provided with the
distribution.
    * Neither the name of the University of California, Berkeley nor the
  
   names of its contributors may be used to endorse or promote products
      derived from
this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS
FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE
LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: directory/studio/trunk/updatesite/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/directory/studio/trunk/updatesite/src/main/resources/LICENSE.txt?rev=696578&r1=696577&r2=696578&view=diff
==============================================================================
--- directory/studio/trunk/updatesite/src/main/resources/LICENSE.txt (original)
+++ directory/studio/trunk/updatesite/src/main/resources/LICENSE.txt Thu Sep 18 00:00:23 2008
@@ -203,36 +203,6 @@
 
 --------------------------------------------------------------------------------
 
-    IVY License
-
-Copyright (c) 1998, Regents of the University of California
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the University of California, Berkeley nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------
-
     NLOG4J License
 
 Copyright (c) 2004-2006 SLF4J.ORG 
@@ -317,7 +287,7 @@
 
 Eclipse Public License - v 1.0
 
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT").
ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENTÕS ACCEPTANCE OF
THIS AGREEMENT.
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT").
ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT�S ACCEPTANCE
OF THIS AGREEMENT.
 
 1. DEFINITIONS
 
@@ -330,7 +300,7 @@
 
     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.
+    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.
 
@@ -346,7 +316,7 @@
 
 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.
+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.
 
@@ -380,7 +350,7 @@
 
 Commercial distributors of software may accept certain responsibilities with respect to end
users, business partners and the like. While this license is intended to facilitate the commercial
use of the Program, the Contributor who includes the Program in a commercial product offering
should do so in a manner which does not create potential liability for other Contributors.
Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor
("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified
Contributor") against any losses, damages and costs (collectively "Losses") arising from claims,
lawsuits and other legal actions brought by a third party against the Indemnified Contributor
to the extent caused by the acts or omissions of such Commercial Contributor in connection
with its distribution of the Program in a commercial product offering. The obligations in
this section do not apply to any claim
 s or Losses relating to any actual or alleged intellectual property infringement. In order
to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor
in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate
with the Commercial Contributor in, the defense and any related settlement negotiations. The
Indemnified Contributor may participate in any such claim at its own expense.
 
-For example, a Contributor might include the Program in a commercial product offering, Product
X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then
makes performance claims, or offers warranties related to Product X, those performance claims
and warranties are such Commercial ContributorÕs responsibility alone. Under this section,
the Commercial Contributor would have to defend claims against the other Contributors related
to those performance claims and warranties, and if a court requires any other Contributor
to pay any damages as a result, the Commercial Contributor must pay those damages.
+For example, a Contributor might include the Program in a commercial product offering, Product
X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then
makes performance claims, or offers warranties related to Product X, those performance claims
and warranties are such Commercial Contributor�s responsibility alone. Under this section,
the Commercial Contributor would have to defend claims against the other Contributors related
to those performance claims and warranties, and if a court requires any other Contributor
to pay any damages as a result, the Commercial Contributor must pay those damages.
 
 5. NO WARRANTY
 
@@ -394,9 +364,9 @@
 
 If any provision of this Agreement is invalid or unenforceable under applicable law, it shall
not affect the validity or enforceability of the remainder of the terms of this Agreement,
and without further action by the parties hereto, such provision shall be reformed to the
minimum extent necessary to make such provision valid and enforceable.
 
-If Recipient institutes patent litigation against any entity (including a cross-claim or
counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the
Program with other software or hardware) infringes such RecipientÕs patent(s), then such
RecipientÕs rights granted under Section 2(b) shall terminate as of the date such litigation
is filed.
+If Recipient institutes patent litigation against any entity (including a cross-claim or
counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the
Program with other software or hardware) infringes such Recipient�s patent(s), then such
Recipient�s rights granted under Section 2(b) shall terminate as of the date such litigation
is filed.
 
-All RecipientÕs rights under this Agreement shall terminate if it fails to comply with any
of the material terms or conditions of this Agreement and does not cure such failure in a
reasonable period of time after becoming aware of such noncompliance. If all RecipientÕs
rights under this Agreement terminate, Recipient agrees to cease use and distribution of the
Program as soon as reasonably practicable. However, RecipientÕs obligations under this Agreement
and any licenses granted by Recipient relating to the Program shall continue and survive.
+All Recipient�s rights under this Agreement shall terminate if it fails to comply with
any of the material terms or conditions of this Agreement and does not cure such failure in
a reasonable period of time after becoming aware of such noncompliance. If all Recipient�s
rights under this Agreement terminate, Recipient agrees to cease use and distribution of the
Program as soon as reasonably practicable. However, Recipient�s obligations under this
Agreement and any licenses granted by Recipient relating to the Program shall continue and
survive.
 
 Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid
inconsistency the Agreement is copyrighted and may only be modified in the following manner.
The Agreement Steward reserves the right to publish new versions (including revisions) of
this Agreement from time to time. No one other than the Agreement Steward has the right to
modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse
Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate
entity. Each new version of the Agreement will be given a distinguishing version number. The
Program (including Contributions) may always be distributed subject to the version of the
Agreement under which it was received. In addition, after a new version of the Agreement is
published, Contributor may elect to distribute the Program (including its Contributions) under
the new version. Except as expressly stated in Sections 2(a) a
 nd 2(b) above, Recipient receives no rights or licenses to the intellectual property of any
Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise.
All rights in the Program not expressly granted under this Agreement are reserved.
 



Mime
View raw message