diff options
| author | acolyer <acolyer> | 2006-06-01 10:46:14 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2006-06-01 10:46:14 +0000 |
| commit | c82fae9bb7478f78837f98ac4b43564f1eef8770 (patch) | |
| tree | bd0ba8acf227ad641acddbae212200f5143e75ac | |
| parent | b6c89301f2389edcd017c66968cce7d628a708a0 (diff) | |
| download | aspectj-c82fae9bb7478f78837f98ac4b43564f1eef8770.tar.gz aspectj-c82fae9bb7478f78837f98ac4b43564f1eef8770.zip | |
update license to EPL
31 files changed, 309 insertions, 267 deletions
diff --git a/ajde/ajsrc/org/aspectj/ajde/AjdeApiRules.aj b/ajde/ajsrc/org/aspectj/ajde/AjdeApiRules.aj index 91f67ce8c..cc03e1f33 100644 --- a/ajde/ajsrc/org/aspectj/ajde/AjdeApiRules.aj +++ b/ajde/ajsrc/org/aspectj/ajde/AjdeApiRules.aj @@ -3,9 +3,9 @@ * 2003 Contributors.
* All rights reserved.
* This program and the accompanying materials are made available
- * under the terms of the Common Public License v1.0
+ * under the terms of the Eclipse Public License v1.0
* which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Xerox/PARC initial implementation
diff --git a/build/build-properties.xml b/build/build-properties.xml index f9dc69835..1d67b87e0 100644 --- a/build/build-properties.xml +++ b/build/build-properties.xml @@ -4,9 +4,9 @@ <!-- Copyright (c) 2003, 2005 Contributors. --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Common Public License v1.0 --> +<!-- under the terms of the Eclipse Public License v1.0 --> <!-- which accompanies this distribution and is available at --> -<!-- http://www.eclipse.org/legal/cpl-v10.html --> +<!-- http://www.eclipse.org/legal/epl-v10.html --> <!-- --> <!-- Contributors: --> <!-- Xerox/PARC initial implementation --> diff --git a/build/build.xml b/build/build.xml index 89eaf3227..d1456e5b1 100644 --- a/build/build.xml +++ b/build/build.xml @@ -5,9 +5,9 @@ <!-- 2003-2005 Contributors --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Common Public License v1.0 --> +<!-- under the terms of the Eclipse Public License v1.0 --> <!-- which accompanies this distribution and is available at --> -<!-- http://www.eclipse.org/legal/cpl-v10.html --> +<!-- http://www.eclipse.org/legal/epl-v10.html --> <!-- --> <!-- Contributors: (See CVS checkin's) --> <!-- Xerox/PARC initial implementation --> diff --git a/build/lib/BridgeVersion.java.txt b/build/lib/BridgeVersion.java.txt index 5a755d097..132e027ae 100644 --- a/build/lib/BridgeVersion.java.txt +++ b/build/lib/BridgeVersion.java.txt @@ -3,9 +3,9 @@ * 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Common Public License v1.0 + * under the terms of the Eclipse Public License v1.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/cpl-v10.html + * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Xerox/PARC initial implementation diff --git a/build/products/aspectj/install/intro.html b/build/products/aspectj/install/intro.html index 82043f49b..0c0b75d25 100644 --- a/build/products/aspectj/install/intro.html +++ b/build/products/aspectj/install/intro.html @@ -7,8 +7,8 @@ <p>This installs the complete AspectJ 5 Development Kit (AJDK) distribution, with the compiler, aspect libraries, structure browser, ant tasks, documentation, and examples. -This distribution is covered by the Common Public License (see - http://www.eclipse.org/legal/cpl-v10.html). +This distribution is covered by the Eclipse Public License (see + http://www.eclipse.org/legal/epl-v10.html). <p> For IDE integrations or source code, see the project home page at http://eclipse.org/aspectj</p> diff --git a/build/products/tools/install/intro.html b/build/products/tools/install/intro.html index e81f51e03..3194fac4c 100644 --- a/build/products/tools/install/intro.html +++ b/build/products/tools/install/intro.html @@ -15,7 +15,7 @@ <p align="center">Version ${build.version.long} built on ${build.date}</p> <p> This is a binary only release of tools made available under -the Common Public License. +the Eclipse Public License. For more information on the license or to download the source code, see http://eclipse.org/aspectj</p> <p>${copyright.allRights.from1998}</p> diff --git a/docs/build.xml b/docs/build.xml index 7fe6bafdd..b053c1bd6 100644 --- a/docs/build.xml +++ b/docs/build.xml @@ -4,9 +4,9 @@ <!-- 2004-2005 Contributors. --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Common Public License v1.0 --> +<!-- under the terms of the Eclipse Public License v1.0 --> <!-- which accompanies this distribution and is available at --> -<!-- http://www.eclipse.org/legal/cpl-v10.html --> +<!-- http://www.eclipse.org/legal/epl-v10.html --> <!-- --> <!-- Contributors: --> <!-- Xerox/PARC initial implementation --> diff --git a/docs/devGuideDB/antsupport.xml b/docs/devGuideDB/antsupport.xml index cb12473bd..cba940e1a 100644 --- a/docs/devGuideDB/antsupport.xml +++ b/docs/devGuideDB/antsupport.xml @@ -52,7 +52,7 @@ with Ant 1.3 and Ant 1.4, but the task sources must be compiled with those versions of the Ant libraries to be used under those versions of Ant. - Sources are available under the Common Public License v. 1.0 + Sources are available under the Eclipse Public License v. 1.0 at <ulink url="http://eclipse.org/aspectj">http://eclipse.org/aspectj</ulink>. </para> <para> diff --git a/docs/developer/compiler-weaver/index.html b/docs/developer/compiler-weaver/index.html index 7265bed47..b94686815 100644 --- a/docs/developer/compiler-weaver/index.html +++ b/docs/developer/compiler-weaver/index.html @@ -613,14 +613,14 @@ throw signature. Because we decided at the beginning of this section to not include the static type of the exception thrown in the throw signature, these classes are extremely simple. Nevertheless, we have to build them. Notice that when we add new source files to the system we need to include the -standard eclipse CPL license header.</p> +standard eclipse EPL license header.</p> <pre>/* ******************************************************************* - * Copyright (c) 2004 Contributors. + * Copyright (c) 2006 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Common Public License v1.0 + * under the terms of the Eclipse Public License v1.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/cpl-v10.html + * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Jim Hugunin initial implementation @@ -631,12 +631,12 @@ import org.aspectj.lang.Signature; public interface ThrowSignature extends Signature { }</pre> <pre>/* ******************************************************************* - * Copyright (c) 2004 Contributors. + * Copyright (c) 2006 Contributors. * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Common Public License v1.0 + * under the terms of the Eclipse Public License v1.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/cpl-v10.html + * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Jim Hugunin initial implementation diff --git a/docs/dist/LICENSE-AspectJ.html b/docs/dist/LICENSE-AspectJ.html index 88be39978..e59051688 100644 --- a/docs/dist/LICENSE-AspectJ.html +++ b/docs/dist/LICENSE-AspectJ.html @@ -2,6 +2,8 @@ <head> <title>AspectJ License</title> + + </head> <BODY BGCOLOR="white"> @@ -13,140 +15,77 @@ is available from <a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a></p> -<p>The AspectJ compiler and core tools are distributed under the -Common Public License version 1.0 available - <a href="http://eclipse.org/legal/cpl-v10.html">here</a> - and copied below. - This license has been approved by -the <a href="http://www.opensource.org">Open Source Initiative</a> as -conforming to the <a href="http://www.opensource.org/osd.html">Open -Source Definition</a>. -More information about the history and rationale behind this license -can be found at the - <a href="http://eclipse.org">eclipse web site</a>.</p> - -<p> -Those portions of this distribution in the <code>org.apache</code> -Java namespace are available under the terms of -the Apache Software License, Version 1.1 -(See <a href="http://jakarta.apache.org"> - http://jakarta.apache.org</a>). -</p> -<hr> - -<P ALIGN="CENTER"><B>Common Public License - v 1.0</B> -<P><B></B><FONT SIZE="3"></FONT> -<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"><B>1. DEFINITIONS</B></FONT> -<P><FONT SIZE="2">"Contribution" means:</FONT> - -<UL><FONT SIZE="2">a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and<BR CLEAR="LEFT"> -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">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> - -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. </FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT> -<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></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"></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> - -<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">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">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">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">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> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. </FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"><B>4. COMMERCIAL DISTRIBUTION</B></FONT> -<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">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.</FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT> -<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5. NO WARRANTY</B></FONT> -<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT SIZE="2"> and assumes all risks associated with its exercise of rights under this Agreement</FONT><FONT SIZE="2">, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, </FONT><FONT SIZE="2">programs or equipment, and unavailability or interruption of operations</FONT><FONT SIZE="2">. </FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6. DISCLAIMER OF LIABILITY</B></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"><B>7. GENERAL</B></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2">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.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. </FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">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. </FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2">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 </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. </FONT><FONT SIZE="2">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 </FONT><FONT SIZE="2">version. </FONT><FONT SIZE="2">Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, </FONT><FONT SIZE="2">by implication, estoppel or otherwise</FONT><FONT SIZE="2">.</FONT><FONT SIZE="2"> All rights in the Program not expressly granted under this Agreement are reserved.</FONT> -<P><FONT SIZE="2"></FONT> -<P><FONT SIZE="2">This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.</FONT> -<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT> -<P><FONT SIZE="2"></FONT> +<p>The Eclipse Foundation makes available all content in this distribution ("Content"). + Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the + Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available + at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. + For purposes of the EPL, "Program" will mean the Content.</p> + + <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is + being redistributed by another party ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the Redistributor's license + that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise + indicated below, the terms and conditions of the EPL still apply to any source code in the Content + and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> + + + <h3>Third Party Content</h3> + <p>The Content includes items that have been sourced from third parties as set out below. If you + did not receive this Content directly from the Eclipse Foundation, the following is provided + for informational purposes only, and you should look to the RedistributorŐs license for + terms and conditions of use.</p> + <em> + + <h4>BCEL v5.1</h4> + <p>This product contains software developed by the + Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p> + + <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1. + BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source + code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code + is made available under the Apache Software License v1.1</p> + + <h4>ASM v2.2.1</h4> + <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>) + The source code for ASM is available from the ObjectWeb download site at + <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>. + <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>. + The license is also reproduced here: + </p> + +<pre>Copyright (c) 2000-2005 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER OR 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. +</pre> + +</em> -<hr> </body> </html> diff --git a/docs/dist/doc/examples/build.xml b/docs/dist/doc/examples/build.xml index 37c1dede8..6a0cce27f 100644 --- a/docs/dist/doc/examples/build.xml +++ b/docs/dist/doc/examples/build.xml @@ -4,9 +4,9 @@ <!-- 2002 Palo Alto Research Center, Incorporated (PARC). --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Common Public License v1.0 --> +<!-- under the terms of the Eclipse Public License v1.0 --> <!-- which accompanies this distribution and is available at --> -<!-- http://www.eclipse.org/legal/cpl-v10.html --> +<!-- http://www.eclipse.org/legal/epl-v10.html --> <!-- --> <!-- Contributors: --> <!-- Xerox/PARC initial implementation --> diff --git a/docs/dist/doc/examples/ltw/Tracing.aj b/docs/dist/doc/examples/ltw/Tracing.aj index 29268f348..36170ab0c 100644 --- a/docs/dist/doc/examples/ltw/Tracing.aj +++ b/docs/dist/doc/examples/ltw/Tracing.aj @@ -1,9 +1,9 @@ /* * Copyright (c) 2004 IBM Corporation and others. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 + * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html + * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * Matthew Webster initial implementation diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml index 388ddf8cb..d57a97d1f 100644 --- a/docs/faq/faq.xml +++ b/docs/faq/faq.xml @@ -164,7 +164,10 @@ <para>How is AspectJ licensed?</para> </question> <answer> - <para>AspectJ 1.1 source code and documentation is available under the + <para>AspectJ 1.5.2 source code and documentation is available under the + <ulink url="http://eclipse.org/legal/epl-v10.html">Eclipse Public License 1.0</ulink>. + </para> + <para>AspectJ 1.1 through 1.5.1 source code and documentation is available under the <ulink url="http://eclipse.org/legal/cpl-v10.html">Common Public License 1.0</ulink>. </para> <para>The AspectJ 1.0 tools are open-source software available under the diff --git a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/AOPAllianceAdapter.aj b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/AOPAllianceAdapter.aj index 789e18fde..3487a2500 100644 --- a/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/AOPAllianceAdapter.aj +++ b/docs/sandbox/aopalliance/src/org/aspectj/aopalliance/AOPAllianceAdapter.aj @@ -1,9 +1,9 @@ /*******************************************************************************
* Copyright (c) 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
+ * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/docs/teaching/readme.txt b/docs/teaching/readme.txt index f346cd414..e1f16c903 100644 --- a/docs/teaching/readme.txt +++ b/docs/teaching/readme.txt @@ -3,9 +3,9 @@ Copyright (c) 1998-2002 Palo Alto Research Center, Incorporated (PARC). All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Common Public License v1.0 + * under the terms of the Eclipse Public License v1.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/cpl-v10.html + * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * PARC initial implementation
\ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.doc/about.html b/eclipse.plugin/org.aspectj.ajde.doc/about.html index 8e5456fdc..8b033adcc 100644 --- a/eclipse.plugin/org.aspectj.ajde.doc/about.html +++ b/eclipse.plugin/org.aspectj.ajde.doc/about.html @@ -5,26 +5,24 @@ <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> -<h2>About This Content</h2> - -<p>5th November, 2003</p> -<h3>License</h3> -<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>. -For purposes of the CPL, "Program" will mean the Content.</p> -<h3>Contributions</h3> +<h3>About This Content</h3> -<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise -made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such -Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p> + <p>May 2, 2006</p> + <h3>License</h3> -<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or -other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the -host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available -to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also -providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of -the CPL.</p> + <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). + Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the + Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available + at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. + For purposes of the EPL, "Program" will mean the Content.</p> + <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is + being redistributed by another party ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the RedistributorŐs license + that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise + indicated below, the terms and conditions of the EPL still apply to any source code in the Content + and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> + </body> </html>
\ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.doc/plugin.properties b/eclipse.plugin/org.aspectj.ajde.doc/plugin.properties index 4fef9bb29..dbe02b9a9 100644 --- a/eclipse.plugin/org.aspectj.ajde.doc/plugin.properties +++ b/eclipse.plugin/org.aspectj.ajde.doc/plugin.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2003 IBM Corporation and others. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 +# are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html +# http://www.eclipse.org/legal/epl-v10.html # # Contributors: # Adrian Colyer, George Harley - initial implementation diff --git a/eclipse.plugin/org.aspectj.ajde.source/about.html b/eclipse.plugin/org.aspectj.ajde.source/about.html index 8e5456fdc..0ad401362 100644 --- a/eclipse.plugin/org.aspectj.ajde.source/about.html +++ b/eclipse.plugin/org.aspectj.ajde.source/about.html @@ -5,26 +5,82 @@ <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> -<h2>About This Content</h2> -<p>5th November, 2003</p> -<h3>License</h3> -<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>. -For purposes of the CPL, "Program" will mean the Content.</p> - -<h3>Contributions</h3> - -<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise -made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such -Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p> - -<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or -other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the -host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available -to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also -providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of -the CPL.</p> + <h3>About This Content</h3> + + <p>May 2, 2006</p> + <h3>License</h3> + + <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). + Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the + Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available + at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. + For purposes of the EPL, "Program" will mean the Content.</p> + + <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is + being redistributed by another party ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the RedistributorŐs license + that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise + indicated below, the terms and conditions of the EPL still apply to any source code in the Content + and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> + + <h3>Third Party Content</h3> + <p>The Content includes items that have been sourced from third parties as set out below. If you + did not receive this Content directly from the Eclipse Foundation, the following is provided + for informational purposes only, and you should look to the RedistributorŐs license for + terms and conditions of use.</p> + <em> + + <h4>BCEL v5.1</h4> + <p>This product contains software developed by the + Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p> + + <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1. + BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source + code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code + is made available under the Apache Software License v1.1</p> + + <h4>ASM v2.2.1</h4> + <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>) + The source code for ASM is available from the ObjectWeb download site at + <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>. + <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>. + The license is also reproduced here: + </p> + +<pre>Copyright (c) 2000-2005 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER OR 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. +</pre> + +</em> + </body> </html>
\ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde.source/plugin.properties b/eclipse.plugin/org.aspectj.ajde.source/plugin.properties index 66100842d..cefd4da60 100644 --- a/eclipse.plugin/org.aspectj.ajde.source/plugin.properties +++ b/eclipse.plugin/org.aspectj.ajde.source/plugin.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2003 IBM Corporation and others. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 +# are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html +# http://www.eclipse.org/legal/epl-v10.html # # Contributors: # Adrian Colyer, George Harley - initial implementation diff --git a/eclipse.plugin/org.aspectj.ajde/about.html b/eclipse.plugin/org.aspectj.ajde/about.html index 9604d9216..0ad401362 100644 --- a/eclipse.plugin/org.aspectj.ajde/about.html +++ b/eclipse.plugin/org.aspectj.ajde/about.html @@ -5,30 +5,82 @@ <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> -<h2>About This Content</h2> -<p>5th November, 2003</p> -<h3>License</h3> -<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>. -For purposes of the CPL, "Program" will mean the Content.</p> - -Those portions of this distribution in the org.apache Java namespace are available under the terms of -the Apache Software License, Version 1.1 (See -<a href="http://jakarta.apache.org">http://jakarta.apache.org</a>). - -<h3>Contributions</h3> - -<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise -made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such -Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p> - -<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or -other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the -host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available -to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also -providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of -the CPL.</p> + <h3>About This Content</h3> + + <p>May 2, 2006</p> + <h3>License</h3> + + <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). + Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the + Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available + at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. + For purposes of the EPL, "Program" will mean the Content.</p> + + <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is + being redistributed by another party ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the RedistributorŐs license + that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise + indicated below, the terms and conditions of the EPL still apply to any source code in the Content + and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> + + <h3>Third Party Content</h3> + <p>The Content includes items that have been sourced from third parties as set out below. If you + did not receive this Content directly from the Eclipse Foundation, the following is provided + for informational purposes only, and you should look to the RedistributorŐs license for + terms and conditions of use.</p> + <em> + + <h4>BCEL v5.1</h4> + <p>This product contains software developed by the + Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p> + + <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1. + BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source + code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code + is made available under the Apache Software License v1.1</p> + + <h4>ASM v2.2.1</h4> + <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>) + The source code for ASM is available from the ObjectWeb download site at + <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>. + <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>. + The license is also reproduced here: + </p> + +<pre>Copyright (c) 2000-2005 INRIA, France Telecom +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holders 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER OR 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. +</pre> + +</em> + </body> </html>
\ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.ajde/plugin.properties b/eclipse.plugin/org.aspectj.ajde/plugin.properties index b9f4532cb..2e5cfd2d3 100644 --- a/eclipse.plugin/org.aspectj.ajde/plugin.properties +++ b/eclipse.plugin/org.aspectj.ajde/plugin.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2003 IBM Corporation and others. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 +# are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html +# http://www.eclipse.org/legal/epl-v10.html # # Contributors: # Adrian Colyer, George Harley - initial implementation diff --git a/eclipse.plugin/org.aspectj.aspectjrt/about.html b/eclipse.plugin/org.aspectj.aspectjrt/about.html index 9604d9216..8b033adcc 100644 --- a/eclipse.plugin/org.aspectj.aspectjrt/about.html +++ b/eclipse.plugin/org.aspectj.aspectjrt/about.html @@ -5,30 +5,24 @@ <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> </head> <body lang="EN-US"> -<h2>About This Content</h2> - -<p>5th November, 2003</p> -<h3>License</h3> -<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>. -For purposes of the CPL, "Program" will mean the Content.</p> -Those portions of this distribution in the org.apache Java namespace are available under the terms of -the Apache Software License, Version 1.1 (See -<a href="http://jakarta.apache.org">http://jakarta.apache.org</a>). +<h3>About This Content</h3> -<h3>Contributions</h3> + <p>May 2, 2006</p> + <h3>License</h3> -<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise -made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such -Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p> - -<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or -other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the -host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available -to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also -providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of -the CPL.</p> + <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). + Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the + Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available + at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. + For purposes of the EPL, "Program" will mean the Content.</p> + <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is + being redistributed by another party ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the RedistributorŐs license + that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise + indicated below, the terms and conditions of the EPL still apply to any source code in the Content + and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> + </body> </html>
\ No newline at end of file diff --git a/eclipse.plugin/org.aspectj.aspectjrt/plugin.properties b/eclipse.plugin/org.aspectj.aspectjrt/plugin.properties index 9c9488c2a..914f7b311 100644 --- a/eclipse.plugin/org.aspectj.aspectjrt/plugin.properties +++ b/eclipse.plugin/org.aspectj.aspectjrt/plugin.properties @@ -1,9 +1,9 @@ ############################################################################### # Copyright (c) 2003 IBM Corporation and others. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 +# are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html +# http://www.eclipse.org/legal/epl-v10.html # # Contributors: # Adrian Colyer, George Harley - initial implementation diff --git a/lib/readme-lib-module.html b/lib/readme-lib-module.html index 0ef094b64..1e476fb5a 100644 --- a/lib/readme-lib-module.html +++ b/lib/readme-lib-module.html @@ -4,8 +4,8 @@ <h2>AspectJ library module</h2> This module primarily contains binary libraries from open-source projects, -some of which are subject to licenses other than the Common Public License (CPL). -Those not subject to CPL are not distributed in source or binary form with +some of which are subject to licenses other than the Eclipse Public License (EPL). +Those not subject to EPL are not distributed in source or binary form with AspectJ (except for Apache's BCEL), but are used in the development of AspectJ. This module also contains some bootstrap libraries and test sources. diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties index be60c76fe..4f43c0de0 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties @@ -144,9 +144,9 @@ xoption.usage = {0} non-standard options:\n\ ############################################################################### # Copyright (c) 2000, 2004 IBM Corporation and others. # All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 +# are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html +# http://www.eclipse.org/legal/epl-v10.html # # Contributors: # IBM Corporation - initial API and implementation diff --git a/org.aspectj.ajdt.core/testdata/OutjarTest/src/jar3/Aspect.aj b/org.aspectj.ajdt.core/testdata/OutjarTest/src/jar3/Aspect.aj index 4bfb0e01d..fcee316f5 100644 --- a/org.aspectj.ajdt.core/testdata/OutjarTest/src/jar3/Aspect.aj +++ b/org.aspectj.ajdt.core/testdata/OutjarTest/src/jar3/Aspect.aj @@ -1,9 +1,9 @@ /*******************************************************************************
* Copyright (c) 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
+ * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Matthew Webster - initial implementation
diff --git a/tests/harness/classpathTest/classpath-src/build.xml b/tests/harness/classpathTest/classpath-src/build.xml index 1bbc6bdcb..3cc258f19 100644 --- a/tests/harness/classpathTest/classpath-src/build.xml +++ b/tests/harness/classpathTest/classpath-src/build.xml @@ -3,9 +3,9 @@ <!-- Copyright (c) 2002 Wes Isberg --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Common Public License v1.0 --> +<!-- under the terms of the Eclipse Public License v1.0 --> <!-- which accompanies this distribution and is available at --> -<!-- http://www.eclipse.org/legal/cpl-v10.html --> +<!-- http://www.eclipse.org/legal/epl-v10.html --> <!-- --> <!-- Contributors: --> <!-- Xerox/PARC initial implementation --> diff --git a/tests/product/build-aspectj/build.xml b/tests/product/build-aspectj/build.xml index e23a269f8..de7e7ba99 100644 --- a/tests/product/build-aspectj/build.xml +++ b/tests/product/build-aspectj/build.xml @@ -3,9 +3,9 @@ <!-- Copyright (c) 2003 Contributors. --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Common Public License v1.0 --> +<!-- under the terms of the Eclipse Public License v1.0 --> <!-- which accompanies this distribution and is available at --> -<!-- http://www.eclipse.org/legal/cpl-v10.html --> +<!-- http://www.eclipse.org/legal/epl-v10.html --> <!-- --> <!-- Contributors: --> <!-- Isberg initial implementation --> diff --git a/tests/test-other-systems.xml b/tests/test-other-systems.xml index 3f0199ade..224825a01 100644 --- a/tests/test-other-systems.xml +++ b/tests/test-other-systems.xml @@ -5,9 +5,9 @@ <!-- Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). --> <!-- All rights reserved. --> <!-- This program and the accompanying materials are made available --> -<!-- under the terms of the Common Public License v1.0 --> +<!-- under the terms of the Eclipse Public License v1.0 --> <!-- which accompanies this distribution and is available at --> -<!-- http://www.eclipse.org/legal/cpl-v10.html --> +<!-- http://www.eclipse.org/legal/epl-v10.html --> <!-- --> <!-- Contributors: --> <!-- Xerox/PARC initial implementation --> diff --git a/weaver/ajsrc/org/aspectj/weaver/BcelApiRules.aj b/weaver/ajsrc/org/aspectj/weaver/BcelApiRules.aj index b0da19400..bad4543e1 100644 --- a/weaver/ajsrc/org/aspectj/weaver/BcelApiRules.aj +++ b/weaver/ajsrc/org/aspectj/weaver/BcelApiRules.aj @@ -3,9 +3,9 @@ * 2003 Contributors.
* All rights reserved.
* This program and the accompanying materials are made available
- * under the terms of the Common Public License v1.0
+ * under the terms of the Eclipse Public License v1.0
* which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Xerox/PARC initial implementation
diff --git a/weaver/src/org/aspectj/weaver/weaver-messages.properties b/weaver/src/org/aspectj/weaver/weaver-messages.properties index 9e90b7183..92b8a32ce 100644 --- a/weaver/src/org/aspectj/weaver/weaver-messages.properties +++ b/weaver/src/org/aspectj/weaver/weaver-messages.properties @@ -2,9 +2,9 @@ # Copyright (c) 2004 Contributors. # All rights reserved. # This program and the accompanying materials are made available -# under the terms of the Common Public License v1.0 +# under the terms of the Eclipse Public License v1.0 # which accompanies this distribution and is available at -# http://www.eclipse.org/legal/cpl-v10.html +# http://www.eclipse.org/legal/epl-v10.html # # Contributors: # Adrian Colyer - Initial version |