Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhussey2011-03-28 20:23:17 +0000
committerkhussey2011-03-28 20:23:17 +0000
commitaa8a419566b1f792f0e4f39df083fd0dfcbf0f68 (patch)
treec91dcee62815b698d0563e87d4a561620381d21a /plugins
parent06fcc546a9d4a5ecb0e4b5f72ff430d0cf088220 (diff)
downloadorg.eclipse.uml2-aa8a419566b1f792f0e4f39df083fd0dfcbf0f68.tar.gz
org.eclipse.uml2-aa8a419566b1f792f0e4f39df083fd0dfcbf0f68.tar.xz
org.eclipse.uml2-aa8a419566b1f792f0e4f39df083fd0dfcbf0f68.zip
[341158] Updating license files per new Eclipse SUA.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.uml2.sdk-feature/feature.properties13
-rw-r--r--plugins/org.eclipse.uml2.sdk-feature/feature.xml4
-rw-r--r--plugins/org.eclipse.uml2.sdk-feature/license.html3
-rw-r--r--plugins/org.eclipse.uml2.sdk-feature/rootfiles/notice.html3
4 files changed, 13 insertions, 10 deletions
diff --git a/plugins/org.eclipse.uml2.sdk-feature/feature.properties b/plugins/org.eclipse.uml2.sdk-feature/feature.properties
index 51a43f0e9..df8e4f8ab 100644
--- a/plugins/org.eclipse.uml2.sdk-feature/feature.properties
+++ b/plugins/org.eclipse.uml2.sdk-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.14 2010/05/28 01:24:59 khussey Exp $
+# $Id: feature.properties,v 1.15 2011/03/28 20:23:17 khussey Exp $
# NLS_MESSAGEFORMAT_VAR
@@ -30,15 +30,15 @@ update.label = Eclipse Modeling Project Updates
# "description" property - description of the feature
description = Unified Modeling Language 2.x SDK
-# "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\
@@ -107,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/plugins/org.eclipse.uml2.sdk-feature/feature.xml b/plugins/org.eclipse.uml2.sdk-feature/feature.xml
index 8363c5529..50a62fcfa 100644
--- a/plugins/org.eclipse.uml2.sdk-feature/feature.xml
+++ b/plugins/org.eclipse.uml2.sdk-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/plugins/org.eclipse.uml2.sdk-feature/license.html b/plugins/org.eclipse.uml2.sdk-feature/license.html
index c184ca36a..f19c483b9 100644
--- a/plugins/org.eclipse.uml2.sdk-feature/license.html
+++ b/plugins/org.eclipse.uml2.sdk-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/plugins/org.eclipse.uml2.sdk-feature/rootfiles/notice.html b/plugins/org.eclipse.uml2.sdk-feature/rootfiles/notice.html
index c184ca36a..f19c483b9 100644
--- a/plugins/org.eclipse.uml2.sdk-feature/rootfiles/notice.html
+++ b/plugins/org.eclipse.uml2.sdk-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>

Back to the top