Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistria2011-08-30 16:04:59 +0000
committermistria2011-08-30 16:04:59 +0000
commitbb6c59f286654f682e7afd05236234a9eebab134 (patch)
tree13e99cd127f4319ac821cfb8ef9a4a85c85cd558
parent08508a86d73ed819635b845e227ea4ce3e4ffb8c (diff)
downloadorg.eclipse.gmf-tooling-bb6c59f286654f682e7afd05236234a9eebab134.tar.gz
org.eclipse.gmf-tooling-bb6c59f286654f682e7afd05236234a9eebab134.tar.xz
org.eclipse.gmf-tooling-bb6c59f286654f682e7afd05236234a9eebab134.zip
New SUA
-rwxr-xr-xfeatures/org.eclipse.gmf.tooling-feature/feature.properties4
-rwxr-xr-xfeatures/org.eclipse.gmf.tooling-feature/license.html11
2 files changed, 13 insertions, 2 deletions
diff --git a/features/org.eclipse.gmf.tooling-feature/feature.properties b/features/org.eclipse.gmf.tooling-feature/feature.properties
index 47b535713..d71eee94c 100755
--- a/features/org.eclipse.gmf.tooling-feature/feature.properties
+++ b/features/org.eclipse.gmf.tooling-feature/feature.properties
@@ -33,7 +33,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\
@@ -102,6 +102,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\
@@ -155,3 +156,4 @@ 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.gmf.tooling-feature/license.html b/features/org.eclipse.gmf.tooling-feature/license.html
index c184ca36a..a1fe5ea3f 100755
--- a/features/org.eclipse.gmf.tooling-feature/license.html
+++ b/features/org.eclipse.gmf.tooling-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>
@@ -30,10 +30,12 @@
<ul>
<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+
<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
<li>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 &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.</li>
<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+
</ul>
<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
@@ -42,6 +44,7 @@ including, but not limited to the following locations:</p>
<ul>
<li>The top-level (root) directory</li>
+
<li>Plug-in and Fragment directories</li>
<li>Inside Plug-ins and Fragments packaged as JARs</li>
<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
@@ -58,10 +61,13 @@ 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>
<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+
<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
</ul>
@@ -76,6 +82,7 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
other materials (collectively &quot;Installable Software&quot;). 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 <a
href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+
(&quot;Specification&quot;).</p>
<p>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
<li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
product.</li>
+
<li>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.</li>
<li>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.</p>
<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+
</body>
</html>

Back to the top