/hg/release/icedtea6-1.8: Adds javawebstart.version property and...

[mwong at icedtea.classpath.org]

changeset 2489bca2d112 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=2489bca2d112
author: Man Lung Wong <mwong at redhat.com>
date: Tue Jul 20 16:52:27 2010 -0400

	Adds javawebstart.version property and give user permission to read
	that property during sandbox permission.


diffstat:

3 files changed, 16 insertions(+)
ChangeLog                                          |   10 ++++++++++
netx/net/sourceforge/jnlp/SecurityDesc.java        |    1 +
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java |    5 +++++

diffs (43 lines):

diff -r 38c9e6307044 -r 2489bca2d112 ChangeLog
--- a/ChangeLog	Tue Jul 20 13:50:16 2010 -0400
+++ b/ChangeLog	Tue Jul 20 16:52:27 2010 -0400
@@ -1,3 +1,13 @@ 2010-07-20  Omair Majid  <omajid at redhat.
+2010-07-20  Man Lung Wong  <mwong at redhat.com>
+
+	* netx/net/sourceforge/jnlp/SecurityDesc.java:
+	Add permission to read javawebstart.version property as part of 
+	sandbox permission.
+	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize):
+	Set the javawebstart.version property as part of System property
+	whenever a jnlp file is being launched (note: this now allows
+	the jnlp file in bug 486 to launch).
+
 2010-07-20  Omair Majid  <omajid at redhat.com>
 
 	PR icedtea/491
diff -r 38c9e6307044 -r 2489bca2d112 netx/net/sourceforge/jnlp/SecurityDesc.java
--- a/netx/net/sourceforge/jnlp/SecurityDesc.java	Tue Jul 20 13:50:16 2010 -0400
+++ b/netx/net/sourceforge/jnlp/SecurityDesc.java	Tue Jul 20 16:52:27 2010 -0400
@@ -94,6 +94,7 @@ public class SecurityDesc {
         new PropertyPermission("java.vm.version", "read"),
         new PropertyPermission("java.vm.vendor", "read"),
         new PropertyPermission("java.vm.name", "read"),
+        new PropertyPermission("javawebstart.version", "read"),
         new RuntimePermission("exitVM"),
         new RuntimePermission("stopThread"),
         new AWTPermission("showWindowWithoutWarningBanner"),
diff -r 38c9e6307044 -r 2489bca2d112 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	Tue Jul 20 13:50:16 2010 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java	Tue Jul 20 16:52:27 2010 -0400
@@ -167,6 +167,11 @@ public class JNLPRuntime {
         checkInitialized();
      
         isWebstartApplication = isApplication;
+        
+        //Setting the system property for javawebstart's version.
+        //The version stored will be the same as java's version.
+        System.setProperty("javawebstart.version", "javaws-" +
+            System.getProperty("java.version"));
 
         if (headless == false)
             checkHeadless();