/hg/icedtea-web: 3 new changesets

[jvanek at icedtea.classpath.org]

changeset c20c689ba9ff in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c20c689ba9ff
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Mar 13 16:34:01 2014 +0100

	JNLPClassLoader.java: (init) attributes are alowed to access jars only once all resources are downloaded


changeset fdcb91be0d58 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fdcb91be0d58
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Mar 13 16:39:04 2014 +0100

	Fixing rear deadlock issue

	ConsoleOutputPane.java: removed (probably) unnecessary synchronization of (refreshPaneBody).


changeset 71a87178ff7e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=71a87178ff7e
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Mar 13 16:43:45 2014 +0100

	JNLPClassLoaderTest.java: adapted to permissions attribute


diffstat:

 ChangeLog                                                             |  17 +++++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java                |   4 +-
 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java         |   2 +-
 tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java |  29 ++++++++++
 4 files changed, 49 insertions(+), 3 deletions(-)

diffs (105 lines):

diff -r e53adc254895 -r 71a87178ff7e ChangeLog
--- a/ChangeLog	Wed Mar 12 17:34:10 2014 +0100
+++ b/ChangeLog	Thu Mar 13 16:43:45 2014 +0100
@@ -1,3 +1,20 @@
+2014-03-13  Jiri Vanek  <jvanek at redhat.com>
+
+	* tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: adapted
+	to permissions attribute 
+
+2014-03-13  Jiri Vanek  <jvanek at redhat.com>
+
+	Fixing rear deadlock issue
+	* netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java: removed
+	(probably) unnecessary synchronization of (refreshPaneBody).
+
+2014-03-13  Jiri Vanek  <jvanek at redhat.com>
+
+	Fixed appearance of download indicator
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (init) attributes
+	are allowed to access jars only once all resources are downloaded
+
 2014-03-12  Jiri Vanek  <jvanek at redhat.com>
 
 	* configure.ac: added check for /bin/bash
diff -r e53adc254895 -r 71a87178ff7e netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Mar 12 17:34:10 2014 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu Mar 13 16:43:45 2014 +0100
@@ -258,8 +258,6 @@
 
         this.enableCodeBase = enableCodeBase;
 
-        //as it is harmless, we can set is as soon as possible.
-        file.getManifestsAttributes().setLoader(this);
         
         AppVerifier verifier;
 
@@ -282,6 +280,8 @@
 
         initializeResources();
         
+        //loading mainfests before resources are initialised may cause waiting for resources
+        file.getManifestsAttributes().setLoader(this);
 
         // initialize permissions
         initializePermissions();
diff -r e53adc254895 -r 71a87178ff7e netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java
--- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java	Wed Mar 12 17:34:10 2014 +0100
+++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java	Thu Mar 13 16:43:45 2014 +0100
@@ -217,7 +217,7 @@
         });
     }
 
-    private synchronized void refreshPaneBody(final boolean reset) throws BadLocationException, IOException {
+    private void refreshPaneBody(final boolean reset) throws BadLocationException, IOException {
         if (reset) {
             jEditorPane1.setText(model.importList(0));
         } else {
diff -r e53adc254895 -r 71a87178ff7e tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java	Wed Mar 12 17:34:10 2014 +0100
+++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java	Thu Mar 13 16:43:45 2014 +0100
@@ -48,15 +48,44 @@
 
 import net.sourceforge.jnlp.LaunchException;
 import net.sourceforge.jnlp.cache.UpdatePolicy;
+import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.mock.DummyJNLPFileWithJar;
+import net.sourceforge.jnlp.security.appletextendedsecurity.AppletSecurityLevel;
+import net.sourceforge.jnlp.security.appletextendedsecurity.AppletStartupSecuritySettings;
 import net.sourceforge.jnlp.util.FileTestUtils;
 import net.sourceforge.jnlp.util.logging.NoStdOutErrTest;
+import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.BeforeClass;
 
 import org.junit.Test;
 
 public class JNLPClassLoaderTest extends NoStdOutErrTest{
 
+    private static AppletSecurityLevel level;
+    public static String askUser;
+    
+    
+    @BeforeClass
+    public static void setPermissions() {
+        level = AppletStartupSecuritySettings.getInstance().getSecurityLevel();
+        JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_SECURITY_LEVEL, AppletSecurityLevel.ALLOW_UNSIGNED.toChars());
+    }
+
+    @AfterClass
+    public static void resetPermissions() {
+        JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_SECURITY_LEVEL, level.toChars());
+    }
+    @BeforeClass
+    public static void noDialogs(){
+        askUser = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER); 
+       JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER, Boolean.toString(false)); 
+    }
+    
+    @AfterClass
+    public static void restoreDialogs(){
+       JNLPRuntime.getConfiguration().setProperty(DeploymentConfiguration.KEY_SECURITY_PROMPT_USER, askUser); 
+    }
     /* Note: Only does file leak testing for now. */
     @Test
     public void constructorFileLeakTest() throws Exception {