Index: nbbuild/antsrc/org/netbeans/nbbuild/MakeJNLP.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/MakeJNLP.java,v
retrieving revision 1.21
diff -u -r1.21 MakeJNLP.java
--- nbbuild/antsrc/org/netbeans/nbbuild/MakeJNLP.java 20 Dec 2006 20:52:32 -0000 1.21
+++ nbbuild/antsrc/org/netbeans/nbbuild/MakeJNLP.java 20 Mar 2007 15:44:23 -0000
@@ -134,6 +134,15 @@
indirectJars = fs;
}
+ private boolean signJars = true;
+ /**
+ * Whether the final jars should be signed or not. Deafults to true
+ * (if not supplied).
+ */
+ public void setSignJars(boolean s) {
+ this.signJars = s;
+ }
+
public void execute() throws BuildException {
if (target == null) throw new BuildException("Output dir must be provided");
if (files == null) throw new BuildException("modules must be provided");
@@ -239,10 +248,16 @@
}
File t = new File(new File(target, dashcnb), name);
- getSignTask().setJar(n);
- getSignTask().setSignedjar(t);
- getSignTask().execute();
-
+ if (signJars) {
+ getSignTask().setJar(n);
+ getSignTask().setSignedjar(t);
+ getSignTask().execute();
+ } else {
+ Copy copy = (Copy)getProject().createTask("copy");
+ copy.setFile(n);
+ copy.setTofile(t);
+ copy.execute();
+ }
writeJNLP.write(" \n");
}
@@ -259,10 +274,16 @@
w.write(writeJNLP.toString());
w.close();
- getSignTask().setJar(jar);
- getSignTask().setSignedjar(signed);
- getSignTask().execute();
-
+ if (signJars) {
+ getSignTask().setJar(jar);
+ getSignTask().setSignedjar(signed);
+ getSignTask().execute();
+ } else {
+ Copy copy = (Copy)getProject().createTask("copy");
+ copy.setFile(jar);
+ copy.setTofile(signed);
+ copy.execute();
+ }
theJar.close();
}
@@ -446,9 +467,16 @@
fileWriter.write(" \n");
- getSignTask().setJar(e);
- getSignTask().setSignedjar(ext);
- getSignTask().execute();
+ if (signJars) {
+ getSignTask().setJar(e);
+ getSignTask().setSignedjar(ext);
+ getSignTask().execute();
+ } else {
+ Copy copy = (Copy)getProject().createTask("copy");
+ copy.setFile(e);
+ copy.setTofile(ext);
+ copy.execute();
+ }
}
}
}
Index: apisupport/harness/release/README
===================================================================
RCS file: /cvs/apisupport/harness/release/README,v
retrieving revision 1.55
diff -u -r1.55 README
--- apisupport/harness/release/README 22 Feb 2007 14:58:10 -0000 1.55
+++ apisupport/harness/release/README 20 Mar 2007 15:44:25 -0000
@@ -833,6 +833,10 @@
If you want to change the default to something else please define the value
of the property.
+jnlp.sign.jars [since 6.0] - defaults to true. If set to false the jars
+ will not be signed, only the main (startup) jar. This should allow for
+ faster startup but might compromise JNLP security. Use with extreme care.
+
[XXX some of the above should be listed in "Suite Properties"]
Index: apisupport/harness/release/jnlp.xml
===================================================================
RCS file: /cvs/apisupport/harness/release/jnlp.xml,v
retrieving revision 1.41
diff -u -r1.41 jnlp.xml
--- apisupport/harness/release/jnlp.xml 26 Feb 2007 21:45:30 -0000 1.41
+++ apisupport/harness/release/jnlp.xml 20 Mar 2007 15:44:25 -0000
@@ -126,6 +126,7 @@
verify="true"
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"
permissions="${jnlp.permissions}"
+ signjars="${jnlp.sign.jars}"
>