Please use the Apache issue tracking system for new NetBeans issues (https://issues.apache.org/jira/projects/NETBEANS0/issues) !!
View | Details | Raw Unified | Return to bug 149071 | Differences between
and this patch

Collapse All | Expand All

(-)a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParserTest.java (-1 / +10 lines)
 Lines 74-80    Link Here 
74
    
74
    
75
    public void testGetItems () {        
75
    public void testGetItems () {        
76
        assertNotNull ("UpdateItems found " + URL_TO_TEST_CATALOG, updateItems);
76
        assertNotNull ("UpdateItems found " + URL_TO_TEST_CATALOG, updateItems);
77
        assertEquals ("3 items found.", 3, updateItems.keySet ().size ());
77
        assertEquals ("4 items found.", 4, updateItems.keySet ().size ());
78
    }
78
    }
79
    
79
    
80
    public void testLicenses () {
80
    public void testLicenses () {
 Lines 86-91    Link Here 
86
            assertFalse (mi + " has non-empty license.", mi.getAgreement ().length () == 0);
86
            assertFalse (mi + " has non-empty license.", mi.getAgreement ().length () == 0);
87
        }
87
        }
88
    }
88
    }
89
90
    public void testLicenseUrlCDDL() {
91
        UpdateItem item = updateItems.get("org.netbeans.test.license.cddl.url_1.0");
92
        UpdateItemImpl impl = Trampoline.SPI.impl(item);
93
        assertTrue("UpdateItemImpl " + impl + " instanceof ModuleItem.", impl instanceof ModuleItem);
94
        ModuleItem mi = (ModuleItem) impl;
95
        assertNotNull(mi + " has license.", mi.getAgreement());        
96
        assertTrue(mi + " has non-cddl license.", mi.getAgreement().startsWith("COMMON DEVELOPMENT AND DISTRIBUTION LICENSE"));
97
    }
89
    
98
    
