This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 98371
Collapse All | Expand All

(-)nbbuild/antsrc/org/netbeans/nbbuild/MakeJNLP.java (-11 / +39 lines)
Lines 134-139 Link Here
134
        indirectJars = fs;
134
        indirectJars = fs;
135
    }
135
    }
136
    
136
    
137
    private boolean signJars = true;
138
    /**
139
     * Whether the final jars should be signed or not. Deafults to true
140
     * (if not supplied).
141
     */
142
    public void setSignJars(boolean s) {
143
        this.signJars = s;
144
    }
145
    
137
    public void execute() throws BuildException {
146
    public void execute() throws BuildException {
138
        if (target == null) throw new BuildException("Output dir must be provided");
147
        if (target == null) throw new BuildException("Output dir must be provided");
139
        if (files == null) throw new BuildException("modules must be provided");
148
        if (files == null) throw new BuildException("modules must be provided");
Lines 239-248 Link Here
239
                        }
248
                        }
240
                        File t = new File(new File(target, dashcnb), name);
249
                        File t = new File(new File(target, dashcnb), name);
241
                        
250
                        
242
                        getSignTask().setJar(n);
251
                        if (signJars) {
243
                        getSignTask().setSignedjar(t);
252
                            getSignTask().setJar(n);
244
                        getSignTask().execute();
253
                            getSignTask().setSignedjar(t);
245
                        
254
                            getSignTask().execute();
255
                        } else {
256
                            Copy copy = (Copy)getProject().createTask("copy");
257
                            copy.setFile(n);
258
                            copy.setTofile(t);
259
                            copy.execute();
260
                        }
246
                        writeJNLP.write("    <jar href='" + dashcnb + '/' + name + "'/>\n");
261
                        writeJNLP.write("    <jar href='" + dashcnb + '/' + name + "'/>\n");
247
                    }
262
                    }
248
263
Lines 259-268 Link Here
259
            w.write(writeJNLP.toString());
274
            w.write(writeJNLP.toString());
260
            w.close();
275
            w.close();
261
276
262
            getSignTask().setJar(jar);
277
            if (signJars) {
263
            getSignTask().setSignedjar(signed);
278
                getSignTask().setJar(jar);
264
            getSignTask().execute();
279
                getSignTask().setSignedjar(signed);
265
                
280
                getSignTask().execute();
281
            } else {
282
                Copy copy = (Copy)getProject().createTask("copy");
283
                copy.setFile(jar);
284
                copy.setTofile(signed);
285
                copy.execute();
286
            }
266
                
287
                
267
            theJar.close();
288
            theJar.close();
268
        }
289
        }
Lines 446-454 Link Here
446
                
467
                
447
                fileWriter.write("    <jar href='" + dashcnb + '/' + ext.getName() + "'/>\n");
468
                fileWriter.write("    <jar href='" + dashcnb + '/' + ext.getName() + "'/>\n");
448
469
449
                getSignTask().setJar(e);
470
                if (signJars) {
450
                getSignTask().setSignedjar(ext);
471
                    getSignTask().setJar(e);
451
                getSignTask().execute();
472
                    getSignTask().setSignedjar(ext);
473
                    getSignTask().execute();
474
                } else {
475
                    Copy copy = (Copy)getProject().createTask("copy");
476
                    copy.setFile(e);
477
                    copy.setTofile(ext);
478
                    copy.execute();
479
                }
452
            }
480
            }
453
        }
481
        }
454
    }
482
    }
(-)apisupport/harness/release/README (+4 lines)
Lines 833-838 Link Here
833
  If you want to change the default to something else please define the value
833
  If you want to change the default to something else please define the value
834
  of the property.
834
  of the property.
835
835
836
jnlp.sign.jars [since 6.0] - defaults to true. If set to false the jars 
837
  will not be signed, only the main (startup) jar. This should allow for 
838
  faster startup but might compromise JNLP security. Use with extreme care.
839
836
[XXX some of the above should be listed in "Suite Properties"]
840
[XXX some of the above should be listed in "Suite Properties"]
837
841
838
842
(-)apisupport/harness/release/jnlp.xml (+1 lines)
Lines 126-131 Link Here
126
            verify="true"
126
            verify="true"
127
            verifyexcludes="lib/nbexec.cmd,lib/nbexec,lib/nbexec.exe,core/ide.ks,LICENSE.txt,DISTRIBUTION.txt,THIRDPARTYLICENSEREADME.txt,docs/swing-layout-1.0-doc.zip,docs/swing-layout-1.0.1-doc.zip,docs/html40.zip,core/org-netbeans-modules-utilities-cli.jar,docs/org/netbeans/modules/usersguide/ide.css"
127
            verifyexcludes="lib/nbexec.cmd,lib/nbexec,lib/nbexec.exe,core/ide.ks,LICENSE.txt,DISTRIBUTION.txt,THIRDPARTYLICENSEREADME.txt,docs/swing-layout-1.0-doc.zip,docs/swing-layout-1.0.1-doc.zip,docs/html40.zip,core/org-netbeans-modules-utilities-cli.jar,docs/org/netbeans/modules/usersguide/ide.css"
128
            permissions="${jnlp.permissions}"
128
            permissions="${jnlp.permissions}"
129
            signjars="${jnlp.sign.jars}"
129
        >
130
        >
130
            <modules refid="jnlp.included.modules"/>
131
            <modules refid="jnlp.included.modules"/>
131
        </makejnlp>
132
        </makejnlp>

Return to bug 98371