View | Details | Raw Unified | Return to bug 337656 | Differences between
and this patch

Collapse All | Expand All

(-)build.properties (-3 / +1 lines)
Lines 10-19 Link Here
10
###############################################################################
10
###############################################################################
11
bin.includes = feature.xml,\
11
bin.includes = feature.xml,\
12
               eclipse_update_120.jpg,\
12
               eclipse_update_120.jpg,\
13
               epl-v10.html,\
14
               feature.properties
13
               feature.properties
15
src.includes = license.html,\
14
src.includes = \
16
               feature.xml,\
15
               feature.xml,\
17
               epl-v10.html,\
18
               eclipse_update_120.jpg,\
16
               eclipse_update_120.jpg,\
19
                build.properties
17
                build.properties
(-)feature.properties (-124 / +4 lines)
Lines 27-157 Link Here
27
27
28
# "licenseURL" property - URL of the "Feature License"
28
# "licenseURL" property - URL of the "Feature License"
29
# do not translate value - just change to point to a locale-specific HTML page
29
# do not translate value - just change to point to a locale-specific HTML page
30
licenseURL=license.html
30
# license and licenseURL properties were removed as a result to migrating to new PDE license support. 
31
#    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
31
32
32
# "license" property - text of the "Feature Update License"
33
# "license" property - text of the "Feature Update License"
33
# should be plain text version of license agreement pointed to be "licenseURL"
34
# should be plain text version of license agreement pointed to be "licenseURL"
34
license=\
35
# license and licenseURL properties were removed as a result to migrating to new PDE license support. 
35
Eclipse Foundation Software User Agreement\n\
36
#    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
36
April 14, 2010\n\
37
\n\
38
Usage Of Content\n\
39
\n\
40
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
41
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
42
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
43
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
44
NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
45
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
46
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
47
OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
48
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
49
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
50
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
51
\n\
52
Applicable Licenses\n\
53
\n\
54
Unless otherwise indicated, all Content made available by the\n\
55
Eclipse Foundation is provided to you under the terms and conditions of\n\
56
the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
57
provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
58
For purposes of the EPL, "Program" will mean the Content.\n\
59
\n\
60
Content includes, but is not limited to, source code, object code,\n\
61
documentation and other files maintained in the Eclipse Foundation source code\n\
62
repository ("Repository") in software modules ("Modules") and made available\n\
63
as downloadable archives ("Downloads").\n\
64
\n\
65
       - Content may be structured and packaged into modules to facilitate delivering,\n\
66
         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
67
         plug-in fragments ("Fragments"), and features ("Features").\n\
68
       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
69
         in a directory named "plugins".\n\
70
       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
71
         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
72
         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
73
         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
74
       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
75
         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
76
\n\
77
The terms and conditions governing Plug-ins and Fragments should be\n\
78
contained in files named "about.html" ("Abouts"). The terms and\n\
79
conditions governing Features and Included Features should be contained\n\
80
in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
81
Licenses may be located in any directory of a Download or Module\n\
82
including, but not limited to the following locations:\n\
83
\n\
84
       - The top-level (root) directory\n\
85
       - Plug-in and Fragment directories\n\
86
       - Inside Plug-ins and Fragments packaged as JARs\n\
87
       - Sub-directories of the directory named "src" of certain Plug-ins\n\
88
       - Feature directories\n\
89
\n\
90
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
91
Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
92
Update License") during the installation process. If the Feature contains\n\
93
Included Features, the Feature Update License should either provide you\n\
94
with the terms and conditions governing the Included Features or inform\n\
95
you where you can locate them. Feature Update Licenses may be found in\n\
96
the "license" property of files named "feature.properties" found within a Feature.\n\
97
Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
98
terms and conditions (or references to such terms and conditions) that\n\
99
govern your use of the associated Content in that directory.\n\
100
\n\
101
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
102
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
103
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
104
\n\
105
       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
106
       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
107
       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
108
       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
109
       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
