/hg/release/icedtea-web-1.6: 5 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Jan 15 10:55:21 UTC 2016
changeset e017136a9c45 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=e017136a9c45
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jan 14 10:28:14 2016 +0100
Added reprodcuer for NoClassDeffFoundError behavior
changeset 0d8f8380c811 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=0d8f8380c811
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jan 14 11:05:24 2016 +0100
Vendor desktop entry replaced by X-Vendor
changeset fc1cd3b761d4 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=fc1cd3b761d4
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Jan 15 11:54:22 2016 +0100
Included maven artifacts and appstream metadata
changeset 030e419bfb61 in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=030e419bfb61
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jan 14 12:22:37 2016 +0100
Added GenericName to desktop files, itweb-settings.desktop.in, javaws.desktop.in, policyeditor.desktop.in
changeset 7a3e06b56eba in /hg/release/icedtea-web-1.6
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.6?cmd=changeset;node=7a3e06b56eba
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jan 14 16:28:48 2016 +0100
Adapted to change in package of HexDumpEncoder (1.8 sun.misc.HexDumpEncoder, 1.9 sun.security.util.HexDumpEncoder)
* acinclude.m4: added new macro IT_CHECK_FOR_HEXDUMPENCODER, which tries both locations of HexDumpEncoder
* configure.ac: now uses IT_CHECK_FOR_HEXDUMPENCODER instead of IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder])
* netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: added imports to both import sun.misc.*; and import sun.security.util.*;
diffstat:
ChangeLog | 55 +
Makefile.am | 42 +-
acinclude.m4 | 49 +
configure.ac | 4 +-
itweb-settings.desktop.in | 1 +
javaws.desktop.in | 1 +
metadata.in/icedtea-web-javaws.appdata.xml | 47 +
metadata.in/icedtea-web-plugin.pom | 9 +
metadata.in/icedtea-web.metainfo.xml | 12 +
metadata.in/icedtea-web.pom | 9 +
netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java | 9 +-
netx/net/sourceforge/jnlp/util/XDesktopEntry.java | 2 +-
policyeditor.desktop.in | 1 +
tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in | 47 +
tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in | 56 +
tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in | 60 +
tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in | 48 +
tests/reproducers/custom/NoClassDeff/srcs/Makefile | 33 +
tests/reproducers/custom/NoClassDeff/srcs/NoClassDeff.java | 154 ++
tests/reproducers/custom/NoClassDeff/testcases/NoClassDeffTest.java | 727 ++++++++++
20 files changed, 1358 insertions(+), 8 deletions(-)
diffs (truncated from 1538 to 500 lines):
diff -r 834746c2a271 -r 7a3e06b56eba ChangeLog
--- a/ChangeLog Thu Jan 07 15:33:12 2016 +0100
+++ b/ChangeLog Thu Jan 14 16:28:48 2016 +0100
@@ -1,3 +1,58 @@
+2016-01-14 Jiri Vanek <jvanek at redhat.com>
+ Fridrich Strba <fridrich.strba at suse.com>
+
+ Adapted to change in package of HexDumpEncoder (1.8 sun.misc.HexDumpEncoder,
+ 1.9 sun.security.util.HexDumpEncoder)
+ * acinclude.m4: added new macro IT_CHECK_FOR_HEXDUMPENCODER, which tries both
+ locations of HexDumpEncoder
+ * configure.ac: now uses IT_CHECK_FOR_HEXDUMPENCODER instead of
+ IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder])
+ * netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java: added imports
+ to both import sun.misc.*; and import sun.security.util.*;
+
+2016-01-14 Jiri Vanek <jvanek at redhat.com>
+
+ Added GenericName to desktop files
+ * itweb-settings.desktop.in:
+ * javaws.desktop.in:
+ * policyeditor.desktop.in:
+
+2016-01-14 Jiri Vanek <jvanek at redhat.com>
+
+ Included maven artifacts and appstream metadata
+ * .Makefile: (clean-local) and (.PHONY) now depends on clean-metadata.
+ ($(abs_top_builddir)/metadata) new target, copy metadata-in to metadata and
+ replace name, vendor and version check-meatdata, new stand alone target, checks
+ correctness of poms and xmls in metadata folder. (stamps/netx-dist.stamp) now
+ depends on $(abs_top_builddir)/metadata. clean-metadata, new target, removes
+ built metadata folder
+ * metadata.in/icedtea-web-javaws.appdata.xml: appstream metadata for javaws
+ * metadata.in/icedtea-web.metainfo.xml: appstream metadata for plugin
+ * metadata.in/icedtea-web-plugin.pom: pom for plugin.jar
+ * metadata.in/icedtea-web.pom: pom for netx jar
+
+2016-01-14 Jiri Vanek <jvanek at redhat.com>
+
+ Vendor desktop entry replaced by X-Vendor
+ * ChangeLog: fixed date
+ * netx/net/sourceforge/jnlp/util/XDesktopEntry.java: if vendor is present in jnlp
+ instead of Vendor X-Vendor entry is generated to desktop file
+
+2016-01-14 Jiri Vanek <jvanek at redhat.com>
+
+ Added reprodcuer for NoClassDeffFoundError behavior
+ * tests/reproducers/custom/NoClassDeff/srcs/NoClassDeff.java: small app including
+ inner class, which is missing in deployed jar. Then calling this class on demand
+ * tests/reproducers/custom/NoClassDeff/srcs/.Makefile: responsible for removing
+ the compiled inner class before jarring
+ * tests/reproducers/custom/NoClassDeff/testcases/NoClassDeffTest.java:
+ testing behavior when ClassNotFound/NoClassDefFound is thrown in various stages
+ * tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in:
+ * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in:
+ * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in:
+ * tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in:
+ templates to launch app with instruction when to call LostClass and how to deal with it
+
2016-01-07 David Cantrell <david.l.cantrell at gmail.com>
Jiri Vanek <jvanek at redhat.com>
Andrew John Hughes <ahughes at redhat.com>
diff -r 834746c2a271 -r 7a3e06b56eba Makefile.am
--- a/Makefile.am Thu Jan 07 15:33:12 2016 +0100
+++ b/Makefile.am Thu Jan 14 16:28:48 2016 +0100
@@ -220,7 +220,7 @@
export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in policyeditor.desktop.in icedteaweb-completion \
- itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS
+ itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS $(top_srcdir)/metadata.in
# reproducers `D`shortcuts
export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
@@ -263,7 +263,7 @@
check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
clean-local: clean-netx clean-plugin clean-liveconnect \
- clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-tests clean-bootstrap-directory
+ clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-metadata clean-tests clean-bootstrap-directory
if [ -e stamps ] ; then \
rmdir stamps ; \
fi
@@ -271,7 +271,7 @@
.PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs \
clean-tests check-local clean-launchers stamps/check-pac-functions.stamp stamps/run-netx-unit-tests.stamp clean-netx-tests \
- clean-junit-runner clean-netx-unit-tests
+ clean-junit-runner clean-netx-unit-tests clean-metadata
install-exec-local:
${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR)
@@ -508,6 +508,37 @@
sed -i '/RhinoBasedPacEvaluator/ d' $@
endif
+$(abs_top_builddir)/metadata: $(top_srcdir)/metadata.in
+ mkdir -p $(abs_top_builddir)/metadata-work ; \
+ METAFILES=`ls $(top_srcdir)/metadata.in` ; \
+ for F in $$METAFILES ; do \
+ cat $(top_srcdir)/metadata.in/$$F | sed "s;%{name};$(PACKAGE_NAME);g" | sed "s;%{version};$(FULL_VERSION);g" > $(abs_top_builddir)/metadata-work/$$F ; \
+ done ; \
+ mv $(abs_top_builddir)/metadata-work $(abs_top_builddir)/metadata ;
+
+check-metadata: $(abs_top_builddir)/metadata
+ xmllint --noout $(abs_top_builddir)/metadata/* ; \
+ if [ $$? -eq 0 ] ; then \
+ echo "Passed: well formed" ; \
+ else \
+ echo "FAILED: well formed" ; \
+ fi ; \
+ xmllint --noout --schema http://maven.apache.org/xsd/maven-4.0.0.xsd $(abs_top_builddir)/metadata/*.pom ; \
+ if [ $$? -eq 0 ] ; then \
+ echo "Passed: valid poms" ; \
+ else \
+ echo "FAILED: valid poms" ; \
+ fi ; \
+ appstream-util validate $(abs_top_builddir)/metadata/*.appdata.xml $(abs_top_builddir)/metadata/*.metainfo.xml ; \
+ if [ $$? -eq 0 ] ; then \
+ echo "Passed: valid software descriptors" ; \
+ else \
+ echo "FAILED: valid software descriptors" ; \
+ fi ;
+# very strange results:
+# appstreamcli validate $(abs_top_builddir)/metadata/*.appdata.xml $(abs_top_builddir)/metadata/*.metainfo.xml
+
+
stamps/generate-docs.stamp: stamps/netx.stamp
mkdir -p "$(DOCS_DIR)" ; \
HTML_DOCS_TARGET_DIR="$(DOCS_DIR)/html" ; \
@@ -575,7 +606,7 @@
mkdir -p stamps
touch $@
-stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp
+stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp $(abs_top_builddir)/metadata
(cd $(NETX_DIR) ; \
mkdir -p lib ; \
$(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \
@@ -691,6 +722,9 @@
rm -f stamps/generate-docs.stamp
+clean-metadata:
+ rm -rf $(abs_top_builddir)/metadata
+
# check
# ==========================
diff -r 834746c2a271 -r 7a3e06b56eba acinclude.m4
--- a/acinclude.m4 Thu Jan 07 15:33:12 2016 +0100
+++ b/acinclude.m4 Thu Jan 14 16:28:48 2016 +0100
@@ -500,6 +500,55 @@
AC_PROVIDE([$0])dnl
])
+dnl Macro to check for a Java class HexDumpEncoder
+AC_DEFUN([IT_CHECK_FOR_HEXDUMPENCODER],[
+AC_REQUIRE([IT_FIND_JAVAC])
+AC_REQUIRE([IT_FIND_JAVA])
+AC_CACHE_CHECK([if HexDumpEncoder is available], it_cv_HEXDUMPENCODER, [
+CLASS=sun/applet/Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir -p tmp.$$/$(dirname $CLASS)
+cd tmp.$$
+cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+package sun.applet;
+
+import sun.misc.*;
+import sun.security.util.*;
+
+public class Test
+{
+ public static void main(String[] args)
+ throws Exception
+ {
+ try {
+ System.out.println(Class.forName("sun.misc.HexDumpEncoder"));
+ } catch (ClassNotFoundException e) {
+ System.out.println(Class.forName("sun.security.util.HexDumpEncoder"));
+ }
+ }
+}
+]
+EOF
+if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_HEXDUMPENCODER=yes;
+ else
+ it_cv_HEXDUMPENCODER=no;
+ fi
+else
+ it_cv_HEXDUMPENCODER=no;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+# should be rmdir but has to be rm -rf due to sun.applet usage
+rm -rf tmp.$$
+if test x"${it_cv_HEXDUMPENCODER}" = "xno"; then
+ AC_MSG_ERROR([HexDumpEncoder not found.])
+fi
+])
+
AC_DEFUN_ONCE([IT_CHECK_FOR_MERCURIAL],
[
AC_PATH_TOOL([HG],[hg])
diff -r 834746c2a271 -r 7a3e06b56eba configure.ac
--- a/configure.ac Thu Jan 07 15:33:12 2016 +0100
+++ b/configure.ac Thu Jan 14 16:28:48 2016 +0100
@@ -68,7 +68,7 @@
dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
dnl IT563 - NetX uses sun.security code
-dnl IT605 - NetX depends on sun.misc.HexDumpEncoder
+dnl IT605 - NetX depends on sun.misc HexDumpEncoder or sun.security.util.HexDumpEncoder
dnl IT570 - NetX depends on sun.applet.AppletViewPanel
dnl IT571 - NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java
dnl IT573 - Plugin depends on sun.awt,X11.XEmbeddedFrame.java
@@ -83,7 +83,7 @@
IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_SECURITYCONSTANTS, [sun.security.util.SecurityConstants])
IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker])
IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name])
-IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder])
+IT_CHECK_FOR_HEXDUMPENCODER
IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException])
IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER,
[com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager])
diff -r 834746c2a271 -r 7a3e06b56eba itweb-settings.desktop.in
--- a/itweb-settings.desktop.in Thu Jan 07 15:33:12 2016 +0100
+++ b/itweb-settings.desktop.in Thu Jan 14 16:28:48 2016 +0100
@@ -3,6 +3,7 @@
Name[de]=IcedTea-Web Systemsteuerung
Name[pl]=Panel sterowania IcedTea-Web
Name[cs]=Ovládacà panel IcedTea-Web
+GenericName=Control Panel
Comment=Configure IcedTea-Web (javaws and plugin)
Comment[de]=Konfiguriert IcedTea-Web (javaws und Plug-in)
Comment[pl]=Konfiguruj IcedTea-Web (javaws i wtyczkÄ™)
diff -r 834746c2a271 -r 7a3e06b56eba javaws.desktop.in
--- a/javaws.desktop.in Thu Jan 07 15:33:12 2016 +0100
+++ b/javaws.desktop.in Thu Jan 14 16:28:48 2016 +0100
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=IcedTea Web Start
+GenericName=Java Web Start
Comment=IcedTea Application Launcher
Exec=PATH_TO_JAVAWS %f
Icon=javaws
diff -r 834746c2a271 -r 7a3e06b56eba metadata.in/icedtea-web-javaws.appdata.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/metadata.in/icedtea-web-javaws.appdata.xml Thu Jan 14 16:28:48 2016 +0100
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+<!-- <component> -->
+ <id>javaws.desktop</id>
+ <name>%{name}</name>
+ <name>Java</name>
+ <summary>Javaws implementation from OpenJDK</summary>
+<!-- <provides>
+​ <library>netx.jar</library>
+​ <library>plugin.jar</library>
+​ <binary>javaws</binary>
+​ <binary>itweb-settings</binary>
+​ <binary>policyeditor</binary>
+​ </provides>
+-->
+ <description>
+<p>
+Free java implementation of jnlp launching protocol.
+</p><p>
+Originally based on NetX,but now bringing many improvements compared to proprietary implementations.
+</p><p>
+Powerful debug console, internal appletviewer, safe run-in-sandbox option, extendable "remember me" options and custom policy editor.
+</p><p>
+It have also possibility to turn all security off and just enjoy legacy web (on your own risk). All via simple itweb-settings gui.
+</p>
+ </description>
+ <url type="homepage">http://icedtea.classpath.org/wiki/IcedTea-Web</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <updatecontact>distro-pkg-dev at openjdk.java.net</updatecontact>
+ <mimetypes>
+​ <mimetype>text/jnlp</mimetype>
+ </mimetypes>
+ <screenshots>
+ <screenshot type="default">
+ <image>http://icedtea.classpath.org/wiki/images/Javaws_splash.png</image>
+ <caption>Itw self describing splash screen</caption>
+ </screenshot>
+ <screenshot>
+ <image>http://icedtea.classpath.org/wiki/images/Fullysigned.png</image>
+ <caption>Run in sandbox dialog</caption>
+ </screenshot>
+ <screenshot>
+ <image>http://icedtea.classpath.org/wiki/images/Policyeditor-in-use.png</image>
+ <caption>Simplified view of policy editor</caption>
+ </screenshot>
+ </screenshots>
+</component>
diff -r 834746c2a271 -r 7a3e06b56eba metadata.in/icedtea-web-plugin.pom
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/metadata.in/icedtea-web-plugin.pom Thu Jan 14 16:28:48 2016 +0100
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>sun.applet</groupId>
+ <artifactId>%{name}-plugin</artifactId>
+ <version>%{version}</version>
+</project>
diff -r 834746c2a271 -r 7a3e06b56eba metadata.in/icedtea-web.metainfo.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/metadata.in/icedtea-web.metainfo.xml Thu Jan 14 16:28:48 2016 +0100
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="addon">
+ <id>%{name}</id>
+ <extends>epiphany.desktop</extends>
+ <extends>firefox.desktop</extends>
+ <extends>midori.desktop</extends>
+ <name>Java</name>
+ <summary>Browser plug-in implementation from OpenJDK. This plugin is running java applets</summary>
+ <url type="homepage">http://icedtea.classpath.org/wiki/IcedTea-Web</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <updatecontact>distro-pkg-dev at openjdk.java.net</updatecontact>
+</component>
diff -r 834746c2a271 -r 7a3e06b56eba metadata.in/icedtea-web.pom
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/metadata.in/icedtea-web.pom Thu Jan 14 16:28:48 2016 +0100
@@ -0,0 +1,9 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sourceforge.jnlp</groupId>
+ <artifactId>%{name}</artifactId>
+ <version>%{version}</version>
+</project>
diff -r 834746c2a271 -r 7a3e06b56eba netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Thu Jan 07 15:33:12 2016 +0100
+++ b/netx/net/sourceforge/jnlp/security/dialogs/CertsInfoPane.java Thu Jan 14 16:28:48 2016 +0100
@@ -43,8 +43,15 @@
import java.security.cert.CertPath;
import java.security.cert.X509Certificate;
import java.security.MessageDigest;
+/**
+ * Do not remove this two unused imports, nor expands its "*" call.
+ * It is workaround to allow itw to run on jdk8 and older and also on jdk9 and newer
+ */
-import sun.misc.HexDumpEncoder;
+// jdk8 is using sun.misc.HexDumpEncoder,
+import sun.misc.*;
+// jdk9 is using sun.security.util.HexDumpEncoder
+import sun.security.util.*;
import sun.security.x509.*;
import javax.swing.*;
import javax.swing.event.*;
diff -r 834746c2a271 -r 7a3e06b56eba netx/net/sourceforge/jnlp/util/XDesktopEntry.java
--- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 07 15:33:12 2016 +0100
+++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 14 16:28:48 2016 +0100
@@ -148,7 +148,7 @@
}
if (file.getInformation().getVendor() != null) {
- fileContents += "Vendor=" + sanitize(file.getInformation().getVendor()) + "\n";
+ fileContents += "X-Vendor=" + sanitize(file.getInformation().getVendor()) + "\n";
}
if (JNLPRuntime.isWebstartApplication()) {
diff -r 834746c2a271 -r 7a3e06b56eba policyeditor.desktop.in
--- a/policyeditor.desktop.in Thu Jan 07 15:33:12 2016 +0100
+++ b/policyeditor.desktop.in Thu Jan 14 16:28:48 2016 +0100
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=IcedTea-Web Policy Editor
+GenericName=Policy Tool
Comment=Edit Java Applet policy and permission settings
Exec=PATH_TO_POLICYEDITOR
Icon=javaws
diff -r 834746c2a271 -r 7a3e06b56eba tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeff.html.in Thu Jan 14 16:28:48 2016 +0100
@@ -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="NoClassDeff.class" archive="NoClassDeff.jar" codebase="." width="100" height="100">
+ <param name="die" value="DIE_ON_STAGE">
+ <param name="catchError" value="CATCH_ERROR">
+ </applet>
+</body>
+</html>
diff -r 834746c2a271 -r 7a3e06b56eba tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApp.jnlp.in Thu Jan 14 16:28:48 2016 +0100
@@ -0,0 +1,56 @@
+<!--
+
+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="NoClassDeffApp.jnlp" codebase=".">
+ <information>
+ <title>NoClassDeff</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>PR2219</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="NoClassDeff.jar"/>
+ </resources>
+ <application-desc main-class="NoClassDeff">
+ <argument>DIE_ON_STAGE</argument> <!-- die -->
+ <argument>CATCH_ERROR</argument> <!-- catch -->
+ </application-desc>
+</jnlp>
diff -r 834746c2a271 -r 7a3e06b56eba tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeffApplet.jnlp.in Thu Jan 14 16:28:48 2016 +0100
@@ -0,0 +1,60 @@
More information about the distro-pkg-dev
mailing list