Skip to content
This repository was archived by the owner on Apr 3, 2018. It is now read-only.

Commit 901f1f9

Browse files
Merge remote-tracking branch 'LangEclipseIDE/master'
Conflicts: feature/feature.properties plugin_ide.core.tests/META-INF/MANIFEST.MF plugin_ide.core/plugin.properties plugin_ide.debug/plugin.properties plugin_ide.ui.tests/META-INF/MANIFEST.MF plugin_ide.ui/about.ini plugin_ide.ui/plugin.properties releng/plugin_jvmcheck/META-INF/MANIFEST.MF
2 parents 786de03 + c3bb1cd commit 901f1f9

File tree

10 files changed

+54
-115
lines changed

10 files changed

+54
-115
lines changed

feature/feature.properties

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
featureName=GoClipse
2+
providerName=github.com/GoClipse/
3+
description=GoClipse feature. Support for the Go language.
4+
5+
# "licenseURL" property - URL of the "Feature License"
6+
# do not translate value - just change to point to a locale-specific HTML page
7+
licenseURL=http://www.eclipse.org/legal/epl-v10.html
8+
9+
# "license" property - text of the "Feature Update License"
10+
# should be plain text version of license agreement pointed to be "licenseURL"
11+
license=\
12+
GoClipse Software User Agreement\n\
13+
2014, November 17\n\
14+
\n\
15+
Usage of Content:\n\
16+
\n\
17+
The GoClipse software is provided by the GoClipse Project.\n\
18+
\n\
19+
Applicable Licenses:\n\
20+
\n\
21+
Unless otherwise indicated, all GoClipse Content is provided to you under the terms \n\
22+
and conditions of the Eclipse Public License Version 1.0. A copy of the EPL is \n\
23+
provided with this Content and is also available at \n\
24+
http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" \n\
25+
will mean the Content.\n\
26+
\n\
27+
Content includes, but is not limited to, downloadable archives ("Downloads"), \n\
28+
the p2 repository, source code, object code, and documentation.\n\
29+
\n\
30+
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS \n\
31+
PRIOR TO USE OF THIS CONTENT.\n
32+
########### end of license property ##########################################

feature/feature.xml

+7-107
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<feature
33
id="goclipse_feature"
4-
label="GoClipse"
4+
label="%featureName"
55
version="0.14.1.qualifier"
6-
provider-name="The GoClipse Development Team"
6+
provider-name="%providerName"
77
plugin="com.googlecode.goclipse.ui">
88

9-
<description url="http://goclipse.github.io/">
10-
This is the development version of the GoClipse Plug-In.
11-
Features may be broken, partially implemented, or removed
12-
at anytime. Use at your own risk.
13-
14-
Stable versions will be released from a secondary update site
15-
as major milestones are completed. GoClipse is an Eclipse
16-
plug-in that provides a rudimentary level of support for
17-
programming with Go.
18-
19-
Current Features:
20-
- Syntax highlighting
21-
- Automatic building of files
22-
- Run configuration support
23-
- Error reporting within Eclipse
24-
- Content Assist via Gocode (https://github.com/nsf/gocode)
9+
<description>
10+
%description
2511
</description>
2612

2713
<copyright>
28-
Copyright (c) 2010-2012 GoClipse Development Team
14+
%copyright
2915
</copyright>
3016

31-
<license url="http://www.eclipse.org/legal/epl-v10.html">
32-
Eclipse Public License - v 1.0
33-
34-
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT.
35-
36-
1. DEFINITIONS
37-
38-
&quot;Contribution&quot; means:
39-
40-
a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
41-
42-
b) in the case of each subsequent Contributor:
43-
44-
i) changes to the Program, and
45-
46-
ii) additions to the Program;
47-
48-
where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor&apos;s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
49-
50-
&quot;Contributor&quot; means any person or entity that distributes the Program.
51-
52-
&quot;Licensed Patents&quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
53-
54-
&quot;Program&quot; means the Contributions distributed in accordance with this Agreement.
55-
56-
&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors.
57-
58-
2. GRANT OF RIGHTS
59-
60-
a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
61-
62-
b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
63-
64-
c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient&apos;s responsibility to acquire that license before distributing the Program.
65-
66-
d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
67-
68-
3. REQUIREMENTS
69-
70-
A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
71-
72-
a) it complies with the terms and conditions of this Agreement; and
73-
74-
b) its license agreement:
75-
76-
i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
77-
78-
ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
79-
80-
iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
81-
82-
iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
83-
84-
When the Program is made available in source code form:
85-
86-
a) it must be made available under this Agreement; and
87-
88-
b) a copy of this Agreement must be included with each copy of the Program.
89-
90-
Contributors may not remove or alter any copyright notices contained within the Program.
91-
92-
Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
93-
94-
4. COMMERCIAL DISTRIBUTION
95-
96-
Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
97-
98-
For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor&apos;s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
99-
100-
5. NO WARRANTY
101-
102-
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
103-
104-
6. DISCLAIMER OF LIABILITY
105-
106-
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
107-
108-
7. GENERAL
109-
110-
If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
111-
112-
If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient&apos;s patent(s), then such Recipient&apos;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
113-
114-
All Recipient&apos;s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient&apos;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&apos;s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
115-
116-
Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
117-
118-
This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
17+
<license url="%licenseURL">
18+
%license
11919
</license>
12020