110
\n\
111
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
112
TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
113
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
114
govern that particular Content.\n\
115
\n\
116
\n\Use of Provisioning Technology\n\
117
\n\
118
The Eclipse Foundation makes available provisioning software, examples of which include,\n\
119
but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
120
the purpose of allowing users to install software, documentation, information and/or\n\
121
other materials (collectively "Installable Software"). This capability is provided with\n\
122
the intent of allowing such users to install, extend and update Eclipse-based products.\n\
123
Information about packaging Installable Software is available at\n\
124
http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
125
\n\
126
You may use Provisioning Technology to allow other parties to install Installable Software.\n\
127
You shall be responsible for enabling the applicable license agreements relating to the\n\
128
Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
129
in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
130
making it available in accordance with the Specification, you further acknowledge your\n\
131
agreement to, and the acquisition of all necessary rights to permit the following:\n\
132
\n\
133
       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
134
          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
135
          extending or updating the functionality of an Eclipse-based product.\n\
136
       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
137
          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
138
       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
139
          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
140
          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
141
          with the Specification. Such Installable Software Agreement must inform the user of the\n\
142
          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
143
          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
144
          indication of agreement by the user, the provisioning Technology will complete installation\n\
145
          of the Installable Software.\n\
146
\n\
147
Cryptography\n\
148
\n\
149
Content may contain encryption software. The country in which you are\n\
150
currently may have restrictions on the import, possession, and use,\n\
151
and/or re-export to another country, of encryption software. BEFORE\n\
152
using any encryption software, please check the country's laws,\n\
153
regulations and policies concerning the import, possession, or use, and\n\
154
re-export of encryption software, to see if this is permitted.\n\
155
\n\
156
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
157
########### end of license property ##########################################
37
########### end of license property ##########################################
(-)feature.xml (-2 / +1 lines)
Lines 6-13 Link Here
6
      provider-name="%provider"
6
      provider-name="%provider"
7
     image="eclipse_update_120.jpg"
7
     image="eclipse_update_120.jpg"
8
      license-feature="org.eclipse.license"
8
      license-feature="org.eclipse.license"
9
      license-feature-version="1.0.0.qualifier"
9
      license-feature-version="1.0.0.qualifier">
10
      >
11
10
12
   <description>
11
   <description>
13
      %description
12
      %description
(-)license.html (-107 lines)
Removed Link Here
1
<?xml version="1.0" encoding="ISO-8859-1" ?>
2
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
<html xmlns="http://www.w3.org/1999/xhtml">
4
<head>
5
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
6
<title>Eclipse Foundation Software User Agreement</title>
7
</head>
8
9
<body lang="EN-US">
10
<h2>Eclipse Foundation Software User Agreement</h2>
11
<p>April 14, 2010</p>
12
13
<h3>Usage Of Content</h3>
14
15
<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
16
   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
17
   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
18
   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
19
   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
20
   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
