From cdb2fdc4f7af22a94764c17ce15c83dca90912f6 Mon Sep 17 00:00:00 2001
From: sbouchet
Date: Tue, 3 May 2011 13:55:57 +0000
Subject: EEF 1.0.0M7 : removed incubation fixed versions new SUA
---
.../org.eclipse.emf.eef.runtime-feature/feature.properties | 6 +++---
features/org.eclipse.emf.eef.runtime-feature/license.html | 11 ++++++++++-
.../sourceTemplateFeature/feature.properties | 7 ++++---
.../sourceTemplateFeature/license.html | 11 ++++++++++-
.../sourceTemplatePlugin/plugin.properties | 2 +-
5 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/features/org.eclipse.emf.eef.runtime-feature/feature.properties b/features/org.eclipse.emf.eef.runtime-feature/feature.properties
index e4556d804..ec7721129 100755
--- a/features/org.eclipse.emf.eef.runtime-feature/feature.properties
+++ b/features/org.eclipse.emf.eef.runtime-feature/feature.properties
@@ -9,7 +9,7 @@
# Obeo - initial API and implementation
###############################################################################
providerName=Eclipse Modeling Project
-featureName=Extended Editing Framework - Runtime (Incubation)
+featureName=Extended Editing Framework - Runtime
modelingUpdateSiteName=Eclipse Modeling Project Updates
description=Extended Editing Framework - Runtime
@@ -21,7 +21,7 @@ licenseURL=license.html
# 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\
@@ -90,6 +90,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\
@@ -143,4 +144,3 @@ re-export of encryption software, to see if this is permitted.\n\
\n\
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
-
diff --git a/features/org.eclipse.emf.eef.runtime-feature/license.html b/features/org.eclipse.emf.eef.runtime-feature/license.html
index c184ca36a..a1fe5ea3f 100755
--- a/features/org.eclipse.emf.eef.runtime-feature/license.html
+++ b/features/org.eclipse.emf.eef.runtime-feature/license.html
@@ -8,7 +8,7 @@
Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
Usage Of Content
@@ -30,10 +30,12 @@
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
@@ -42,6 +44,7 @@ including, but not limited to the following locations:
- The top-level (root) directory
+
- Plug-in and Fragment directories
- Inside Plug-ins and Fragments packaged as JARs
- Sub-directories of the directory named "src" of certain Plug-ins
@@ -58,10 +61,13 @@ that directory.
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
@@ -76,6 +82,7 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+
("Specification").
You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
@@ -87,6 +94,7 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
- A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
product.
+
- During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
accessed and copied to the Target Machine.
- Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
@@ -103,5 +111,6 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
possession, or use, and re-export of encryption software, to see if this is permitted.
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+