12121
<requires>

plugin_ide.core.tests/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: com.googlecode.goclipse.core.tests;singleton:=true
44
Bundle-Version: 0.14.1.qualifier
55
Fragment-Host: com.googlecode.goclipse.core
6-
Bundle-Name: GoClipse Core Tests
76
Bundle-Vendor: %pluginProvider
7+
Bundle-Name: %pluginNameTests
88
Bundle-Localization: plugin
99
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1010
Require-Bundle: org.junit;bundle-version="4.8.0"
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Dummy file to prevent MANIFEST/.MF warning

plugin_ide.core/plugin.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
###############################################################################
44
pluginProvider=github.com/Goclipse
5-
pluginName=GoClipse IDE Core
5+
pluginName=GoClipse Eclipse Core
6+
pluginNameTests=GoClipse Eclipse Core [Tests]
67

78
Nature_Name=Go nature
89

plugin_ide.debug/plugin.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
###############################################################################
44
pluginProvider=github.com/Goclipse
5-
pluginName=GoClipse Debug
5+
pluginName=GoClipse Eclipse Debug
6+
7+
DebugTabGroup.description=Debug a Go application
68

79
AddExpressionAction.label=Add Watch Expression...
810
RunToLineAction.label=Run To &Line

plugin_ide.ui.tests/META-INF/MANIFEST.MF

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ Bundle-ManifestVersion: 2
33
Bundle-SymbolicName: com.googlecode.goclipse.ui.tests;singleton:=true
44
Bundle-Version: 0.14.1.qualifier
55
Fragment-Host: com.googlecode.goclipse.ui
6-
Bundle-Name: GoClipse IDE UI Tests
7-
Bundle-Vendor: github.com/Goclipse
6+
Bundle-Vendor: %pluginProvider
7+
Bundle-Name: %pluginNameTests
8+
Bundle-Localization: plugin
89
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
910
Require-Bundle: org.junit;bundle-version="4.10.0",
1011
org.eclipse.equinox.event;bundle-version="1.3.0"

plugin_ide.ui.tests/plugin.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Dummy file to prevent MANIFEST/.MF warning

plugin_ide.ui/plugin.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
###############################################################################
22

33
###############################################################################
4-
pluginName=GoClipse IDE UI
54
pluginProvider=github.com/Goclipse
5+
pluginName=GoClipse Eclipse UI
6+
pluginNameTests=GoClipse Eclipse UI [Tests]
67

78

89
# Perspective
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
3-
Bundle-Name: GoClipse Java version check
43
Bundle-SymbolicName: com.googlecode.goclipse.jvmcheck;singleton:=true
54
Bundle-Version: 1.0.0.qualifier
5+
Bundle-Vendor: github.com/Goclipse
6+
Bundle-Name: GoClipse Java version check
67
Require-Bundle: org.eclipse.ui,
78
org.eclipse.core.runtime
89
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
9-
Bundle-Vendor: github.com/Goclipse

0 commit comments

Comments
 (0)