21
22
<h3>Applicable Licenses</h3>
23
24
<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
25
   (&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>.
26
   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
27
28
<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
29
   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
30
31
<ul>
32
       <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>
33
       <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>
34
       <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
35
      and/or Fragments associated with that Feature.</li>
36
       <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>
37
</ul>
38
39
<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
40
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
41
including, but not limited to the following locations:</p>
42
43
<ul>
44
       <li>The top-level (root) directory</li>
45
       <li>Plug-in and Fragment directories</li>
46
       <li>Inside Plug-ins and Fragments packaged as JARs</li>
47
       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
48
       <li>Feature directories</li>
49
</ul>
50
51
<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
52
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
53
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.
54
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
55
that directory.</p>
56
57
<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
58
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
59
60
<ul>
61
       <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>
62
       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
63
       <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>
64
       <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>
65
       <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>
66
</ul>
67
68
<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
69
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
70
71
72
<h3>Use of Provisioning Technology</h3>
73
74
<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
75
   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
76
   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
77
   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
78
       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
79
   (&quot;Specification&quot;).</p>
80
81
<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
82
   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
83
   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
84
   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
85
86
<ol>
87
       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
88
       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
89
       product.</li>
90
       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
91
       accessed and copied to the Target Machine.</li>
92
       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
93
       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
94
       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
95
       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
96
       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
97
</ol>
98
99
<h3>Cryptography</h3>
100
101
<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
102
   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
103
   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
104
105
<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
106
</body>
107
</html>
(-)feature.properties (-124 / +4 lines)
Lines 41-171 Link Here
41
41
42
# "licenseURL" property - URL of the "Feature License"
42
# "licenseURL" property - URL of the "Feature License"
43
# do not translate value - just change to point to a locale-specific HTML page
43
# do not translate value - just change to point to a locale-specific HTML page
44
licenseURL=license.html
44
# license and licenseURL properties were removed as a result to migrating to new PDE license support. 
45
#    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
45
46
46
# "license" property - text of the "Feature Update License"
47
# "license" property - text of the "Feature Update License"
47
# should be plain text version of license agreement pointed to be "licenseURL"
48
# should be plain text version of license agreement pointed to be "licenseURL"
48
license=\
49
# license and licenseURL properties were removed as a result to migrating to new PDE license support. 
49
Eclipse Foundation Software User Agreement\n\
50
#    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
50
April 14, 2010\n\
51
\n\
52
Usage Of Content\n\
53
\n\
54
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
55
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
56
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
57
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
58
NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
59
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
60
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
61
OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
62
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
63
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
64
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
65
\n\
66
Applicable Licenses\n\
67
\n\
68
Unless otherwise indicated, all Content made available by the\n\
69
Eclipse Foundation is provided to you under the terms and conditions of\n\
70
the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
71
provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
72
For purposes of the EPL, "Program" will mean the Content.\n\
73
\n\
74
Content includes, but is not limited to, source code, object code,\n\
75
documentation and other files maintained in the Eclipse Foundation source code\n\
76
repository ("Repository") in software modules ("Modules") and made available\n\
77
as downloadable archives ("Downloads").\n\
78
\n\
79
       - Content may be structured and packaged into modules to facilitate delivering,\n\
80
         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
81
         plug-in fragments ("Fragments"), and features ("Features").\n\
82
       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
83
         in a directory named "plugins".\n\
84
       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
85
         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
86
         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
87
         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
88
       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
89
         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
90
\n\
91
The terms and conditions governing Plug-ins and Fragments should be\n\
92
contained in files named "about.html" ("Abouts"). The terms and\n\
93
conditions governing Features and Included Features should be contained\n\
94
in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
95
Licenses may be located in any directory of a Download or Module\n\
96
including, but not limited to the following locations:\n\
97
\n\
98
       - The top-level (root) directory\n\
99
       - Plug-in and Fragment directories\n\
100
       - Inside Plug-ins and Fragments packaged as JARs\n\
101
       - Sub-directories of the directory named "src" of certain Plug-ins\n\
102
       - Feature directories\n\
103
\n\
104
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
105
Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
106
Update License") during the installation process. If the Feature contains\n\
107
Included Features, the Feature Update License should either provide you\n\
108
with the terms and conditions governing the Included Features or inform\n\
109
you where you can locate them. Feature Update Licenses may be found in\n\
110
the "license" property of files named "feature.properties" found within a Feature.\n\
111
Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
112
terms and conditions (or references to such terms and conditions) that\n\
113
govern your use of the associated Content in that directory.\n\
114
\n\
115
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
116
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
117
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
118
\n\
119
       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
120
       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
121
       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
122
       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
123
       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
124
\n\
125
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
126
TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
127
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
128
govern that particular Content.\n\
129
\n\
130
\n\Use of Provisioning Technology\n\
131
\n\
132
The Eclipse Foundation makes available provisioning software, examples of which include,\n\
133
but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
134
the purpose of allowing users to install software, documentation, information and/or\n\
135
other materials (collectively "Installable Software"). This capability is provided with\n\
136
the intent of allowing such users to install, extend and update Eclipse-based products.\n\
137
Information about packaging Installable Software is available at\n\
138
http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
139
\n\
140
You may use Provisioning Technology to allow other parties to install Installable Software.\n\
141
You shall be responsible for enabling the applicable license agreements relating to the\n\
142
Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
143
in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
144
making it available in accordance with the Specification, you further acknowledge your\n\
145
agreement to, and the acquisition of all necessary rights to permit the following:\n\
146
\n\
147
       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
148
          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
149
          extending or updating the functionality of an Eclipse-based product.\n\
150
       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
151
          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
152
       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
153
          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
154
          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
155
          with the Specification. Such Installable Software Agreement must inform the user of the\n\
156
          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
157
          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
158
          indication of agreement by the user, the provisioning Technology will complete installation\n\
159
          of the Installable Software.\n\
160
\n\
161
Cryptography\n\
162
\n\
163
Content may contain encryption software. The country in which you are\n\
164
currently may have restrictions on the import, possession, and use,\n\
165
and/or re-export to another country, of encryption software. BEFORE\n\
166
using any encryption software, please check the country's laws,\n\
167
regulations and policies concerning the import, possession, or use, and\n\
168
re-export of encryption software, to see if this is permitted.\n\
169
\n\
170
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
171
########### end of license property ##########################################
51
########### end of license property ##########################################
(-)feature.xml (-2 / +1 lines)
Lines 6-13 Link Here
6
      provider-name="%providerName"
6
      provider-name="%providerName"
7
      image="eclipse_update_120.jpg"
7
      image="eclipse_update_120.jpg"
8
      license-feature="org.eclipse.license"
8
      license-feature="org.eclipse.license"
9
      license-feature-version="1.0.0.qualifier"
9
      license-feature-version="1.0.0.qualifier">
10
      >
11
10
12
   <description>
11
   <description>
13
      %description
12
      %description
(-)sourceTemplateFeature/build.properties (-2 lines)
Lines 10-19 Link Here
10
###############################################################################
10
###############################################################################
11
# This file should be NOT be translated.
11
# This file should be NOT be translated.
12
bin.includes =\
12
bin.includes =\
13
epl-v10.html,\
14
eclipse_update_120.jpg,\
13
eclipse_update_120.jpg,\
15
feature.xml,\
14
feature.xml,\
16
feature.properties,\
15
feature.properties,\
17
license.html
18
16
19
17
(-)sourceTemplateFeature/epl-v10.html (-75 lines)
Removed Link Here
1
<html xmlns:o="urn:schemas-microsoft-com:office:office"
2
xmlns:w="urn:schemas-microsoft-com:office:word"
3
xmlns="http://www.w3.org/TR/REC-html40">
4
5
<head>
6
<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
7
<meta name=ProgId content=Word.Document>
8
<meta name=Generator content="Microsoft Word 9">
9
<meta name=Originator content="Microsoft Word 9">
10
<link rel=File-List
11
href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
12
<title>Eclipse Public License - Version 1.0</title>
13
<!--[if gte mso 9]><xml>
14
 <o:DocumentProperties>
15
  <o:Revision>2</o:Revision>
16
  <o:TotalTime>3</o:TotalTime>
17
  <o:Created>2004-03-05T23:03:00Z</o:Created>
18
  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
19
  <o:Pages>4</o:Pages>
20
  <o:Words>1626</o:Words>
21
  <o:Characters>9270</o:Characters>
22
   <o:Lines>77</o:Lines>
23
  <o:Paragraphs>18</o:Paragraphs>
24
  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
25
  <o:Version>9.4402</o:Version>
26
 </o:DocumentProperties>
27
</xml><![endif]--><!--[if gte mso 9]><xml>
28
 <w:WordDocument>
29
  <w:TrackRevisions/>
30
 </w:WordDocument>
31
</xml><![endif]-->
32
<style>
33
<!--
34
 /* Font Definitions */
35
@font-face
36
	{font-family:Tahoma;
37
	panose-1:2 11 6 4 3 5 4 4 2 4;
38
	mso-font-charset:0;
39
	mso-generic-font-family:swiss;
40
	mso-font-pitch:variable;
41
	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
42
 /* Style Definitions */
43
p.MsoNormal, li.MsoNormal, div.MsoNormal
44
	{mso-style-parent:"";
45
	margin:0in;
46
	margin-bottom:.0001pt;
47
	mso-pagination:widow-orphan;
48
	font-size:12.0pt;
49
	font-family:"Times New Roman";
50
	mso-fareast-font-family:"Times New Roman";}
51
p
52
	{margin-right:0in;
53
	mso-margin-top-alt:auto;
54
	mso-margin-bottom-alt:auto;
55
	margin-left:0in;
56
	mso-pagination:widow-orphan;
57
	font-size:12.0pt;
58
	font-family:"Times New Roman";
59
	mso-fareast-font-family:"Times New Roman";}
60
p.BalloonText, li.BalloonText, div.BalloonText
61
	{mso-style-name:"Balloon Text";
62
	margin:0in;
63
	margin-bottom:.0001pt;
64
	mso-pagination:widow-orphan;
65
	font-size:8.0pt;
66
	font-family:Tahoma;
67
	mso-fareast-font-family:"Times New Roman";}
68
@page Section1
69
	{size:8.5in 11.0in;
70
	margin:1.0in 1.25in 1.0in 1.25in;
71
	mso-header-margin:.5in;
72
	mso-footer-margin:.5in;
73
	mso-paper-source:0;}
74
div.Section1
75
	{page:Section1;}
(-)sourceTemplateFeature/feature.properties (-124 / +4 lines)
Lines 40-170 Link Here
40
40
41
# "licenseURL" property - URL of the "Feature License"
41
# "licenseURL" property - URL of the "Feature License"
42
# do not translate value - just change to point to a locale-specific HTML page
42
# do not translate value - just change to point to a locale-specific HTML page
43
licenseURL=license.html
43
# license and licenseURL properties were removed as a result to migrating to new PDE license support. 
44
#    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
44
45
45
# "license" property - text of the "Feature Update License"
46
# "license" property - text of the "Feature Update License"
46
# should be plain text version of license agreement pointed to be "licenseURL"
47
# should be plain text version of license agreement pointed to be "licenseURL"
47
license=\
48
# license and licenseURL properties were removed as a result to migrating to new PDE license support. 
48
Eclipse Foundation Software User Agreement\n\
49
#    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
49
April 14, 2010\n\
50
\n\
51
Usage Of Content\n\
52
\n\
53
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
54
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
55
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
56
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
57
NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
58
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
59
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
60
OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
61
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
62
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
63
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
64
\n\
65
Applicable Licenses\n\
66
\n\
67
Unless otherwise indicated, all Content made available by the\n\
68
Eclipse Foundation is provided to you under the terms and conditions of\n\
69
the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
70
provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
71
For purposes of the EPL, "Program" will mean the Content.\n\
72
\n\
73
Content includes, but is not limited to, source code, object code,\n\
74
documentation and other files maintained in the Eclipse Foundation source code\n\
75
repository ("Repository") in software modules ("Modules") and made available\n\
76
as downloadable archives ("Downloads").\n\
77
\n\
78
       - Content may be structured and packaged into modules to facilitate delivering,\n\
79
         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
80
         plug-in fragments ("Fragments"), and features ("Features").\n\
81
       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
82
         in a directory named "plugins".\n\
83
       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
84
         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
85
         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
86
         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
87
       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
88
         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
89
\n\
90
The terms and conditions governing Plug-ins and Fragments should be\n\
91
contained in files named "about.html" ("Abouts"). The terms and\n\
92
conditions governing Features and Included Features should be contained\n\
93
in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
94
Licenses may be located in any directory of a Download or Module\n\
95
including, but not limited to the following locations:\n\
96
\n\
97
       - The top-level (root) directory\n\
98
       - Plug-in and Fragment directories\n\
99
       - Inside Plug-ins and Fragments packaged as JARs\n\
100
       - Sub-directories of the directory named "src" of certain Plug-ins\n\
101
       - Feature directories\n\
102
\n\
103
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
104
Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
105
Update License") during the installation process. If the Feature contains\n\
106
Included Features, the Feature Update License should either provide you\n\
107
with the terms and conditions governing the Included Features or inform\n\
108
you where you can locate them. Feature Update Licenses may be found in\n\
109
the "license" property of files named "feature.properties" found within a Feature.\n\
110
Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
111
terms and conditions (or references to such terms and conditions) that\n\
112
govern your use of the associated Content in that directory.\n\
113
\n\
114
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
115
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
116
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
117
\n\
118
       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
119
       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
120
       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
121
       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
122
       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
123
\n\
124
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
125
TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
126
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
127
govern that particular Content.\n\
128
\n\
129
\n\Use of Provisioning Technology\n\
130
\n\
131
The Eclipse Foundation makes available provisioning software, examples of which include,\n\
132
but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
133
the purpose of allowing users to install software, documentation, information and/or\n\
134
other materials (collectively "Installable Software"). This capability is provided with\n\
135
the intent of allowing such users to install, extend and update Eclipse-based products.\n\
136
Information about packaging Installable Software is available at\n\
137
http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
138
\n\
139
You may use Provisioning Technology to allow other parties to install Installable Software.\n\
140
You shall be responsible for enabling the applicable license agreements relating to the\n\
141
Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
142
in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
143
making it available in accordance with the Specification, you further acknowledge your\n\
144
agreement to, and the acquisition of all necessary rights to permit the following:\n\
145
\n\
146
       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
147
          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
148
          extending or updating the functionality of an Eclipse-based product.\n\
149
       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
150
          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
151
       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
152
          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
153
          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
154
          with the Specification. Such Installable Software Agreement must inform the user of the\n\
155
          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
156
          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
157
          indication of agreement by the user, the provisioning Technology will complete installation\n\
158
          of the Installable Software.\n\
159
\n\
160
Cryptography\n\
161
\n\
162
Content may contain encryption software. The country in which you are\n\
163
currently may have restrictions on the import, possession, and use,\n\
164
and/or re-export to another country, of encryption software. BEFORE\n\
165
using any encryption software, please check the country's laws,\n\
166
regulations and policies concerning the import, possession, or use, and\n\
167
re-export of encryption software, to see if this is permitted.\n\
168
\n\
169
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
170
########### end of license property ##########################################
50
########### end of license property ##########################################
(-)sourceTemplateFeature/license.html (-107 lines)
Removed Link Here
1
<?xml version="1.0" encoding="ISO-8859-1" ?>
2
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
<html xmlns="http://www.w3.org/1999/xhtml">
4
<head>
5
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
6
<title>Eclipse Foundation Software User Agreement</title>
7
</head>
8
9
<body lang="EN-US">
10
<h2>Eclipse Foundation Software User Agreement</h2>
11
<p>April 14, 2010</p>
12
13
<h3>Usage Of Content</h3>
14
15
<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
16
   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
17
   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
18
   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
19
   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
20
   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
21
22
<h3>Applicable Licenses</h3>
23
24
<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
25
   (&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>.
26
   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
27
28
<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
29
   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
30
31
<ul>
32
       <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>
33
       <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>
34
       <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
35
      and/or Fragments associated with that Feature.</li>
36
       <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>
37
</ul>
38
39
<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
40
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
41
including, but not limited to the following locations:</p>
42
43
<ul>
44
       <li>The top-level (root) directory</li>
45
       <li>Plug-in and Fragment directories</li>
46
       <li>Inside Plug-ins and Fragments packaged as JARs</li>
47
       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
48
       <li>Feature directories</li>
49
</ul>
50
51
<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
52
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
53
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.
54
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
55
that directory.</p>
56
57
<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
58
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
59
60
<ul>
61
       <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>
62
       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
63
       <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>
64
       <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>
65
       <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>
66
</ul>
67
68
<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
69
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
70
71
72
<h3>Use of Provisioning Technology</h3>
73
74
<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
75
   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
76
   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
77
   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
78
       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
79
   (&quot;Specification&quot;).</p>
80
81
<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
82
   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
83
   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
84
   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
85
86
<ol>
87
       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
88
       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
89
       product.</li>
90
       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
91
       accessed and copied to the Target Machine.</li>
92
       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
93
       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
94
       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
95
       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
96
       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
97
</ol>
98
99
<h3>Cryptography</h3>
100
101
<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
102
   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
103
   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
104
105
<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
106
</body>
107
</html>
(-)build.properties (-1 / +1 lines)
Lines 13-16 Link Here
13
               eclipse_update_120.jpg
13
               eclipse_update_120.jpg
14
14
15
generate.feature@org.eclipse.jst.webpageeditor.feature.source = org.eclipse.jst.webpageeditor.feature
15
generate.feature@org.eclipse.jst.webpageeditor.feature.source = org.eclipse.jst.webpageeditor.feature
16
               
16
               
(-)feature.properties (-124 / +4 lines)
Lines 41-171 Link Here
41
41
42
# "licenseURL" property - URL of the "Feature License"
42
# "licenseURL" property - URL of the "Feature License"
43
# do not translate value - just change to point to a locale-specific HTML page
43
# do not translate value - just change to point to a locale-specific HTML page
44
licenseURL=license.html
44
# license and licenseURL properties were removed as a result to migrating to new PDE license support. 
45
#    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
45
46
46
# "license" property - text of the "Feature Update License"
47
# "license" property - text of the "Feature Update License"
47
# should be plain text version of license agreement pointed to be "licenseURL"
48
# should be plain text version of license agreement pointed to be "licenseURL"
48
license=\
49
# license and licenseURL properties were removed as a result to migrating to new PDE license support. 
49
Eclipse Foundation Software User Agreement\n\
50
#    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
50
April 14, 2010\n\
51
\n\
52
Usage Of Content\n\
53
\n\
54
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
55
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
56
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
57
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
58
NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
59
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
60
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
61
OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
62
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
63
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
64
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
65
\n\
66
Applicable Licenses\n\
67
\n\
68
Unless otherwise indicated, all Content made available by the\n\
69
Eclipse Foundation is provided to you under the terms and conditions of\n\
70
the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
71
provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
72
For purposes of the EPL, "Program" will mean the Content.\n\
73
\n\
74
Content includes, but is not limited to, source code, object code,\n\
75
documentation and other files maintained in the Eclipse Foundation source code\n\
76
repository ("Repository") in software modules ("Modules") and made available\n\
77
as downloadable archives ("Downloads").\n\
78
\n\
79
       - Content may be structured and packaged into modules to facilitate delivering,\n\
80
         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
81
         plug-in fragments ("Fragments"), and features ("Features").\n\
82
       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
83
         in a directory named "plugins".\n\
84
       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
85
         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
86
         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
87
         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
88
       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
89
         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
90
\n\
91
The terms and conditions governing Plug-ins and Fragments should be\n\
92
contained in files named "about.html" ("Abouts"). The terms and\n\
93
conditions governing Features and Included Features should be contained\n\
94
in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
95
Licenses may be located in any directory of a Download or Module\n\
96
including, but not limited to the following locations:\n\
97
\n\
98
       - The top-level (root) directory\n\
99
       - Plug-in and Fragment directories\n\
100
       - Inside Plug-ins and Fragments packaged as JARs\n\
101
       - Sub-directories of the directory named "src" of certain Plug-ins\n\
102
       - Feature directories\n\
103
\n\
104
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
105
Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
106
Update License") during the installation process. If the Feature contains\n\
107
Included Features, the Feature Update License should either provide you\n\
108
with the terms and conditions governing the Included Features or inform\n\
109
you where you can locate them. Feature Update Licenses may be found in\n\
110
the "license" property of files named "feature.properties" found within a Feature.\n\
111
Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
112
terms and conditions (or references to such terms and conditions) that\n\
113
govern your use of the associated Content in that directory.\n\
114
\n\
115
THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
116
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
117
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
118
\n\
119
       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
120
       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
121
       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
122
       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
123
       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
124
\n\
125
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
126
TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
127
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
128
govern that particular Content.\n\
129
\n\
130
\n\Use of Provisioning Technology\n\
131
\n\
132
The Eclipse Foundation makes available provisioning software, examples of which include,\n\
133
but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
134
the purpose of allowing users to install software, documentation, information and/or\n\
135
other materials (collectively "Installable Software"). This capability is provided with\n\
136
the intent of allowing such users to install, extend and update Eclipse-based products.\n\
137
Information about packaging Installable Software is available at\n\
138
http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
139
\n\
140
You may use Provisioning Technology to allow other parties to install Installable Software.\n\
141
You shall be responsible for enabling the applicable license agreements relating to the\n\
142
Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
143
in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
144
making it available in accordance with the Specification, you further acknowledge your\n\
145
agreement to, and the acquisition of all necessary rights to permit the following:\n\
146
\n\
147
       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
148
          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
149
          extending or updating the functionality of an Eclipse-based product.\n\
150
       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
151
          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
152
       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
153
          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
154
          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
155
          with the Specification. Such Installable Software Agreement must inform the user of the\n\
156
          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
157
          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
158
          indication of agreement by the user, the provisioning Technology will complete installation\n\
159
          of the Installable Software.\n\
160
\n\
161
Cryptography\n\
162
\n\
163
Content may contain encryption software. The country in which you are\n\
164
currently may have restrictions on the import, possession, and use,\n\
165
and/or re-export to another country, of encryption software. BEFORE\n\
166
using any encryption software, please check the country's laws,\n\
167
regulations and policies concerning the import, possession, or use, and\n\
168
re-export of encryption software, to see if this is permitted.\n\
169
\n\
170
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
171
########### end of license property ##########################################
51
########### end of license property ##########################################
(-)feature.xml (-2 / +1 lines)
Lines 5-12 Link Here
5
      version="2.3.3.qualifier"
5
      version="2.3.3.qualifier"
6
      provider-name="%providerName"
6
      provider-name="%providerName"
7
      license-feature="org.eclipse.license"
7
      license-feature="org.eclipse.license"
8
      license-feature-version="1.0.0.qualifier"
8
      license-feature-version="1.0.0.qualifier">
9
      >
10
9
11
   <description>
10
   <description>
12
      %description
11
      %description

Return to bug 337656