From f5c6f8b8e8ec228806cef058f5787eeb635a0ad2 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Tue, 17 Mar 2020 22:51:17 +0100 Subject: [PATCH 01/10] update to api changes in ITW --- .../main/java/com/openwebstart/launcher/OwsJvmLauncher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java b/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java index 18b41a81..c6829ebc 100644 --- a/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java +++ b/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java @@ -12,7 +12,7 @@ import net.adoptopenjdk.icedteaweb.ProcessUtils; import net.adoptopenjdk.icedteaweb.i18n.Translator; import net.adoptopenjdk.icedteaweb.jnlp.element.resource.JREDesc; -import net.adoptopenjdk.icedteaweb.jnlp.element.security.ApplicationPermissionLevel; +import net.adoptopenjdk.icedteaweb.jnlp.element.security.ApplicationEnvironment; import net.adoptopenjdk.icedteaweb.jnlp.version.VersionId; import net.adoptopenjdk.icedteaweb.jnlp.version.VersionString; import net.adoptopenjdk.icedteaweb.jvm.JvmUtils; @@ -147,7 +147,7 @@ private void launchExternal( } private List extractVmArgs(final JNLPFile jnlpFile) { - if (jnlpFile.getSecurity().getApplicationPermissionLevel() == ApplicationPermissionLevel.ALL) { + if (jnlpFile.getSecurity().getApplicationEnvironment() == ApplicationEnvironment.ALL) { final List result = new ArrayList<>(); final Map properties = jnlpFile.getResources().getPropertiesMap(); properties.keySet().forEach(property -> { From eeafd12e4dcb5605abc8c6982d434a822f64f639 Mon Sep 17 00:00:00 2001 From: AndreasEhret Date: Wed, 18 Mar 2020 12:37:30 +0100 Subject: [PATCH 02/10] added another name variant to AzulResolver --- .../src/main/java/com/openwebstart/jvm/vendor/AzulResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openwebstart/src/main/java/com/openwebstart/jvm/vendor/AzulResolver.java b/openwebstart/src/main/java/com/openwebstart/jvm/vendor/AzulResolver.java index 409d8fe9..475ec91e 100644 --- a/openwebstart/src/main/java/com/openwebstart/jvm/vendor/AzulResolver.java +++ b/openwebstart/src/main/java/com/openwebstart/jvm/vendor/AzulResolver.java @@ -5,6 +5,6 @@ public class AzulResolver extends BasicVendorResolver { public AzulResolver() { - super(AZUL, "Azul", "Zulu", "Azul Zulu", "Azul Systems", "Azul Systems Inc."); + super(AZUL, "Azul", "Zulu", "Azul Zulu", "Azul Systems", "Azul Systems Inc.", "Zulu Community Edition"); } } From c6632804c9b20cd8291bd7a949312a6a62a92a39 Mon Sep 17 00:00:00 2001 From: AndreasEhret Date: Wed, 18 Mar 2020 12:38:36 +0100 Subject: [PATCH 03/10] use dialog icons from icedtea-web --- .../java/com/openwebstart/jvm/ui/Images.java | 4 ---- .../java/com/openwebstart/ui/ErrorDialog.java | 6 ++---- .../ui/dialogs/SimpleDialogWithResult.java | 3 ++- .../com/openwebstart/jvm/ui/error-64.png | Bin 720 -> 0 bytes .../com/openwebstart/jvm/ui/question-64.png | Bin 1191 -> 0 bytes 5 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 openwebstart/src/main/resources/com/openwebstart/jvm/ui/error-64.png delete mode 100644 openwebstart/src/main/resources/com/openwebstart/jvm/ui/question-64.png diff --git a/openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java b/openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java index 4a1e2352..4273ad92 100644 --- a/openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java +++ b/openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java @@ -12,10 +12,6 @@ public interface Images { URL JVM_64_URL = Images.class.getResource("jvm-64.png"); - URL QUESTION_64_URL = Images.class.getResource("question-64.png"); - - URL ERROR_64_URL = Images.class.getResource("error-64.png"); - URL NETWORK_64_URL = Images.class.getResource("network-64.png"); } diff --git a/openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java b/openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java index 88a40c20..d79e5431 100644 --- a/openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java +++ b/openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java @@ -1,15 +1,14 @@ package com.openwebstart.ui; import com.openwebstart.controlpanel.ButtonPanelFactory; -import com.openwebstart.jvm.ui.Images; import net.adoptopenjdk.icedteaweb.Assert; import net.adoptopenjdk.icedteaweb.i18n.Translator; +import net.adoptopenjdk.icedteaweb.image.ImageGallery; import net.adoptopenjdk.icedteaweb.logging.Logger; import net.adoptopenjdk.icedteaweb.logging.LoggerFactory; import net.adoptopenjdk.icedteaweb.ui.swing.SwingUtils; import javax.swing.BorderFactory; -import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; @@ -33,8 +32,7 @@ public ErrorDialog(final String message, final Exception error) { setTitle(translator.translate("dialog.error.title")); - final ImageIcon imageIcon = new ImageIcon(Images.ERROR_64_URL); - final IconComponent downloadIcon = new IconComponent(imageIcon); + final IconComponent downloadIcon = new IconComponent(ImageGallery.ERROR.asImageIcon()); final JLabel messageLabel = new JLabel(message); diff --git a/openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java b/openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java index d939075d..bdbbabc1 100644 --- a/openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java +++ b/openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java @@ -2,6 +2,7 @@ import com.openwebstart.jvm.ui.Images; import com.openwebstart.ui.IconComponent; +import net.adoptopenjdk.icedteaweb.image.ImageGallery; import javax.swing.BorderFactory; import javax.swing.Box; @@ -21,7 +22,7 @@ public class SimpleDialogWithResult extends ButtonBasedDialogWithResult { private final ImageIcon imageIcon; public SimpleDialogWithResult(final String title, final String message, final DialogButton... buttons) { - this(title, message, new ImageIcon(Images.QUESTION_64_URL), buttons); + this(title, message, ImageGallery.QUESTION.asImageIcon(), buttons); } diff --git a/openwebstart/src/main/resources/com/openwebstart/jvm/ui/error-64.png b/openwebstart/src/main/resources/com/openwebstart/jvm/ui/error-64.png deleted file mode 100644 index 0425fcc704bae36ffd65c5f12c7000da32ef6854..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 720 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjR6 zFbHl3Va8d>!P-DU$r9IylHmNblJdl&REF~Ma=pyF?Be9af>gcyqV(DCY@~pSssnsN zT>k?>Xy}abxH{*P+MS0zf^tc}FbtA_6MzrU(NUs~wUe}_%uSa=bi}t!61w`IJ zH9!PrBa@yOB3=)h${uyrKJICJGNJ9$$s?amAN%*`&%eKa{{zwg{}cX+umhbTR}$nG z%)rdWBQ0;^|Nle33r+{#U^-HHrqIo7_FNSgA&F&=Spz3M_Y|q<%e8IB3{3y$GC;59eV{Q7<2})bbtp2@ZQ_WLX{aer~cD;E{{h196Hv^B^PmgH% zq;qaw|IrVuJMYA9V4A+OsXz2X`t##nKA#G7u5(SvFE2c?LF#6(hT7Rr?eE z_1!k#2j9x4i=-T(ohuUw`Yk$rB;LKpWoe$>HaJmYSPgj_`5W zGXH1zRZfvtd2iC>%kB$L)cv!0rPEzb`_pQR1h_?1YFb>}822{y^dC|Pu5r#6(Udnh z*%;<{u-#d%giFiLhHF7!z$d`~maR>*`a6U)MBCy{x;yQBwe`wji*H(XMZFI8ea&tT z#VvIgWEd|2CYJ`~H*rID44fze`8sf7@-S_!NGh fU+4boYyb04yH~p`E4i~87^MuJu6{1-oD!MwU01>wVnqyNd0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns} zWiD@WXPfRk8UO$RYfwy7MgRZ*RjU6@ndU&M)l8w;N}S$EqTNQJ-AJI@NuS+Eq1#8F z-ASL_NubNZjrruSj-dL#LS*hPz zsoz_w;9RQUUaR0=tl(g+;bX4hY_sESv*T{G<8Za)bhqVox8-=b<$1Z~db;I%y5@Yl z=6<~9f4%2`z2||x=Y+rKhQR2F!sv~}>5j$ekHzYe#_E*E>y^msm&xm(&h4Sj?V``^ zqtET7(C(+v?y1u6s?+bX*YLI3@weLXyWH};-15HN^S|En!Qb=3-}A)a^vL4$%jEUX z=JwF$_R{F~)9Clu>-X5}_~!EZ=kogJ^ZM-d`|kGq^7#Gq`Th0!{rCI*`1}6({Qmp> z{`~&_{r>;{{{Q~}|NsC0KK9h=0000UbW%=J00RmP8y`GOPGV$eaCC}}q_DQWz{}Ox zXVrIPAMDj8ppm*x3evjjOyT z9e3g3@9znK@3-d*Y~kKdV86lN=3qSV@pEw(ou`G~@6yU2v@h@xH4wiXS^5Fg|2;N< z^&+R#k7^em|Brw-gU?OiKA#sycNye;+(f%F_+0&s_q!$m^wvh}@$3^=!556f6UCf-2`GqL5Mcd_cD( z5Qm5;VPaqD;G0OEAhNP12fP3pB6-##zlr@)7p=08@l)8qzOjqFD`F~4QLTC5C9wZk zLPjaBvp?PhI(KAjoRYc&UIAN|rEHRHjs3L){F;~3Hf7ZI#TND!6?{f_z;$4iDG$(m z!aH=&t9V=I#5TSt`K0C=tH5)mLR=F_mw<;#g{UT!YrsvVLRgbbbw_mF6GPc`Bg1X4;pWc5(l-aIFv97C39% Date: Thu, 19 Mar 2020 14:48:32 +0100 Subject: [PATCH 04/10] set dialog always on top --- openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java b/openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java index b5fc118e..f523fe8a 100644 --- a/openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java +++ b/openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java @@ -12,6 +12,7 @@ public ModalDialog() { public void showAndWait() { pack(); setLocationRelativeTo(null); + setAlwaysOnTop(true); setVisible(true); } From 181727e074b77315959ccb40c69c4e5431b4654f Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Fri, 27 Mar 2020 16:48:45 +0100 Subject: [PATCH 05/10] set version to 3.0.0-alpha1 and ITW to 3.0.0-alpha1 --- ManifestResourceTransformer/pom.xml | 2 +- openwebstart/pom.xml | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ManifestResourceTransformer/pom.xml b/ManifestResourceTransformer/pom.xml index 21b6a2a3..719ad158 100644 --- a/ManifestResourceTransformer/pom.xml +++ b/ManifestResourceTransformer/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 1.2.0-SNAPSHOT + 3.0.0-alpha1 ../ diff --git a/openwebstart/pom.xml b/openwebstart/pom.xml index ada67a0d..07ca5ce3 100755 --- a/openwebstart/pom.xml +++ b/openwebstart/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 1.2.0-SNAPSHOT + 3.0.0-alpha1 ../ @@ -17,7 +17,7 @@ Additional Java Code which is only available in OWS and not in ITW - 2.0.0-SNAPSHOT + 3.0.0-alpha1 diff --git a/pom.xml b/pom.xml index 69538572..b781cda9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.openwebstart openwebstart-parent - 1.2.0-SNAPSHOT + 3.0.0-alpha1 pom OpenWebStart Parent From c850b342551c4524a08a75db7c5543b5a6a54a17 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Fri, 27 Mar 2020 16:58:25 +0100 Subject: [PATCH 06/10] set version to 3.0.0-SNAPSHOT and ITW to 3.0.0-SNAPSHOT --- ManifestResourceTransformer/pom.xml | 2 +- openwebstart/pom.xml | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ManifestResourceTransformer/pom.xml b/ManifestResourceTransformer/pom.xml index 719ad158..acbc7f2a 100644 --- a/ManifestResourceTransformer/pom.xml +++ b/ManifestResourceTransformer/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 3.0.0-alpha1 + 3.0.0-SNAPSHOT ../ diff --git a/openwebstart/pom.xml b/openwebstart/pom.xml index 07ca5ce3..20c30361 100755 --- a/openwebstart/pom.xml +++ b/openwebstart/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 3.0.0-alpha1 + 3.0.0-SNAPSHOT ../ @@ -17,7 +17,7 @@ Additional Java Code which is only available in OWS and not in ITW - 3.0.0-alpha1 + 3.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index b781cda9..7d50fa86 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.openwebstart openwebstart-parent - 3.0.0-alpha1 + 3.0.0-SNAPSHOT pom OpenWebStart Parent From 7ffb1d555cbf138b1ebe5c0ad6cec05e2814592f Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Tue, 31 Mar 2020 13:17:04 +0200 Subject: [PATCH 07/10] touch java version before start of application --- .../main/java/com/openwebstart/launcher/OwsJvmLauncher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java b/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java index c6829ebc..83e80662 100644 --- a/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java +++ b/openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java @@ -134,6 +134,8 @@ private void launchExternal( final String pathToJavaBinary = JavaExecutableFinder.findJavaExecutable(javaRuntime.getJavaHome()); final VersionId version = javaRuntime.getVersion(); + LocalRuntimeManager.touch(javaRuntime); + if (JAVA_1_8.contains(version)) { launchExternal(pathToJavaBinary, webstartJar.getPath(), vmArgs, javawsArgs); } else if (JAVA_9_OR_GREATER.contains(version)) { @@ -142,8 +144,6 @@ private void launchExternal( } else { throw new RuntimeException("Java " + version + " is not supported"); } - - LocalRuntimeManager.touch(javaRuntime); } private List extractVmArgs(final JNLPFile jnlpFile) { From 0ce986166f0753eae2e5f7f29ea668055bee8608 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Sun, 6 Dec 2020 02:16:23 +0100 Subject: [PATCH 08/10] fix maven relative path --- ManifestResourceTransformer/pom.xml | 2 +- documentation/pom.xml | 1 + openwebstart/pom.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ManifestResourceTransformer/pom.xml b/ManifestResourceTransformer/pom.xml index acbc7f2a..f287b558 100644 --- a/ManifestResourceTransformer/pom.xml +++ b/ManifestResourceTransformer/pom.xml @@ -8,7 +8,7 @@ com.openwebstart openwebstart-parent 3.0.0-SNAPSHOT - ../ + ../pom.xml ManifestResourceTransformer diff --git a/documentation/pom.xml b/documentation/pom.xml index f1e39952..22e2c88d 100755 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -8,6 +8,7 @@ com.openwebstart openwebstart-parent 1.4.0-SNAPSHOT + ../pom.xml openwebstart-documentation diff --git a/openwebstart/pom.xml b/openwebstart/pom.xml index 7f0b18cd..fdad4cbe 100755 --- a/openwebstart/pom.xml +++ b/openwebstart/pom.xml @@ -8,7 +8,7 @@ com.openwebstart openwebstart-parent 3.0.0-SNAPSHOT - ../ + ../pom.xml openwebstart From 2169920b8ce5cf5a63dec3707cce67fea3fa5660 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Fri, 11 Dec 2020 09:18:08 +0100 Subject: [PATCH 09/10] set version to 3.0.0-alpha2 and ITW to 3.0.0-alpha2 --- ManifestResourceTransformer/pom.xml | 2 +- documentation/pom.xml | 2 +- openwebstart/pom.xml | 4 ++-- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ManifestResourceTransformer/pom.xml b/ManifestResourceTransformer/pom.xml index f287b558..356b1ba8 100644 --- a/ManifestResourceTransformer/pom.xml +++ b/ManifestResourceTransformer/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 3.0.0-SNAPSHOT + 3.0.0-alpha2 ../pom.xml diff --git a/documentation/pom.xml b/documentation/pom.xml index 22e2c88d..c880363f 100755 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 1.4.0-SNAPSHOT + 3.0.0-alpha2 ../pom.xml diff --git a/openwebstart/pom.xml b/openwebstart/pom.xml index fdad4cbe..89b51f98 100755 --- a/openwebstart/pom.xml +++ b/openwebstart/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 3.0.0-SNAPSHOT + 3.0.0-alpha2 ../pom.xml @@ -17,7 +17,7 @@ Additional Java Code which is only available in OWS and not in ITW - 3.0.0-SNAPSHOT + 3.0.0-alpha2 diff --git a/pom.xml b/pom.xml index a69f7a88..7e97fc0b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.openwebstart openwebstart-parent - 3.0.0-SNAPSHOT + 3.0.0-alpha2 pom OpenWebStart Parent From d3957283469c23eb6d7bd3b9173d8f136dcb7712 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Fri, 11 Dec 2020 09:20:02 +0100 Subject: [PATCH 10/10] set version to 3.0.0-SNAPSHOT and ITW to 3.0.0-SNAPSHOT --- ManifestResourceTransformer/pom.xml | 2 +- documentation/pom.xml | 2 +- openwebstart/pom.xml | 4 ++-- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ManifestResourceTransformer/pom.xml b/ManifestResourceTransformer/pom.xml index 356b1ba8..f287b558 100644 --- a/ManifestResourceTransformer/pom.xml +++ b/ManifestResourceTransformer/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 3.0.0-alpha2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/documentation/pom.xml b/documentation/pom.xml index c880363f..6dbc0a9c 100755 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 3.0.0-alpha2 + 3.0.0-SNAPSHOT ../pom.xml diff --git a/openwebstart/pom.xml b/openwebstart/pom.xml index 89b51f98..fdad4cbe 100755 --- a/openwebstart/pom.xml +++ b/openwebstart/pom.xml @@ -7,7 +7,7 @@ com.openwebstart openwebstart-parent - 3.0.0-alpha2 + 3.0.0-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ Additional Java Code which is only available in OWS and not in ITW - 3.0.0-alpha2 + 3.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7e97fc0b..a69f7a88 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.openwebstart openwebstart-parent - 3.0.0-alpha2 + 3.0.0-SNAPSHOT pom OpenWebStart Parent