85343 : EPL copyrights replace CPL copyrights
diff --git a/features/org.eclipse.jem.tests-feature/feature.properties b/features/org.eclipse.jem.tests-feature/feature.properties index 7eacedd..0c90782 100644 --- a/features/org.eclipse.jem.tests-feature/feature.properties +++ b/features/org.eclipse.jem.tests-feature/feature.properties
@@ -10,7 +10,7 @@ ############################################################################### # # $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.tests.git/features/org.eclipse.jem.tests-feature/Attic/feature.properties,v $ -# $Revision: 1.5 $ $Date: 2005/02/16 00:54:40 $ +# $Revision: 1.6 $ $Date: 2005/02/28 19:02:01 $ # @@ -39,12 +39,12 @@ # "license" property - text of the "Feature Update License" # should be plain text version of license agreement pointed to be "licenseURL" license=\ -ECLIPSE.ORG SOFTWARE USER AGREEMENT\n\ -14th August, 2003\n\ +ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ +January 28, 2004\n\ \n\ Usage Of Content\n\ \n\ -ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ @@ -58,7 +58,7 @@ \n\ Applicable Licenses\n\ \n\ -Unless otherwise indicated, all Content made available by Eclipse.org\n\ +Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ is provided to you under the terms and conditions of the Eclipse Public\n\ License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ @@ -93,7 +93,7 @@ - Subdirectories of the directory named "src" of certain Plug-ins\n\ - Feature directories\n\ \n\ -Note: if a Feature made available by Eclipse.org is installed using the\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ Eclipse Update Manager, you must agree to a license ("Feature Update\n\ License") during the installation process. If the Feature contains\n\ Included Features, the Feature Update License should either provide you\n\ @@ -105,17 +105,19 @@ use of the associated Content in that directory.\n\ \n\ THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ +TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ -is provided, please contact Eclipse.org to determine what terms and conditions\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ govern that particular Content.\n\ \n\ Cryptography\n\