/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Oct 14 13:47:07 UTC 2016
changeset e2b90cd3896f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e2b90cd3896f
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 14 14:10:48 2016 +0200
JVM recognition enhanced to find jdk9 and warn if jdk7 or older is found. RT jar checked only for jdk8 and lower
changeset dcf563eb8da6 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=dcf563eb8da6
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 14 15:24:18 2016 +0200
Enforced JDK8 or better for runtime and compile
* Makefile.am: IT_LANGUAGE_SOURCE_VERSION, IT_CLASS_TARGET_VERSION) bumped to 8
* acinclude.m4: (IT_CHECK_JAVA_VERSION) modified to accept jdk9. Simplified. (IT_CHECK_FOR_JDK) changed directories to search for JDK, notably adding alternatives-defined JDK9 locations.
* plugin/icedteanp/IcedTeaNPPlugin.cc: added records for version=8
* netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java: jvm recognition made java9 aware
* netx/net/sourceforge/jnlp/resources/Messages.properties: added corresponding messages
changeset 806cd2465db5 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=806cd2465db5
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 14 15:51:34 2016 +0200
Updated news for jdk8 and rememberable dialogues editor
diffstat:
ChangeLog | 15 ++
Makefile.am | 4 +-
NEWS | 3 +
acinclude.m4 | 24 ++--
netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java | 90 ++++++++++++----
netx/net/sourceforge/jnlp/resources/Messages.properties | 6 +
plugin/icedteanp/IcedTeaNPPlugin.cc | 2 +
7 files changed, 106 insertions(+), 38 deletions(-)
diffs (380 lines):
diff -r a566ba109c79 -r 806cd2465db5 ChangeLog
--- a/ChangeLog Thu Oct 13 16:36:55 2016 +0200
+++ b/ChangeLog Fri Oct 14 15:51:34 2016 +0200
@@ -1,3 +1,18 @@
+2016-10-14 Jiri Vanek <jvanek at redhat.com>
+
+ * NEWS: mentioned rememberable dialogues editor and jdk8
+
+2016-10-14 Jiri Vanek <jvanek at redhat.com>
+
+ Enforced JDK8 or better for runtime and compile
+ * Makefile.am: IT_LANGUAGE_SOURCE_VERSION, IT_CLASS_TARGET_VERSION) bumped to 8
+ * acinclude.m4: (IT_CHECK_JAVA_VERSION) modified to accept jdk9. Simplified.
+ (IT_CHECK_FOR_JDK) changed directories to search for JDK, notably adding
+ alternatives-defined JDK9 locations.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: added records for version=1.8
+ * netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java: jvm recognition made java9 aware
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: added corresponding messages
+
2016-10-13 Jiri Vanek <jvanek at redhat.com>
Finished implementation of editor of state of remembered dialogues
diff -r a566ba109c79 -r 806cd2465db5 Makefile.am
--- a/Makefile.am Thu Oct 13 16:36:55 2016 +0200
+++ b/Makefile.am Fri Oct 14 15:51:34 2016 +0200
@@ -125,8 +125,8 @@
# Flags
export IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
export IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
-export IT_LANGUAGE_SOURCE_VERSION=7
-export IT_CLASS_TARGET_VERSION=7
+export IT_LANGUAGE_SOURCE_VERSION=8
+export IT_CLASS_TARGET_VERSION=8
export IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
#
diff -r a566ba109c79 -r 806cd2465db5 NEWS
--- a/NEWS Thu Oct 13 16:36:55 2016 +0200
+++ b/NEWS Fri Oct 14 15:51:34 2016 +0200
@@ -9,6 +9,7 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 1.7 (2015-XX-XX):
+* restricted to JDK8 and higher
* all connection restrictions now consider also port
* Enabled Entry-Point attribute check
* permissions sandbox and signed app and unsigned app with permissions all-permissions now run in sandbox instead of not at all.
@@ -37,6 +38,8 @@
- MatchingALACAttributePanel
- UnsignedAppletTrustWarningPanel
- PartiallySignedAppTrustWarningPanel
+* Itw-settings
+ - All rememberable dialogues can have saved value modified
* NetX
- fixed issues with -html shortcuts
- fixed issue with -html receiving garbage in width and height
diff -r a566ba109c79 -r 806cd2465db5 acinclude.m4
--- a/acinclude.m4 Thu Oct 13 16:36:55 2016 +0200
+++ b/acinclude.m4 Fri Oct 14 15:51:34 2016 +0200
@@ -48,9 +48,9 @@
])
if test -z "${SYSTEM_JDK_DIR}"; then
for dir in /etc/alternatives/java_sdk \
- /usr/lib/jvm/java-1.7.0-openjdk \
- /usr/lib/jvm/icedtea7 \
- /usr/lib/jvm/java-7-openjdk \
+ /usr/lib/jvm/java-1.9.0-openjdk \
+ /usr/lib/jvm/icedtea9 \
+ /usr/lib/jvm/java-9-openjdk \
/usr/lib/jvm/java-1.8.0-openjdk \
/usr/lib/jvm/icedtea8 \
/usr/lib/jvm/java-8-openjdk \
@@ -98,7 +98,7 @@
# still not found?
if test -z "${SYSTEM_JRE_DIR}" ; then
# try modular, jdk9 or higher compliant
- if test -d "${SYSTEM_JRE_DIR_MODULAR}" -a -f "${SYSTEM_JRE_DIR_MODULAR}/bin/java" -a -d "${SYSTEM_JRE_DIR_MODULAR}/lib/modules" ; then
+ if test -d "${SYSTEM_JRE_DIR_MODULAR}" -a -f "${SYSTEM_JRE_DIR_MODULAR}/bin/java" -a -e "${SYSTEM_JRE_DIR_MODULAR}/lib/modules" ; then
SYSTEM_JRE_DIR="${SYSTEM_JRE_DIR_MODULAR}"
fi
fi
@@ -775,7 +775,7 @@
AC_REQUIRE([IT_CHECK_FOR_JRE])
AC_MSG_CHECKING([for a Java virtual machine])
AC_ARG_WITH([java],
- [AS_HELP_STRING(--with-java, specify location of the Java 1.7 VM)],
+ [AS_HELP_STRING(--with-java, specify location of the Java 1.8 or better VM)],
[
JAVA="${withval}"
],
@@ -789,7 +789,7 @@
AC_PATH_PROG(JAVA, "java")
fi
if test -z "${JAVA}"; then
- AC_MSG_ERROR("A 1.7+-compatible Java VM is required.")
+ AC_MSG_ERROR("A 1.8+-compatible Java VM is required.")
fi
AC_MSG_RESULT(${JAVA})
AC_SUBST(JAVA)
@@ -799,13 +799,12 @@
[
AC_REQUIRE([IT_FIND_JAVA])
AC_MSG_CHECKING([JDK version])
- JAVA_VERSION=`$JAVA -version 2>&1 | sed -n '1s/@<:@^"@:>@*"\(.*\)"$/\1/p'`
+ JAVA_VERSION=`$JAVA -version 2>&1`
AC_MSG_RESULT($JAVA_VERSION)
- HAVE_JAVA7=`echo $JAVA_VERSION | awk '{if ($(0) >= 1.7) print "yes"}'`
- HAVE_JAVA8=`echo $JAVA_VERSION | awk '{if ($(0) >= 1.8) print "yes"}'`
- HAVE_JAVA9=`echo $JAVA_VERSION | awk '{if ($(0) >= 1.9) print "yes"}'`
- if test -z "$HAVE_JAVA7"; then
- AC_MSG_ERROR([JDK7 or newer is required, detected was: $JAVA_VERSION])
+ HAVE_JAVA8=`if echo $JAVA_VERSION | grep -q -e 1.8.0 ; then echo yes ; fi`
+ HAVE_JAVA9=`if echo $JAVA_VERSION | grep -q -e 1.9.0 -e \"9 -e "build 9" ; then echo yes ; fi `
+ if test -z "$HAVE_JAVA8" -a -z "$HAVE_JAVA9"; then
+ AC_MSG_ERROR([JDK8 or newer is required, detected was: $JAVA_VERSION])
fi
if ! test -z "$HAVE_JAVA8"; then
VERSION_DEFS="-DHAVE_JAVA8"
@@ -814,7 +813,6 @@
VERSION_DEFS="-DHAVE_JAVA9"
fi
AC_SUBST(VERSION_DEFS)
- AM_CONDITIONAL([HAVE_JAVA7], test x"${HAVE_JAVA7}" = "xyes")
AM_CONDITIONAL([HAVE_JAVA8], test x"${HAVE_JAVA8}" = "xyes")
AM_CONDITIONAL([HAVE_JAVA9], test x"${HAVE_JAVA9}" = "xyes")
])
diff -r a566ba109c79 -r 806cd2465db5 netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java Thu Oct 13 16:36:55 2016 +0200
+++ b/netx/net/sourceforge/jnlp/controlpanel/JVMPanel.java Fri Oct 14 15:51:34 2016 +0200
@@ -33,7 +33,7 @@
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.
-*/
+ */
package net.sourceforge.jnlp.controlpanel;
import java.awt.Component;
@@ -69,10 +69,12 @@
}
public final String formattedText;
public final STATE id;
+ private final String stds;
- public JvmValidationResult(String formattedText, STATE id) {
+ public JvmValidationResult(String formattedText, STATE id, String stdouts) {
this.id = id;
this.formattedText = formattedText;
+ this.stds = stdouts;
}
}
private final DeploymentConfiguration config;
@@ -85,10 +87,10 @@
addComponents();
}
-
- void resetTestFieldArgumentsExec(){
+ void resetTestFieldArgumentsExec() {
testFieldArgumentsExec.setText("");
}
+
private void addComponents() {
final JLabel description = new JLabel("<html>" + Translator.R("CPJVMPluginArguments") + "<hr /></html>");
final JTextField testFieldArguments = new JTextField(25);
@@ -96,15 +98,16 @@
testFieldArguments.getDocument().addDocumentListener(new DocumentAdapter(config, DeploymentConfiguration.KEY_PLUGIN_JVM_ARGUMENTS));
testFieldArguments.setText(config.getProperty(DeploymentConfiguration.KEY_PLUGIN_JVM_ARGUMENTS));
-
final JLabel descriptionExec = new JLabel("<html>" + Translator.R("CPJVMitwExec") + "<hr /></html>");
testFieldArgumentsExec = new JTextField(100);
final JLabel validationResult = new JLabel(resetValidationResult(testFieldArgumentsExec.getText(), "", "CPJVMnone"));
+ validationResult.setToolTipText("");
final JCheckBox allowTypoTimeValidation = new JCheckBox(Translator.R("CPJVMPluginAllowTTValidation"), true);
allowTypoTimeValidation.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
validationResult.setText(resetValidationResult(testFieldArgumentsExec.getText(), "", "CPJVMnone"));
+ validationResult.setToolTipText("");
}
});
testFieldArgumentsExec.getDocument().addDocumentListener(new DocumentListener() {
@@ -114,6 +117,7 @@
if (allowTypoTimeValidation.isSelected()) {
JvmValidationResult s = validateJvm(testFieldArgumentsExec.getText());
validationResult.setText(resetValidationResult(testFieldArgumentsExec.getText(), s.formattedText, "CPJVMvalidated"));
+ validationResult.setToolTipText(s.stds);
}
}
@@ -122,6 +126,7 @@
if (allowTypoTimeValidation.isSelected()) {
JvmValidationResult s = validateJvm(testFieldArgumentsExec.getText());
validationResult.setText(resetValidationResult(testFieldArgumentsExec.getText(), s.formattedText, "CPJVMvalidated"));
+ validationResult.setToolTipText(s.stds);
}
}
@@ -130,6 +135,7 @@
if (allowTypoTimeValidation.isSelected()) {
JvmValidationResult s = validateJvm(testFieldArgumentsExec.getText());
validationResult.setText(resetValidationResult(testFieldArgumentsExec.getText(), s.formattedText, "CPJVMvalidated"));
+ validationResult.setToolTipText(s.stds);
}
}
});
@@ -155,6 +161,7 @@
String olds = testFieldArgumentsExec.getText();
if (!nws.equals(olds)) {
validationResult.setText(resetValidationResult(testFieldArgumentsExec.getText(), "", "CPJVMnone"));
+ validationResult.setToolTipText("");
}
testFieldArgumentsExec.setText(nws);
}
@@ -167,6 +174,7 @@
public void actionPerformed(ActionEvent e) {
JvmValidationResult s = validateJvm(testFieldArgumentsExec.getText());
validationResult.setText(resetValidationResult(testFieldArgumentsExec.getText(), s.formattedText, "CPJVMvalidated"));
+ validationResult.setToolTipText(s.stds);
}
});
@@ -215,7 +223,7 @@
public static JvmValidationResult validateJvm(String cmd) {
if (cmd == null || cmd.trim().equals("")) {
return new JvmValidationResult("<span color=\"orange\">" + Translator.R("CPJVMvalueNotSet") + "</span>",
- JvmValidationResult.STATE.EMPTY);
+ JvmValidationResult.STATE.EMPTY, "");
}
String validationResult = "";
File jreDirFile = new File(cmd);
@@ -235,15 +243,6 @@
latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
}
}
- File rtFile = new File(cmd + File.separator + "lib" + File.separator + "rt.jar");
- if (rtFile.isFile()) {
- validationResult += "<span color=\"green\">" + Translator.R("CPJVMrtJar") + "</span><br />";
- } else {
- validationResult += "<span color=\"red\">" + Translator.R("CPJVMnoRtJar") + "</span><br />";
- if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
- latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
- }
- }
ProcessBuilder sb = new ProcessBuilder(javaFile.getAbsolutePath(), "-version");
Process p = null;
String processErrorStream = "";
@@ -268,32 +267,77 @@
if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
}
- return new JvmValidationResult(validationResult, latestOne);
+ return new JvmValidationResult(validationResult, latestOne, "");
}
- if (r.intValue() != 0) {
+
+ String reportableOutputs = processErrorStream + "\n" + processStdOutStream;
+
+ if (r != 0) {
validationResult += "<span color=\"red\">" + Translator.R("CPJVMnoSuccess") + "</span>";
if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
}
- return new JvmValidationResult(validationResult, latestOne);
+ return new JvmValidationResult(validationResult, latestOne, reportableOutputs);
}
+
+ boolean findRT = false;
+
+ if (processErrorStream.contains("\"9") || processStdOutStream.contains("\"9") || processErrorStream.contains("build 9") || processStdOutStream.contains("build 9")) {
+ validationResult += "<span color=\"green\">" + Translator.R("CPJVMjdk9") + "</span><br />";
+ findRT = false;
+ } else if (processErrorStream.contains("1.8.0") || processStdOutStream.contains("1.8.0")) {
+ validationResult += "<span color=\"#00EE00\">" + Translator.R("CPJVMjdk8") + "</span><br />";
+ findRT = true;
+ } else if (processErrorStream.contains("1.7.0") || processStdOutStream.contains("1.7.0")) {
+ validationResult += "<span color=\"#EE0000\">" + Translator.R("CPJVMjdk7") + "</span><br />";
+ if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
+ latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
+ findRT = true;
+
+ }
+ } else if (processErrorStream.contains("1.6.0") || processStdOutStream.contains("1.6.0")) {
+ validationResult += "<span color=\"#EE0000\">" + Translator.R("CPJVMjdk6") + "</span><br />";
+ if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
+ latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
+ findRT = true;
+ }
+ } else {
+ validationResult += "<span color=\"yellow\">" + Translator.R("CPJVMjdk") + "</span><br />";
+ if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
+ latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
+ findRT = false;
+ }
+ }
+
+ if (findRT) {
+ File rtFile = new File(cmd + File.separator + "lib" + File.separator + "rt.jar");
+ if (rtFile.isFile()) {
+ validationResult += "<span color=\"green\">" + Translator.R("CPJVMrtJar") + "</span><br />";
+ } else {
+ validationResult += "<span color=\"red\">" + Translator.R("CPJVMnoRtJar") + "</span><br />";
+ if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
+ latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
+ }
+ }
+ }
+
if (processErrorStream.contains("openjdk") || processStdOutStream.contains("openjdk")) {
validationResult += "<span color=\"#00EE00\">" + Translator.R("CPJVMopenJdkFound") + "</span>";
- return new JvmValidationResult(validationResult, JvmValidationResult.STATE.VALID_JDK);
+ return new JvmValidationResult(validationResult, JvmValidationResult.STATE.VALID_JDK, reportableOutputs);
}
if (processErrorStream.contains("ibm") || processStdOutStream.contains("ibm")) {
validationResult += "<span color=\"green\">" + Translator.R("CPJVMibmFound") + "</span>";
if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
}
- return new JvmValidationResult(validationResult, latestOne);
+ return new JvmValidationResult(validationResult, latestOne, reportableOutputs);
}
if (processErrorStream.contains("gij") || processStdOutStream.contains("gij")) {
validationResult += "<span color=\"orange\">" + Translator.R("CPJVMgijFound") + "</span>";
if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
}
- return new JvmValidationResult(validationResult, latestOne);
+ return new JvmValidationResult(validationResult, latestOne, reportableOutputs);
}
if (processErrorStream.contains("oracle") || processStdOutStream.contains("oracle")
|| processErrorStream.contains("java(tm)") || processStdOutStream.contains("java(tm)")) {
@@ -301,10 +345,10 @@
if (latestOne != JvmValidationResult.STATE.NOT_DIR) {
latestOne = JvmValidationResult.STATE.NOT_VALID_JDK;
}
- return new JvmValidationResult(validationResult, latestOne);
+ return new JvmValidationResult(validationResult, latestOne, reportableOutputs);
}
validationResult += "<span color=\"orange\">" + Translator.R("CPJVMstrangeProcess") + "</span>";
- return new JvmValidationResult(validationResult, JvmValidationResult.STATE.NOT_VALID_JDK);
+ return new JvmValidationResult(validationResult, JvmValidationResult.STATE.NOT_VALID_JDK, reportableOutputs);
}
diff -r a566ba109c79 -r 806cd2465db5 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Oct 13 16:36:55 2016 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Oct 14 15:51:34 2016 +0200
@@ -605,6 +605,12 @@
CPJVMnotLaunched=Error, process was not launched, see console output for more info.
CPJVMnoSuccess=Error, process have not ended successfully, see output for details, but your java is not set correctly.
CPJVMopenJdkFound=Excellent, OpenJDK detected
+CPJVMjdk5=JDK5 recognized. JDK7 and older are longer supported.
+CPJVMjdk6=JDK6 recognized. JDK7 and older are longer supported.
+CPJVMjdk7=JDK7 recognized. JDK7 and older are longer supported.
+CPJVMjdk8=JDK8 recognized. Jdk8 and higher are supported
+CPJVMjdk9=JDK9 recognized. Jdk8 and higher are supported
+CPJVMjdk=Unknown version. Hard to judge support. See tooltip or console/standard output (depends on verbosity)for real version.
CPJVMoracleFound=Great, Oracle java detected
CPJVMibmFound=Good, IBM java detected
CPJVMgijFound=Warning, gij detected
diff -r a566ba109c79 -r 806cd2465db5 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Oct 13 16:36:55 2016 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Oct 14 15:51:34 2016 +0200
@@ -102,6 +102,7 @@
"application/x-java-applet;version=1.5:class,jar:IcedTea;" \
"application/x-java-applet;version=1.6:class,jar:IcedTea;" \
"application/x-java-applet;version=1.7:class,jar:IcedTea;" \
+ "application/x-java-applet;version=1.8:class,jar:IcedTea;" \
PLUGIN_APPLET_MIME_DESC \
"application/x-java-applet;jpi-version=" JPI_VERSION ":class,jar:IcedTea;" \
"application/x-java-bean:class,jar:IcedTea;" \
@@ -120,6 +121,7 @@
"application/x-java-bean;version=1.5:class,jar:IcedTea;" \
"application/x-java-bean;version=1.6:class,jar:IcedTea;" \
"application/x-java-bean;version=1.7:class,jar:IcedTea;" \
+ "application/x-java-bean;version=1.8:class,jar:IcedTea;" \
PLUGIN_BEAN_MIME_DESC \
"application/x-java-bean;jpi-version=" JPI_VERSION ":class,jar:IcedTea;" \
"application/x-java-vm-npruntime::IcedTea;"
More information about the distro-pkg-dev
mailing list