Skip to content

Commit d690ffe

Browse files
author
Ernesto Posse
committed
Issue #443: (v3) added o.e.emf.compare.rcp.ui-feature to patches
Signed-off-by: Ernesto Posse <eposse.gmail.com>
1 parent ca38770 commit d690ffe

14 files changed

+473
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.eclipse.emf.compare.rcp.ui-feature</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.pde.FeatureBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.pde.FeatureNature</nature>
16+
</natures>
17+
</projectDescription>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
line.separator=\n
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
4+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
5+
<title>Eclipse Foundation Software User Agreement</title>
6+
</head>
7+
8+
<body lang="EN-US">
9+
<h2>Eclipse Foundation Software User Agreement</h2>
10+
<p>April 14, 2010</p>
11+
12+
<h3>Usage Of Content</h3>
13+
14+
<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
15+
(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
16+
CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
17+
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
18+
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
19+
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
20+
21+
<h3>Applicable Licenses</h3>
22+
23+
<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
24+
(&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
25+
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
26+
27+
<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
28+
repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
29+
30+
<ul>
31+
<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>
32+
<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>
33+
<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
34+
and/or Fragments associated with that Feature.</li>
35+
<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>
36+
</ul>
37+
38+
<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
39+
Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
40+
including, but not limited to the following locations:</p>
41+
42+
<ul>
43+
<li>The top-level (root) directory</li>
44+
<li>Plug-in and Fragment directories</li>
45+
<li>Inside Plug-ins and Fragments packaged as JARs</li>
46+
<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
47+
<li>Feature directories</li>
48+
</ul>
49+
50+
<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
51+
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
52+
inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
53+
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
54+
that directory.</p>
55+
56+
<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
57+
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
58+
59+
<ul>
60+
<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>
61+
<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
62+
<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>
63+
<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>
64+
<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>
65+
</ul>
66+
67+
<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
68+
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
69+
70+
71+
<h3>Use of Provisioning Technology</h3>
72+
73+
<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
74+
Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
75+
other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
76+
install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
77+
href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
78+
(&quot;Specification&quot;).</p>
79+
80+
<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
81+
applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
82+
in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
83+
Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
84+
85+
<ol>
86+
<li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
87+
on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
88+
product.</li>
89+
<li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
90+
accessed and copied to the Target Machine.</li>
91+
<li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
92+
Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
93+
Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
94+
the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
95+
indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
96+
</ol>
97+
98+
<h3>Cryptography</h3>
99+
100+
<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
101+
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
102+
possession, or use, and re-export of encryption software, to see if this is permitted.</p>
103+
104+
<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
105+
</body>
106+
</html>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
################################################################################
2+
# Copyright (c) 2006, 2014 Obeo.
3+
# All rights reserved. This program and the accompanying materials
4+
# are made available under the terms of the Eclipse Public License v1.0
5+
# which accompanies this distribution, and is available at
6+
# http://www.eclipse.org/legal/epl-v10.html
7+
#
8+
# Contributors:
9+
# Obeo - initial API and implementation
10+
################################################################################
11+
bin.includes = modeling32.png,\
12+
epl-v10.html,\
13+
feature.properties,\
14+
feature.xml,\
15+
copyright.txt,\
16+
about.html
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Copyright (c) 2006, 2014 Obeo.
2+
All rights reserved. This program and the accompanying materials
3+
are made available under the terms of the Eclipse Public License v1.0
4+
which accompanies this distribution, and is available at
5+
http://www.eclipse.org/legal/epl-v10.html
6+
7+
Contributors:
8+
Obeo - initial API and implementation
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
4+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
5+
<title>Eclipse Foundation Software User Agreement</title>
6+
</head>
7+
8+
<body lang="EN-US">
9+
<h2>Eclipse Foundation Software User Agreement</h2>
10+
<p>April 14, 2010</p>
11+
12+
<h3>Usage Of Content</h3>
13+
14+
<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
15+
(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
16+
CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
17+
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
18+
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
19+
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
20+
21+
<h3>Applicable Licenses</h3>
22+
23+
<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
24+
(&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
25+
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
26+
27+
<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
28+
repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
29+
30+
<ul>
31+
<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>
32+
<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>
33+
<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
34+
and/or Fragments associated with that Feature.</li>
35+
<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>
36+
</ul>
37+
38+
<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
39+
Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
40+
including, but not limited to the following locations:</p>
41+
42+
<ul>
43+
<li>The top-level (root) directory</li>
44+
<li>Plug-in and Fragment directories</li>
45+
<li>Inside Plug-ins and Fragments packaged as JARs</li>
46+
<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
47+
<li>Feature directories</li>
48+
</ul>
49+
50+
<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
51+
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
52+
inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
53+
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
54+
that directory.</p>
55+
56+
<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
57+
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
58+
59+
<ul>
60+
<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>
61+
<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
62+
<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>
63+
<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>
64+
<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>
65+
</ul>
66+
67+
<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
68+
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
69+
70+
71+
<h3>Use of Provisioning Technology</h3>
72+
73+
<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
74+
Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
75+
other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
76+
install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
77+
href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
78+
(&quot;Specification&quot;).</p>
79+
80+
<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
81+
applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
82+
in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
83+
Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
84+
85+
<ol>
86+
<li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
87+
on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
88+
product.</li>
89+
<li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
90+
accessed and copied to the Target Machine.</li>
91+
<li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
92+
Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
93+
Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
94+
the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
95+
indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
96+
</ol>
97+
98+
<h3>Cryptography</h3>
99+
100+
<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
101+
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
102+
possession, or use, and re-export of encryption software, to see if this is permitted.</p>
103+
104+
<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
105+
</body>
106+
</html>

0 commit comments

Comments
 (0)