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 /eclipse.plugin | |
| parent | b6c89301f2389edcd017c66968cce7d628a708a0 (diff) | |
| download | aspectj-c82fae9bb7478f78837f98ac4b43564f1eef8770.tar.gz aspectj-c82fae9bb7478f78837f98ac4b43564f1eef8770.zip | |
update license to EPL
Diffstat (limited to 'eclipse.plugin')
| -rw-r--r-- | eclipse.plugin/org.aspectj.ajde.doc/about.html | 32 | ||||
| -rw-r--r-- | eclipse.plugin/org.aspectj.ajde.doc/plugin.properties | 4 | ||||
| -rw-r--r-- | eclipse.plugin/org.aspectj.ajde.source/about.html | 94 | ||||
| -rw-r--r-- | eclipse.plugin/org.aspectj.ajde.source/plugin.properties | 4 | ||||
| -rw-r--r-- | eclipse.plugin/org.aspectj.ajde/about.html | 98 | ||||
| -rw-r--r-- | eclipse.plugin/org.aspectj.ajde/plugin.properties | 4 | ||||
| -rw-r--r-- | eclipse.plugin/org.aspectj.aspectjrt/about.html | 36 | ||||
| -rw-r--r-- | eclipse.plugin/org.aspectj.aspectjrt/plugin.properties | 4 |
8 files changed, 188 insertions, 88 deletions
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 |