90
    public void testVisiblePlugin () {
99
    public void testVisiblePlugin () {
91
        UpdateItem item = updateItems.get ("org.netbeans.test.visible_1.0");
100
        UpdateItem item = updateItems.get ("org.netbeans.test.visible_1.0");
(-)a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/catalog.xml (-1 / +8 lines)
 Lines 1-6    Link Here 
1
<?xml version="1.0" encoding="UTF-8" ?>
1
<?xml version="1.0" encoding="UTF-8" ?>
2
2
3
<!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.5//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_5.dtd">
3
<!DOCTYPE module_updates PUBLIC "-//NetBeans//DTD Autoupdate Catalog 2.6//EN" "http://www.netbeans.org/dtds/autoupdate-catalog-2_6.dtd">
4
<module_updates timestamp="08/08/08/08/08/2008">
4
<module_updates timestamp="08/08/08/08/08/2008">
5
    
5
    
6
<notification url="http://plugins.netbeans.org/tests">Important thing!</notification>
6
<notification url="http://plugins.netbeans.org/tests">Important thing!</notification>
 Lines 27-37    Link Here 
27
    
27
    
28
</module>
28
</module>
29
29
30
<module codenamebase="org.netbeans.test.license.cddl.url" distribution="org-netbeans-test-license-cddl-url.nbm" downloadsize="2652" homepage="" license="cddl.txt" moduleauthor="" needsrestart="false">
31
    <manifest AutoUpdate-Show-In-Client="true" OpenIDE-Module="org.netbeans.test.license.url" OpenIDE-Module-Display-Category="Debugging" OpenIDE-Module-Implementation-Version="090311" OpenIDE-Module-Java-Dependencies="Java &gt; 1.5" OpenIDE-Module-Long-Description="Must to check license url attribute" OpenIDE-Module-Name="Visible Plugin" OpenIDE-Module-Requires="org.openide.modules.ModuleFormat1" OpenIDE-Module-Short-Description="Plugin with licence url set" OpenIDE-Module-Specification-Version="1.0"/>
32
33
</module>
34
30
</module_group>
35
</module_group>
31
36
32
<license name="strict-testament">I will never write tests.
37
<license name="strict-testament">I will never write tests.
33
</license>
38
</license>
34
<license name="kind-testament">I will make documentation sometime.
39
<license name="kind-testament">I will make documentation sometime.
35
</license>
40
</license>
41
<license name="cddl.txt" url="nbres:/org/netbeans/modules/autoupdate/updateprovider/data/cddl.txt"/>
42
36
</module_updates>
43
</module_updates>
37
44
(-)a/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/updateprovider/data/cddl.txt (+340 lines)
Line 0    Link Here 
1
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
2
3
1. Definitions.
4
5
1.1. Contributor means each individual or entity that creates or
6
contributes to the creation of Modifications.
7
8
1.2. Contributor Version means the combination of the Original
9
Software, prior Modifications used by a Contributor (if any),
10
and the Modifications made by that particular Contributor.
11
12
1.3. Covered Software means (a) the Original Software, or (b)
13
Modifications, or (c) the combination of files containing
14
Original Software with files containing Modifications, in each
15
case including portions thereof.
16
17
1.4. Executable means the Covered Software in any form other
18
than Source Code.
19
20
1.5. Initial Developer means the individual or entity that first
21
makes Original Software available under this License.
22
23
1.6. Larger Workmeans a work which combines Covered Software or
24
portions thereof with code not governed by the terms of this
25
License.
26
27
1.7. License means this document.
28
29
1.8. Licensable means having the right to grant, to the maximum
30
extent possible, whether at the time of the initial grant or 
31
subsequently acquired, any and all of the rights conveyed herein.
32
33
1.9. Modifications means the Source Code and Executable form of
34
any of the following: A. Any file that results from an addition
35
to, deletion from or modification of the contents of a file
36
containing Original Software or previous Modifications; B. Any
37
new file that contains any part of the Original Software or
38
previous Modification; or C. Any new file that is contributed or
39
otherwise made available under the terms of this License.
40
41
1.10. Original Software means the Source Code and Executable
42
form of computer software code that is originally released under
43
this License.
44
45
1.11. Patent Claims means any patent claim(s), now owned or
46
hereafter acquired, including without limitation, method,
47
process, and apparatus claims, in any patent Licensable by
48
grantor.
49
50
1.12. Source Code means (a) the common form of computer software
51
code in which modifications are made and (b) associated
52
documentation included in or with such code.
53
54
1.13. You (or Your) means an individual or a legal entity
55
exercising rights under, and complying with all of the terms of,
56
this License. For legal entities, You includes any entity which
57
controls, is controlled by, or is under common control with You.
58
For purposes of this definition, control means (a) the power,
59
direct or indirect, to cause the direction or management of such
60
entity, whether by contract or otherwise, or (b) ownership of
61
more than fifty percent (50%) of the outstanding shares or
62
beneficial ownership of such entity.
63
64
2. License Grants.
65
66
2.1. The Initial Developer Grant. Conditioned upon Your
67
compliance with Section 3.1 below and subject to third party
68
intellectual property claims, the Initial Developer hereby
69
grants You a world-wide, royalty-free, non-exclusive license:
70
71
(a) under intellectual property rights (other than patent or
72
trademark) Licensable by Initial Developer, to use, reproduce,
73
modify, display, perform, sublicense and distribute the Original
74
Software (or portions thereof), with or without Modifications,
75
and/or as part of a Larger Work; and
76
77
(b) under Patent Claims infringed by the making, using or
78
selling of Original Software, to make, have made, use, practice,
79
sell, and offer for sale, and/or otherwise dispose of the
80
Original Software (or portions thereof);
81
82
(c) The licenses granted in Sections 2.1(a) and (b) are
83
effective on the date Initial Developer first distributes or
84
otherwise makes the Original Software available to a third party
85
under the terms of this License;
86
87
(d) Notwithstanding Section 2.1(b) above, no patent license is
88
granted: (1) for code that You delete from the Original
89
Software, or (2) for infringements caused by: (i) the
90
modification of the Original Software, or (ii) the combination
91
of the Original Software with other software or devices.
92
93
2.2. Contributor Grant. Conditioned upon Your compliance with
94
Section 3.1 below and subject to third party intellectual
95
property claims, each Contributor hereby grants You a
96
world-wide, royalty-free, non-exclusive license:
97
98
(a) under intellectual property rights (other than patent or
99
trademark) Licensable by Contributor to use, reproduce, modify,
100
display, perform, sublicense and distribute the Modifications
101
created by such Contributor (or portions thereof), either on an
102
unmodified basis, with other Modifications, as Covered Software
103
and/or as part of a Larger Work; and
104
105
(b) under Patent Claims infringed by the making, using, or
106
selling of Modifications made by that Contributor either alone
107
and/or in combination with its Contributor Version (or portions
108
of such combination), to make, use, sell, offer for sale, have
109
made, and/or otherwise dispose of: (1) Modifications made by
110
that Contributor (or portions thereof); and (2) the combination
111
of Modifications made by that Contributor with its Contributor
112
Version (or portions of such combination).
113
114
(c) The licenses granted in Sections 2.2(a) and 2.2(b)
115
areeffective on the date Contributor first distributes or
116
otherwise makes the Modifications available to a third party.
117
118
(d) Notwithstanding Section 2.2(b) above, no patent license is
119
granted: (1) for any code that Contributor has deleted from the
120
Contributor Version; (2) for infringements caused by: (i) third
121
party modifications of Contributor Version, or (ii) the
122
combination of Modifications made by that Contributor with other
123
software (except as part of the Contributor Version) or other
124
devices; or (3) under Patent Claims infringed by Covered
125
Software in the absence of Modifications made by that
126
Contributor.
127
128
3. Distribution Obligations.
129
130
3.1. Availability of Source Code. Any Covered Software that You
131
distribute or otherwise make available in Executable form must
132
also be made available in Source Code form and that Source Code
133
form must be distributed only under the terms of this License.
134
You must include a copy of this License with every copy of the
135
Source Code form of the Covered Software You distribute or
136
otherwise make available. You must inform recipients of any such
137
Covered Software in Executable form as to how they can obtain
138
such Covered Software in Source Code form in a reasonable manner
139
on or through a medium customarily used for software exchange.
140
141
3.2. Modifications. The Modifications that You create or to
142
which You contribute are governed by the terms of this License.
143
You represent that You believe Your Modifications are Your
144
original creation(s) and/or You have sufficient rights to grant
145
the rights conveyed by this License.
146
147
3.3. Required Notices. You must include a notice in each of Your
148
Modifications that identifies You as the Contributor of the
149
Modification. You may not remove or alter any copyright, patent
150
or trademark notices contained within the Covered Software, or
151
any notices of licensing or any descriptive text giving
152
attribution to any Contributor or the Initial Developer.
153
154
3.4. Application of Additional Terms. You may not offer or
155
impose any terms on any Covered Software in Source Code form
156
that alters or restricts the applicable version of this License
157
or the recipients rights hereunder. You may choose to offer, and
158
to charge a fee for, warranty, support, indemnity or liability
159
obligations to one or more recipients of Covered
160
Software. However, you may do so only on Your own behalf, and
161
not on behalf of the Initial Developer or any Contributor. You
162
must make it absolutely clear that any such warranty, support,
163
indemnity or liability obligation is offered by You alone, and
164
You hereby agree to indemnify the Initial Developer and every
165
Contributor for any liability incurred by the Initial Developer
166
or such Contributor as a result of warranty, support, indemnity
167
or liability terms You offer.
168
169
3.5. Distribution of Executable Versions. You may distribute the
170
Executable form of the Covered Software under the terms of this
171
License or under the terms of a license of Your choice, which
172
may contain terms different from this License, provided that You
173
are in compliance with the terms of this License and that the
174
license for the Executable form does not attempt to limit or
175
alter the recipients rights in the Source Code form from the
176
rights set forth in this License. If You distribute the Covered
177
Software in Executable form under a different license, You must
178
make it absolutely clear that any terms which differ from this
179
License are offered by You alone, not by the Initial Developer
180
or Contributor. You hereby agree to indemnify the Initial
181
Developer and every Contributor for any liability incurred by
182
the Initial Developer or such Contributor as a result of any
183
such terms You offer.
184
185
3.6. Larger Works. You may create a Larger Work by combining
186
Covered Software with other code not governed by the terms of
187
this License and distribute the Larger Work as a single product.
188
In such a case, You must make sure the requirements of this
189
License are fulfilled for the Covered Software.
190
191
4. Versions of the License.
192
193
4.1. New Versions. Sun Microsystems, Inc. is the initial license
194
steward and may publish revised and/or new versions of this
195
License from time to time. Each version will be given a
196
distinguishing version number. Except as provided in Section
197
4.3, no one other than the license steward has the right to
198
modify this License.
199
200
4.2. Effect of New Versions. You may always continue to use,
201
distribute or otherwise make the Covered Software available
202
under the terms of the version of the License under which You
203
originally received the Covered Software. If the Initial
204
Developer includes a notice in the Original Software prohibiting
205
it from being distributed or otherwise made available under any
206
subsequent version of the License, You must distribute and make
207
the Covered Software available under the terms of the version of
208
the License under which You originally received the Covered
209
Software.  Otherwise, You may also choose to use, distribute or
210
otherwise make the Covered Software available under the terms of
211
any subsequent version of the License published by the license
212
steward.
213
214
4.3. Modified Versions. When You are an Initial Developer and
215
You want to create a new license for Your Original Software, You
216
may create and use a modified version of this License if You:
217
(a) rename the license and remove any references to the name of
218
the license steward (except to note that the license differs
219
from this License); and (b) otherwise make it clear that the
220
license contains terms which differ from this License.
221
222
5. DISCLAIMER OF WARRANTY. COVERED SOFTWARE IS PROVIDED UNDER
223
THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND,
224
EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
225
WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
226
MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
227
THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
228
SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
229
DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
230
OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
231
REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
232
ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE
233
IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
234
235
6. TERMINATION.
236
237
6.1. This License and the rights granted hereunder will
238
terminate automatically if You fail to comply with terms herein
239
and fail to cure such breach within 30 days of becoming aware of
240
the breach. Provisions which, by their nature, must remain in
241
effect beyond the termination of this License shall survive.
242
243
6.2. If You assert a patent infringement claim (excluding
244
declaratory judgment actions) against Initial Developer or a
245
Contributor (the Initial Developer or Contributor against whom
246
You assert such claim is referred to as Participant) alleging
247
that the Participant Software (meaning the Contributor Version
248
where the Participant is a Contributor or the Original Software
249
where the Participant is the Initial Developer) directly or
250
indirectly infringes any patent, then any and all rights granted
251
directly or indirectly to You by such Participant, the Initial
252
Developer (if the Initial Developer is not the Participant) and
253
all Contributors under Sections 2.1 and/or 2.2 of this License
254
shall, upon 60 days notice from Participant terminate
255
prospectively and automatically at the expiration of such 60 day
256
notice period, unless if within such 60 day period You withdraw
257
Your claim with respect to the Participant Software against such
258
Participant either unilaterally or pursuant to a written
259
agreement with Participant.
260
261
6.3. In the event of termination under Sections 6.1 or 6.2
262
above, all end user licenses that have been validly granted by
263
You or any distributor hereunder prior to termination (excluding
264
licenses granted to You by any distributor) shall survive
265
termination.
266
267
7. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO
268
LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR
269
OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
270
CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY
271
SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY
272
INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
273
CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST
274
PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
275
MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES,
276
EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY
277
OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO
278
LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
279
PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
280
LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
281
LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS
282
EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
283
284
8. U.S. GOVERNMENT END USERS. The Covered Software is a
285
commercial item, as that term is defined in 48 C.F.R. 2.101
286
(Oct. 1995), consisting of commercial computer software (as that
287
term is defined at 48 C.F.R. 252.227-7014(a)(1)) and commercial
288
computer software documentation as such terms are used in 48
289
C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
290
48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
291
U.S. Government End Users acquire Covered Software with only
292
those rights set forth herein. This U.S. Government Rights
293
clause is in lieu of, and supersedes, any other FAR, DFAR, or
294
other clause or provision that addresses Government rights in
295
computer software under this License.
296
297
9. MISCELLANEOUS. This License represents the complete agreement
298
concerning subject matter hereof. If any provision of this
299
License is held to be unenforceable, such provision shall be
300
reformed only to the extent necessary to make it enforceable.
301
This License shall be governed by the law of the jurisdiction
302
specified in a notice contained within the Original Software
303
(except to the extent applicable law, if any, provides
304
otherwise), excluding such jurisdictions conflict-of-law
305
provisions. Any litigation relating to this License shall be
306
subject to the jurisdiction of the courts located in the
307
jurisdiction and venue specified in a notice contained within
308
the Original Software, with the losing party responsible for
309
costs, including, without limitation, court costs and reasonable
310
attorneys fees and expenses. The application of the United
311
Nations Convention on Contracts for the International Sale of
312
Goods is expressly excluded. Any law or regulation which
313
provides that the language of a contract shall be construed
314
against the drafter shall not apply to this License. You agree
315
that You alone are responsible for compliance with the United
316
States export administration regulations (and the export control
317
laws and regulation of any other countries) when You use,
318
distribute or otherwise make available any Covered Software.
319
320
10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and
321
the Contributors, each party is responsible for claims and
322
damages arising, directly or indirectly, out of its utilization
323
of rights under this License and You agree to work with Initial
324
Developer and Contributors to distribute such responsibility on
325
an equitable basis. Nothing herein is intended or shall be
326
deemed to constitute any admission of liability.
327
328
----------------------------------------------------------------
329
330
NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND
331
DISTRIBUTION LICENSE (CDDL): This code is released under the
332
CDDL and shall be governed by the laws of the State of
333
California (excluding conflict-of-law provisions). Any
334
litigation relating to this License shall be subject to the
335
jurisdiction of the Federal Courts of the Northern District of
336
California and the state courts of the State of California, with
337
venue lying in Santa Clara County, California.
338
339
----------------------------------------------------------------
340

Return to bug 149071
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo