/hg/icedtea-web: Single instance support for jnlp-href and tests
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Sep 5 03:30:17 PDT 2012
changeset 03803e23d0e6 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=03803e23d0e6
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Sep 05 12:30:30 2012 +0200
Single instance support for jnlp-href and tests
diffstat:
ChangeLog | 22 +
netx/net/sourceforge/jnlp/Launcher.java | 19 +
netx/net/sourceforge/jnlp/resources/Messages.properties | 3 +-
netx/net/sourceforge/jnlp/services/XSingleInstanceService.java | 38 +-
tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest.jnlp | 60 ++
tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTestWS.jnlp | 55 ++
tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest_clasical.html | 50 +
tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest_jnlpHref.html | 47 +
tests/reproducers/simple/SingleInstanceServiceTest/srcs/SingleInstanceChecker.java | 158 +++++
tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java | 265 ++++++++++
10 files changed, 709 insertions(+), 8 deletions(-)
diffs (truncated from 838 to 500 lines):
diff -r 855087771e7e -r 03803e23d0e6 ChangeLog
--- a/ChangeLog Tue Aug 28 14:36:06 2012 -0400
+++ b/ChangeLog Wed Sep 05 12:30:30 2012 +0200
@@ -1,3 +1,25 @@
+2012-09-04 Jiri Vanek <Jvanek at redhat.com>
+ Danesh Dadachanji <ddadacha at redhat.com>
+
+ Single instance support for jnlp-href and tests
+ * netx/net/sourceforge/jnlp/services/XSingleInstanceService.java:
+ (initializeSingleInstance) fixed code for catching running instance
+ (checkSingleInstanceRunning) Added handling of parameters.
+ * netx/net/sourceforge/jnlp/Launcher.java: (launchApplication),
+ (launchApplet) Added debug output that instance is already running.
+ (getApplet) added check for services and debug output
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: added
+ (LSingleInstanceExists) entry for exception.
+ tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest.jnlp
+ * tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTestWS.jnlp:
+ * tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest_clasical.html:
+ * tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest_jnlpHref.html:
+ Applet and application in jnlp or html launching files.
+ * tests/reproducers/simple/SingleInstanceServiceTest/srcs/SingleInstanceChecker.java
+ SingleInstance implementing applet/application
+ * tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java
+ Testfile for launching for above jnlps/htmls as testcases.
+
2012-08-27 Adam Domurad <adomurad at redhat.com>
Fixes PR920, duplicate loading of classes in certain cases
diff -r 855087771e7e -r 03803e23d0e6 netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Tue Aug 28 14:36:06 2012 -0400
+++ b/netx/net/sourceforge/jnlp/Launcher.java Wed Sep 05 12:30:30 2012 +0200
@@ -536,6 +536,9 @@
try {
ServiceUtil.checkExistingSingleInstance(file);
} catch (InstanceExistsException e) {
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Single instance application is already running.");
+ }
return null;
}
@@ -653,11 +656,17 @@
throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotApplet"), R("LNotAppletInfo")));
try {
+ ServiceUtil.checkExistingSingleInstance(file);
AppletInstance applet = createApplet(file, enableCodeBase, cont);
applet.initialize();
applet.getAppletEnvironment().startApplet(); // this should be a direct call to applet instance
return applet;
+ } catch (InstanceExistsException ieex) {
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Single instance applet is already running.");
+ }
+ throw launchError(new LaunchException(file, ieex, R("LSFatal"), R("LCLaunching"), R("LCouldNotLaunch"), R("LSingleInstanceExists")));
} catch (LaunchException lex) {
throw launchError(lex);
} catch (Exception ex) {
@@ -673,9 +682,17 @@
throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LNotApplet"), R("LNotAppletInfo")));
try {
+ ServiceUtil.checkExistingSingleInstance(file);
+
AppletInstance applet = createApplet(file, enableCodeBase, cont);
applet.initialize();
return applet;
+
+ } catch (InstanceExistsException ieex) {
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("Single instance applet is already running.");
+ }
+ throw launchError(new LaunchException(file, ieex, R("LSFatal"), R("LCLaunching"), R("LCouldNotLaunch"), R("LSingleInstanceExists")));
} catch (LaunchException lex) {
throw launchError(lex);
} catch (Exception ex) {
@@ -688,6 +705,8 @@
* a thread in the application's thread group.
*/
protected ApplicationInstance launchInstaller(JNLPFile file) throws LaunchException {
+ // TODO Check for an existing single instance once implemented.
+ // ServiceUtil.checkExistingSingleInstance(file);
throw launchError(new LaunchException(file, null, R("LSFatal"), R("LCNotSupported"), R("LNoInstallers"), R("LNoInstallersInfo")));
}
diff -r 855087771e7e -r 03803e23d0e6 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Aug 28 14:36:06 2012 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Wed Sep 05 12:30:30 2012 +0200
@@ -82,7 +82,8 @@
LSignedAppJarUsingUnsignedJarInfo=The main application jar is signed, but some of the jars it is using aren't.
LSignedJNLPFileDidNotMatch=The signed JNLP file did not match the launching JNLP file.
LNoSecInstance=Error: No security instance for {0}. The application may have trouble continuing
-LCertFoundIn={0} found in cacerts ({1})
+LCertFoundIn={0} found in cacerts ({1})
+LSingleInstanceExists=Another instance of this applet already exists and only one may be run at the same time.
JNotApplet=File is not an applet.
JNotApplication=File is not an application.
diff -r 855087771e7e -r 03803e23d0e6 netx/net/sourceforge/jnlp/services/XSingleInstanceService.java
--- a/netx/net/sourceforge/jnlp/services/XSingleInstanceService.java Tue Aug 28 14:36:06 2012 -0400
+++ b/netx/net/sourceforge/jnlp/services/XSingleInstanceService.java Wed Sep 05 12:30:30 2012 +0200
@@ -24,11 +24,14 @@
import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
import javax.jnlp.SingleInstanceListener;
import javax.management.InstanceAlreadyExistsException;
import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.PluginBridge;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
/**
@@ -104,13 +107,14 @@
* @throws InstanceAlreadyExistsException if the instance already exists
*/
public void initializeSingleInstance() {
- if (!initialized) {
- // this is called after the application has started. so safe to use
- // JNLPRuntime.getApplication()
- checkSingleInstanceRunning(JNLPRuntime.getApplication().getJNLPFile());
+ // this is called after the application has started. so safe to use
+ // JNLPRuntime.getApplication()
+ JNLPFile jnlpFile = JNLPRuntime.getApplication().getJNLPFile();
+ if (!initialized || jnlpFile instanceof PluginBridge) {
+ // Either a new process or a new applet being handled by the plugin.
+ checkSingleInstanceRunning(jnlpFile);
initialized = true;
SingleInstanceLock lockFile;
- JNLPFile jnlpFile = JNLPRuntime.getApplication().getJNLPFile();
lockFile = new SingleInstanceLock(jnlpFile);
if (!lockFile.isValid()) {
startListeningServer(lockFile);
@@ -127,6 +131,7 @@
* @throws InstanceExistsException if an instance of this application
* already exists
*/
+ @Override
public void checkSingleInstanceRunning(JNLPFile jnlpFile) {
SingleInstanceLock lockFile = new SingleInstanceLock(jnlpFile);
if (lockFile.isValid()) {
@@ -134,9 +139,28 @@
if (JNLPRuntime.isDebug()) {
System.out.println("Lock file is valid (port=" + port + "). Exiting.");
}
+
+ String[] args = null;
+ if (jnlpFile.isApplet()) {
+ // FIXME Proprietary plug-in is unclear about how to handle
+ // applets and their parameters.
+ //Right now better to forward at least something
+ Set<Entry<String, String>> currentParams = jnlpFile.getApplet().getParameters().entrySet();
+ args = new String[currentParams.size() * 2];
+ int i = 0;
+ for (Entry<String, String> entry : currentParams) {
+ args[i] = entry.getKey();
+ args[i+1] = entry.getValue();
+ i += 2;
+ }
+ } else if (jnlpFile.isInstaller()) {
+ // TODO Implement this once installer service is available.
+ } else {
+ args = jnlpFile.getApplication().getArguments();
+ }
+
try {
- sendProgramArgumentsToExistingApplication(port, jnlpFile.getApplication()
- .getArguments());
+ sendProgramArgumentsToExistingApplication(port, args);
throw new InstanceExistsException(String.valueOf(port));
} catch (IOException e) {
throw new RuntimeException(e);
diff -r 855087771e7e -r 03803e23d0e6 tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest.jnlp Wed Sep 05 12:30:30 2012 +0200
@@ -0,0 +1,60 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="SingleInstanceTest.jnlp" codebase=".">
+ <information>
+ <title>SingleInstanceApplet</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>SingleInstanceApplet</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="SingleInstanceServiceTest.jar"/>
+ </resources>
+ <applet-desc
+ documentBase="."
+ name="SingleInstanceChecker"
+ main-class="SingleInstanceChecker"
+ width="100"
+ height="100">
+ <param name="p1" value="v1"/>
+ <param name="p2" value="v2"/>
+ </applet-desc>
+</jnlp>
\ No newline at end of file
diff -r 855087771e7e -r 03803e23d0e6 tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTestWS.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTestWS.jnlp Wed Sep 05 12:30:30 2012 +0200
@@ -0,0 +1,55 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="SingleInstanceTest.jnlp" codebase=".">
+ <information>
+ <title>SingleInstanceAppletWS</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>SingleInstanceAppletWS</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="SingleInstanceServiceTest.jar"/>
+ </resources>
+ <application-desc main-class="SingleInstanceChecker">
+ <argument>v7</argument>
+ <argument>v8</argument>
+ </application-desc>
+</jnlp>
\ No newline at end of file
diff -r 855087771e7e -r 03803e23d0e6 tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest_clasical.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest_clasical.html Wed Sep 05 12:30:30 2012 +0200
@@ -0,0 +1,50 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+-->
+<html>
+ <head></head>
+ <body>
+ <applet codebase="."
+ archive="SingleInstanceServiceTest.jar"
+ code="SingleInstanceChecker.class"
+ width="100"
+ height="100">
+ <param name="p5" value="v5"/>
+ <param name="p6" value="v6"/>
+ </applet>
+ </body>
+</html>
diff -r 855087771e7e -r 03803e23d0e6 tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest_jnlpHref.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/SingleInstanceServiceTest/resources/SingleInstanceTest_jnlpHref.html Wed Sep 05 12:30:30 2012 +0200
@@ -0,0 +1,47 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+-->
+<html>
+ <head></head>
+ <body>
+ <applet code="SingleInstanceChecker.class" width="800" height="600">
+ <param name="jnlp_href" value="SingleInstanceTest.jnlp">
+ <param name="p3" value="v3"/>
+ <param name="p4" value="v4"/>
+ </applet>
+ </body>
+</html>
diff -r 855087771e7e -r 03803e23d0e6 tests/reproducers/simple/SingleInstanceServiceTest/srcs/SingleInstanceChecker.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/SingleInstanceServiceTest/srcs/SingleInstanceChecker.java Wed Sep 05 12:30:30 2012 +0200
@@ -0,0 +1,158 @@
+/* SingleInstanceChecker.java
+Copyright (C) 2012 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+import java.applet.Applet;
+
+import javax.jnlp.SingleInstanceListener;
+import javax.jnlp.SingleInstanceService;
+import javax.jnlp.ServiceManager;
+import javax.jnlp.UnavailableServiceException;
+
+public class SingleInstanceChecker extends Applet implements SingleInstanceListener {
+
+ private SingleInstanceChecker self;
+ Killer killer;
+
+ private static class Killer extends Thread {
+
+ private int timeout;
+ private String timeoutText;
+
+ public Killer() {
+ timeout = 5000;
+ timeoutText = Integer.toString(timeout);
+ }
+
+ public Killer(int n) {
+ timeout = n;
+ timeoutText = Integer.toString(timeout);
+ }
+
+ public Killer(int n, String s) {
+ timeout = n;
+ timeoutText = s;
+ }
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(timeout);
+ System.out.println("Applet killing itself after " + timeoutText + " ms of life");
+ System.exit(0);
+ } catch (Exception ex) {
+ }
+ }
+ }
+
+ public SingleInstanceChecker() {
+ self = this;
+ }
+
+ private void proceed() {
+
+ try {
+ SingleInstanceService testService = (SingleInstanceService) ServiceManager.lookup("javax.jnlp.SingleInstanceService");
+ System.out.println("SingleInstanceChecker: Adding listener to service.");
More information about the distro-pkg-dev
mailing list