Skip to content

WIP: Classloader prototype #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sclassen wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

WIP: Classloader prototype #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f5c6f8b
update to api changes in ITW
sclassen Mar 17, 2020
eeafd12
added another name variant to AzulResolver
AndreasEhret Mar 18, 2020
c663280
use dialog icons from icedtea-web
AndreasEhret Mar 18, 2020
4e89441
set dialog always on top
AndreasEhret Mar 19, 2020
181727e
set version to 3.0.0-alpha1 and ITW to 3.0.0-alpha1
sclassen Mar 27, 2020
c850b34
set version to 3.0.0-SNAPSHOT and ITW to 3.0.0-SNAPSHOT
sclassen Mar 27, 2020
7ffb1d5
touch java version before start of application
sclassen Mar 31, 2020
6362eb9
Merge branch 'master' into classloader-prototype
sclassen Jun 29, 2020
a58c4d0
Merge branch 'master' into classloader-prototype
sclassen Dec 6, 2020
0ce9861
fix maven relative path
sclassen Dec 6, 2020
2169920
set version to 3.0.0-alpha2 and ITW to 3.0.0-alpha2
sclassen Dec 11, 2020
d395728
set version to 3.0.0-SNAPSHOT and ITW to 3.0.0-SNAPSHOT
sclassen Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ManifestResourceTransformer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<parent>
<groupId>com.openwebstart</groupId>
<artifactId>openwebstart-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../</relativePath>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>ManifestResourceTransformer</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion documentation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<parent>
<groupId>com.openwebstart</groupId>
<artifactId>openwebstart-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>openwebstart-documentation</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions openwebstart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<parent>
<groupId>com.openwebstart</groupId>
<artifactId>openwebstart-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>openwebstart</artifactId>
Expand All @@ -16,7 +17,7 @@
<description>Additional Java Code which is only available in OWS and not in ITW</description>

<properties>
<icedtea-web.version>2.0.0-SNAPSHOT</icedtea-web.version>
<icedtea-web.version>3.0.0-SNAPSHOT</icedtea-web.version>
</properties>

<dependencies>
Expand Down
4 changes: 0 additions & 4 deletions openwebstart/src/main/java/com/openwebstart/jvm/ui/Images.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

}
4 changes: 2 additions & 2 deletions openwebstart/src/main/java/com/openwebstart/launcher/OwsJvmLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -143,7 +143,7 @@ private void launchExternal(
}

private List<String> extractVmArgs(final JNLPFile jnlpFile) {
if (jnlpFile.getSecurity().getApplicationPermissionLevel() == ApplicationPermissionLevel.ALL) {
if (jnlpFile.getSecurity().getApplicationEnvironment() == ApplicationEnvironment.ALL) {
final List<String> result = new ArrayList<>();
final Map<String, String> properties = jnlpFile.getResources().getPropertiesMap();
properties.keySet().forEach(property -> {
Expand Down
5 changes: 2 additions & 3 deletions openwebstart/src/main/java/com/openwebstart/ui/ErrorDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.openwebstart.ui;

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.ImageIcon;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import java.io.PrintWriter;
Expand All @@ -30,7 +29,7 @@ private static JTextArea createStackTraceDetailsComponent(final Exception error)
}

public ErrorDialog(final String message, final Exception error) {
super(Translator.getInstance().translate("dialog.error.title"), new ImageIcon(Images.ERROR_64_URL), message, createStackTraceDetailsComponent(error));
super(Translator.getInstance().translate("dialog.error.title"), ImageGallery.ERROR.asImageIcon(), message, createStackTraceDetailsComponent(error));
}

private static String getStackTrace(final Exception exception) {
Expand Down
1 change: 1 addition & 0 deletions openwebstart/src/main/java/com/openwebstart/ui/ModalDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public void setContentPane(final Container contentPane) {
public void showAndWait() {
pack();
setLocationRelativeTo(null);
setAlwaysOnTop(true);
setVisible(true);
}

Expand Down
3 changes: 2 additions & 1 deletion openwebstart/src/main/java/com/openwebstart/ui/dialogs/SimpleDialogWithResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.openwebstart.jvm.ui.Images;
import com.openwebstart.ui.IconComponent;
import com.openwebstart.util.LayoutFactory;
import net.adoptopenjdk.icedteaweb.image.ImageGallery;

import javax.swing.BorderFactory;
import javax.swing.Box;
Expand All @@ -22,7 +23,7 @@ public class SimpleDialogWithResult<R> extends ButtonBasedDialogWithResult<R> {
private final ImageIcon imageIcon;

public SimpleDialogWithResult(final String title, final String message, final DialogButton<R>... buttons) {
this(title, message, new ImageIcon(Images.QUESTION_64_URL), buttons);
this(title, message, ImageGallery.QUESTION.asImageIcon(), buttons);

}

Expand Down
Binary file removed openwebstart/src/main/resources/com/openwebstart/jvm/ui/error-64.png
View file
Open in desktop
Binary file not shown.
Binary file removed openwebstart/src/main/resources/com/openwebstart/jvm/ui/question-64.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.openwebstart</groupId>
<artifactId>openwebstart-parent</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>OpenWebStart Parent</name>
Expand Down