Skip to content

Commit 4e430fe

Browse files
committed
Various fixes and improvements.
- fixed handling of reference 'updated' method - allow explicitly specified reference unbind/updated methods to be declared in super-classes (implicit must still be declared in component implementation class) - improved error messages for invalid component implementation class - switched to shared license feature
1 parent 30a5de7 commit 4e430fe

File tree

10 files changed

+154
-320
lines changed

10 files changed

+154
-320
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ See [PDE documentation](http://help.eclipse.org/luna/index.jsp?topic=%2Forg.ecli
4242
This software is made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html.
4343

4444
----------------------------------------------------------------------
45-
Copyright (c) 2013, 2014 Ecliptical Software Inc. All rights reserved.
45+
Copyright (c) 2013, 2015 Ecliptical Software Inc. All rights reserved.

ca.ecliptical.pde.ds-feature/build.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@
1010
###############################################################################
1111
bin.includes = feature.xml,\
1212
feature.properties,\
13-
epl-v10.html,\
14-
license.html
13+
epl-v10.html

ca.ecliptical.pde.ds-feature/feature.properties

Lines changed: 0 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -37,135 +37,3 @@ http://www.eclipse.org/legal/epl-v10.html\n\
3737
Contributors:\n\
3838
Ecliptical Software Inc. - created feature.xml\n
3939
################ end of copyright property ####################################
40-
41-
# "licenseURL" property - URL of the "Feature License"
42-
# do not translate value - just change to point to a locale-specific HTML page
43-
licenseURL=license.html
44-
45-
# "license" property - text of the "Feature Update License"
46-
# should be plain text version of license agreement pointed to be "licenseURL"
47-
license=\
48-
Eclipse Foundation Software User Agreement\n\
49-
February 1, 2011\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-
- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\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 ##########################################

ca.ecliptical.pde.ds-feature/feature.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
<feature
1313
id="ca.ecliptical.pde.ds"
1414
label="%featureName"
15-
version="1.2.4.qualifier"
16-
provider-name="%providerName">
15+
version="1.2.5.qualifier"
16+
provider-name="%providerName"
17+
license-feature="ca.ecliptical.license"
18+
license-feature-version="1.0.0.qualifier">
1719

1820
<description>
1921
%description
@@ -23,10 +25,6 @@
2325
%copyright
2426
</copyright>
2527

26-
<license url="%licenseURL">
27-
%license
28-
</license>
29-
3028
<url>
3129
<update label="%updateSiteName" url="http://download.eclipticalsoftware.com/updates/"/>
3230
<discovery label="%updateSiteName" url="http://download.eclipticalsoftware.com/updates/"/>

ca.ecliptical.pde.ds-feature/license.html

Lines changed: 0 additions & 108 deletions
This file was deleted.

ca.ecliptical.pde.ds/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: ca.ecliptical.pde.ds;singleton:=true
5-
Bundle-Version: 1.2.4.qualifier
5+
Bundle-Version: 1.2.5.qualifier
66
Bundle-Activator: ca.ecliptical.pde.internal.ds.Activator
77
Bundle-Vendor: %Bundle-Vendor
88
Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)",

0 commit comments

Comments
 (0)