diff options
| author | khussey | 2011-03-28 20:23:20 +0000 |
|---|---|---|
| committer | khussey | 2011-03-28 20:23:20 +0000 |
| commit | fc6194a2b6d10e191c1c7f582b997bdc679262df (patch) | |
| tree | b4441ce37c060d4a09edb3fbb8d338105bdaba45 /tests | |
| parent | 4bcd44b38a1944c2a06b0bed3546a62860a2ebae (diff) | |
| download | org.eclipse.uml2-fc6194a2b6d10e191c1c7f582b997bdc679262df.tar.gz org.eclipse.uml2-fc6194a2b6d10e191c1c7f582b997bdc679262df.tar.xz org.eclipse.uml2-fc6194a2b6d10e191c1c7f582b997bdc679262df.zip | |
[341158] Updating license files per new Eclipse SUA.
Diffstat (limited to 'tests')
4 files changed, 13 insertions, 11 deletions
diff --git a/tests/org.eclipse.uml2.tests-feature/feature.properties b/tests/org.eclipse.uml2.tests-feature/feature.properties index ad7221806..a87b889d4 100644 --- a/tests/org.eclipse.uml2.tests-feature/feature.properties +++ b/tests/org.eclipse.uml2.tests-feature/feature.properties @@ -1,4 +1,4 @@ -# Copyright (c) 2003, 2010 IBM Corporation, Embarcadero Technologies, and others. +# Copyright (c) 2003, 2011 IBM Corporation, Embarcadero Technologies, and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,9 +7,9 @@ # Contributors: # IBM - initial API and implementation # Kenn Hussey (Embarcadero Technologies) - 204200 -# Kenn Hussey - 314388 +# Kenn Hussey - 314388, 341158 # -# $Id: feature.properties,v 1.13 2010/05/28 01:24:57 khussey Exp $ +# $Id: feature.properties,v 1.14 2011/03/28 20:23:20 khussey Exp $ # NLS_MESSAGEFORMAT_VAR @@ -30,16 +30,15 @@ update.label = Eclipse Modeling Project Updates # "description" property - description of the feature description = Unified Modeling Language 2.x Tests -# "license.url" property - URL of the "Feature License" +# "licenseURL" property - URL of the "Feature License" # do not translate value - just change to point to a locale-specific HTML page -license.url = license.html - +licenseURL=license.html # "license" property - text of the "Feature Update License" # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -108,6 +107,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL 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\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\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\ diff --git a/tests/org.eclipse.uml2.tests-feature/feature.xml b/tests/org.eclipse.uml2.tests-feature/feature.xml index d4414d802..82a9470cc 100644 --- a/tests/org.eclipse.uml2.tests-feature/feature.xml +++ b/tests/org.eclipse.uml2.tests-feature/feature.xml @@ -11,14 +11,14 @@ </description> <copyright url="http://www.eclipse.org/legal/epl-v10.html"> - Copyright (c) 2003, 2010 IBM Corporation, Embarcadero Technologies, and others. + Copyright (c) 2003, 2011 IBM Corporation, Embarcadero Technologies, and others. All rights reserved. This program and the accompanying materials 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/epl-v10.html </copyright> - <license url="%license.url"> + <license url="%licenseURL"> %license </license> diff --git a/tests/org.eclipse.uml2.tests-feature/license.html b/tests/org.eclipse.uml2.tests-feature/license.html index c184ca36a..f19c483b9 100644 --- a/tests/org.eclipse.uml2.tests-feature/license.html +++ b/tests/org.eclipse.uml2.tests-feature/license.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> diff --git a/tests/org.eclipse.uml2.tests-feature/rootfiles/notice.html b/tests/org.eclipse.uml2.tests-feature/rootfiles/notice.html index c184ca36a..f19c483b9 100644 --- a/tests/org.eclipse.uml2.tests-feature/rootfiles/notice.html +++ b/tests/org.eclipse.uml2.tests-feature/rootfiles/notice.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> |