/hg/icedtea-web: 4 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Thu Jan 14 11:23:11 UTC 2016
changeset 2a1cb603f161 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2a1cb603f161
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jan 14 10:28:14 2016 +0100
Added reprodcuer for NoClassDeffFoundError behavior
changeset c888a5209fe4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c888a5209fe4
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jan 14 11:05:24 2016 +0100
Vendor desktop entry replaced by X-Vendor
changeset bd6b07becb0b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bd6b07becb0b
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jan 14 11:32:40 2016 +0100
Included maven artifacts and appstream metadata
changeset 39239a9c6224 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=39239a9c6224
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
diffstat:
ChangeLog | 43 +
Makefile.am | 42 +-
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/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 ++++++++++
17 files changed, 1287 insertions(+), 5 deletions(-)
diffs (truncated from 1426 to 500 lines):
diff -r ea6a2a888131 -r 39239a9c6224 ChangeLog
--- a/ChangeLog Thu Jan 07 16:59:45 2016 +0100
+++ b/ChangeLog Thu Jan 14 12:22:37 2016 +0100
@@ -1,3 +1,46 @@
+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 ea6a2a888131 -r 39239a9c6224 Makefile.am
--- a/Makefile.am Thu Jan 07 16:59:45 2016 +0100
+++ b/Makefile.am Thu Jan 14 12:22:37 2016 +0100
@@ -221,7 +221,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.in \
- 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)
@@ -264,7 +264,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-icedteaweb-completion clean-tests clean-bootstrap-directory
+ clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-metadata clean-icedteaweb-completion clean-tests clean-bootstrap-directory
if [ -e stamps ] ; then \
rmdir stamps ; \
fi
@@ -272,7 +272,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-icedteaweb-completion\
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) $(BASH_CMPL_DEST_DIR)
@@ -511,6 +511,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
+
+
$(abs_top_builddir)/icedteaweb-completion: $(abs_top_srcdir)/icedteaweb-completion.in
OPTIONS_COMMAND="$(SYSTEM_JRE_DIR)/bin/java -cp $(NETX_DIR) net.sourceforge.jnlp.OptionsDefinitions" ; \
JAVAWS=`$$OPTIONS_COMMAND javaws` ; \
@@ -590,7 +621,7 @@
mkdir -p stamps
touch $@
-stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp $(abs_top_builddir)/icedteaweb-completion
+stamps/netx-dist.stamp: stamps/netx.stamp $(abs_top_builddir)/netx.manifest stamps/generate-docs.stamp $(abs_top_builddir)/icedteaweb-completion $(abs_top_builddir)/metadata
(cd $(NETX_DIR) ; \
mkdir -p lib ; \
$(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \
@@ -708,6 +739,9 @@
clean-icedteaweb-completion:
rm -f $(abs_top_builddir)/icedteaweb-completion
+clean-metadata:
+ rm -rf $(abs_top_builddir)/metadata
+
# check
# ==========================
diff -r ea6a2a888131 -r 39239a9c6224 itweb-settings.desktop.in
--- a/itweb-settings.desktop.in Thu Jan 07 16:59:45 2016 +0100
+++ b/itweb-settings.desktop.in Thu Jan 14 12:22:37 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 ea6a2a888131 -r 39239a9c6224 javaws.desktop.in
--- a/javaws.desktop.in Thu Jan 07 16:59:45 2016 +0100
+++ b/javaws.desktop.in Thu Jan 14 12:22:37 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 ea6a2a888131 -r 39239a9c6224 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 12:22:37 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 ea6a2a888131 -r 39239a9c6224 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 12:22:37 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 ea6a2a888131 -r 39239a9c6224 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 12:22:37 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 ea6a2a888131 -r 39239a9c6224 metadata.in/icedtea-web.pom
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/metadata.in/icedtea-web.pom Thu Jan 14 12:22:37 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 ea6a2a888131 -r 39239a9c6224 netx/net/sourceforge/jnlp/util/XDesktopEntry.java
--- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 07 16:59:45 2016 +0100
+++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Thu Jan 14 12:22:37 2016 +0100
@@ -147,7 +147,7 @@
}
if (file.getInformation().getVendor() != null) {
- fileContents += "Vendor=" + sanitize(file.getInformation().getVendor()) + "\n";
+ fileContents += "X-Vendor=" + sanitize(file.getInformation().getVendor()) + "\n";
}
String exec;
String title = "xdesktop writing";
diff -r ea6a2a888131 -r 39239a9c6224 policyeditor.desktop.in
--- a/policyeditor.desktop.in Thu Jan 07 16:59:45 2016 +0100
+++ b/policyeditor.desktop.in Thu Jan 14 12:22:37 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 ea6a2a888131 -r 39239a9c6224 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 12:22:37 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 ea6a2a888131 -r 39239a9c6224 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 12:22:37 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 ea6a2a888131 -r 39239a9c6224 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 12:22:37 2016 +0100
@@ -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="NoClassDeffApplet.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>
+ <applet-desc
+ name="NoClassDeff"
+ main-class="NoClassDeff"
+ width="100"
+ height="100">
+ <param name="die" value="DIE_ON_STAGE">
+ <param name="catchError" value="CATCH_ERROR">
+ </applet-desc>
+</jnlp>
diff -r ea6a2a888131 -r 39239a9c6224 tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/custom/NoClassDeff/resources/NoClassDeffJnlpHref.html.in Thu Jan 14 12:22:37 2016 +0100
@@ -0,0 +1,48 @@
+<!--
+
+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 width="100" height="100" code="NoClassDeff">
+ <param name="jnlp_href" value="NoClassDeffApplet.jnlp">
+ <param name="die" value="DIE_ON_STAGE">
+ <param name="catchError" value="CATCH_ERROR">
+ </applet>
+</body>
+</html>
More information about the distro-pkg-dev
mailing list