.hgignore

+Makefile\.in
+aclocal\.m4
+autom4te\.cache
+build
+configure
+install-sh
+missing
+config\.guess
+config\.sub
+netx/net/sourceforge/jnlp/resources/AUTHORS\.html
+netx/net/sourceforge/jnlp/resources/COPYING\.html
+netx/net/sourceforge/jnlp/resources/ChangeLog\.html
+netx/net/sourceforge/jnlp/resources/NEWS\.html
+netx-dist-tests-whitelist
+rust-launcher/target
+rust-launcher/Cargo.lock
+rust-launcher/.idea

.settings/org.eclipse.jdt.ui.prefs

+#Fri Dec 03 14:29:50 EST 2010
+eclipse.preferences.version=1
+formatter_profile=_IcedTea Web
+formatter_settings_version=11

LICENSE

+***************************************
+** LGPLv2+ and GPLv2 with exceptions **
+***************************************
+
+
+Details:
+All newest files, unless claiming differently and all files inherited from  GNU Classpath (mostly base of plugin) are GPL+Exceptions
+NetX code is GPL and LGPL only.

Makefile.am

 if WINDOWS
     export CLASSPATH_SEPARATOR = ;
+    export ICON = javaws.ico
 else
     export CLASSPATH_SEPARATOR = :
+    export ICON = javaws.png
 endif
 
 # Functions to compose path/classpath
@@ -52,8 +54,9 @@ else
 	DESKTOP_SUFFIX=.sh
 endif
 
-# javaws is program name, JAVAWS is used executable name.
-# ITW 1.7 always do javaws and javaws.sh
+# javaws is program name, JAVAWS is used executable name. in 99.9% those are equals.
+# in unsupported case (no rust, and enforced shell launchers), it will become javaws.sh.
+# similar case is for other two binaries. 
 JAVAWS=$(javaws)$(DESKTOP_SUFFIX)
 ITWEB_SETTINGS=$(itweb_settings)$(DESKTOP_SUFFIX)
 POLICYEDITOR=$(policyeditor)$(DESKTOP_SUFFIX)
@@ -172,7 +175,7 @@ if ENABLE_PLUGINJAR
   JSOBJECT_JAR=$(datadir)/$(PACKAGE_NAME)/jsobject.jar
 endif
 
-NETX_JAR=$(datadir)/$(PACKAGE_NAME)/netx.jar
+NETX_JAR=$(datadir)/$(PACKAGE_NAME)/javaws.jar
 SPLASH_PNG=$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
 MODULARJDK_ARGS_LOCATION=$(DESTDIR)$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE)
 
@@ -309,8 +312,8 @@ endif
 
 export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
 
-export EXTRA_DIST = $(MODULARJDK_ARGS_FILE) $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png $(DESKTOP_IN_FILES) $(top_srcdir)/completion \
- launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS $(top_srcdir)/metadata.in $(top_srcdir)/win-installer
+export EXTRA_DIST = $(MODULARJDK_ARGS_FILE) $(top_srcdir)/netx $(top_srcdir)/plugin ${ICON} $(DESKTOP_IN_FILES) $(top_srcdir)/completion \
+  shell-launcher rust-launcher $(top_srcdir)/tests html-gen.sh NEW_LINE_IFS $(top_srcdir)/metadata.in $(top_srcdir)/win-installer
 
 # reproducers `D`shortcuts
 export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
@@ -390,7 +393,7 @@ if ENABLE_PLUGINJAR
 endif
 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)
 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)
-	${INSTALL_DATA} $(TOP_SRC_DIR)/javaws.png $(ICONS_DEST_DIR)/
+	${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/
 	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
 	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
 if ENABLE_NATIVE_LAUNCHERS
@@ -506,12 +509,16 @@ $(WIN_INSTALLER_DIR)/itw-installer.json: clean-win-installer
 	mkdir $(WIN_INSTALLER_DIR)
 	sed \
 	-e "s|../win-installer|$(WIN_INSTALLER_SRC_DIR)|g" \
+	-e "s|[@]MAJOR_VERSION[@]|$(MAJOR_VERSION)|g" \
+	-e "s|[@]MINOR_VERSION[@]|$(MINOR_VERSION)|g" \
+	-e "s|[@]MICRO_VERSION[@]|$(MICRO_VERSION)|g" \
 	-e s/[@]PACKAGE_VERSION[@]/$(PACKAGE_VERSION)/g $(WIN_INSTALLER_SRC_DIR)/installer.json.in > $@
 
 win-installer: win-only-image $(WIN_INSTALLER_DIR)/itw-installer.json
 	"$(JAVA)" -jar "$(WIXGEN_JAR)" "$(DESTDIR)$(prefix)" -c $(WIN_INSTALLER_DIR)/itw-installer.json -o $(WIN_INSTALLER_DIR)/itw-installer.wxs
 	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/candle.exe /nologo itw-installer.wxs
-	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/light.exe /nologo -ext WixUIExtension itw-installer.wixobj
+	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/light.exe /nologo -sval -ext WixUIExtension itw-installer.wixobj
+	cd $(WIN_INSTALLER_DIR) && mv itw-installer.msi $(distdir).msi
 endif
 
 # note that this is called only from windows specific target (hidden otherwise)
@@ -557,7 +564,7 @@ uninstall-local: uninstall-linux-only
 	rm -f $(DESTDIR)$(JSOBJECT_JAR)
 	rm -f $(DESTDIR)$(NETX_JAR)
 	rm -r $(DESTDIR)$(SPLASH_PNG)
-	rm -r $(ICONS_DEST_DIR)/javaws.png
+	rm -r $(ICONS_DEST_DIR)/${ICON}
 	rm -rf $(DESTDIR)$(htmldir)
 if WINDOWS_OR_INCLUDE_BATS
 	rm -rf $(WIN_ALL_DEPS)
@@ -886,7 +893,7 @@ stamps/netx-html-gen.stamp:
 	mkdir -p html-gen; \
 	cp AUTHORS NEWS COPYING ChangeLog html-gen/; \
 	export HTML_GEN_DEBUG=true; \
-	${SHELL} html-gen.sh 70; \
+	${SHELL} html-gen.sh 140; \
 	unset HTML_GEN_DEBUG)
 	${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR)
 	rm -r $(NETX_SRCDIR)/../html-gen/
@@ -944,22 +951,121 @@ launcher.build/$(MODULARJDK_ARGS_FILE): $(srcdir)/$(MODULARJDK_ARGS_FILE)
 	cp $(srcdir)/$(MODULARJDK_ARGS_FILE) launcher.build/$(MODULARJDK_ARGS_FILE)
 
 
+if ENABLE_NATIVE_LAUNCHERS
+# todo, handling of suffixes
+# there is curently harecoded sh, so it can somehow basically work
+# see the DESKTOP_SUFFIX for final tuning
+launcher.build/$(javaws) launcher.build/$(itweb_settings) launcher.build/$(policyeditor): rust-launcher/src/main.rs rust-launcher/Cargo.toml
+	export ITW_TMP_REPLACEMENT=$(TESTS_DIR)/rust_tests_tmp ; \
+	mkdir -p $$ITW_TMP_REPLACEMENT; \
+	filename=`basename $@` ; \
+	type=$${filename%.*} ; \
+	srcs=$(TOP_SRC_DIR)/rust-launcher ; \
+	outs=$(TOP_BUILD_DIR)/launcher.in.$$type  ; \
+	mkdir -p launcher.build  ; \
+	cp -r $$srcs $$outs  ; \
+	pushd $$outs ; \
+	  export JAVA=$(JAVA) ; \
+	  export JRE=$(SYSTEM_JRE_DIR) ; \
+	  export SPLASH_PNG=$(SPLASH_PNG) ; \
+	  export ITW_LIBS=$(ITW_LIBS) ; \
+	  export PLUGIN_JAR=$(PLUGIN_JAR) ; \
+	  export NETX_JAR=$(NETX_JAR) ; \
+	  export JSOBJECT_JAR=$(JSOBJECT_JAR) ; \
+	  export TAGSOUP_JAR=$(TAGSOUP_JAR) ; \
+	  export RHINO_JAR=$(RHINO_JAR) ; \
+	  export MSLINKS_JAR=$(MSLINKS_JAR) ; \
+	  export MODULARJDK_ARGS_LOCATION=$(MODULARJDK_ARGS_LOCATION) ; \
+	  unset MAIN_CLASS ; \
+	  unset BIN_LOCATION ; \
+	  unset PROGRAM_NAME ; \
+	  if [ $$filename = $(javaws) ] ; then \
+	    export MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ; \
+	    export BIN_LOCATION=$(bindir)/$(javaws) ; \
+	    export PROGRAM_NAME=$(javaws) ; \
+	  fi ; \
+	  if [ $$filename = $(itweb_settings) ] ; then \
+	    export MAIN_CLASS=net.sourceforge.jnlp.controlpanel.CommandLine ; \
+	    export BIN_LOCATION=$(bindir)/$(itweb_settings) ; \
+	    export PROGRAM_NAME=$(itweb_settings) ; \
+	  fi ; \
+	  if [ $$filename = $(policyeditor) ] ; then \
+	    export MAIN_CLASS=net.sourceforge.jnlp.security.policyeditor.PolicyEditor ; \
+	    export BIN_LOCATION=$(bindir)/$(policyeditor) ; \
+	    export PROGRAM_NAME=$(policyeditor) ; \
+	  fi ; \
+	  $(CARGO) test ; \
+	  r=$$? ; \
+	  $(CARGO) build --release ; \
+	popd ;\
+	cp -v $$outs/target/release/launcher $@ ; \
+	if [ $$r -ne 0 ] ; then \
+	  mv $@ $@.broken ; \
+	fi; \
+	exit $$r
+
+# https://github.com/SimonKagstrom/kcov/
+# build is not part of upstream, declaring
+rust-code-coverage:
+	kcov="none" ; \
+	if [ -f $(KCOV)/kcov ] ; then \
+	  kcov=$(KCOV)/kcov ; \
+	elif [ -f $(KCOV)/bin/kcov ] ; then \
+	  kcov=$(KCOV)/bin/kcov ; \
+	elif [ -f $(KCOV)/build/kcov ] ; then \
+	  kcov=$(KCOV)/build/kcov ; \
+	elif [ -f $(KCOV)/build/src/kcov ] ; then \
+	  kcov=$(KCOV)/build/src/kcov ; \
+	else \
+	  mkdir $(KCOV)/build ; \
+	  pushd $(KCOV)/build ; \
+	  cmake .. ; \
+	  make ; \
+	  popd ; \
+	  kcov=$(KCOV)/build/src/kcov ; \
+	fi ; \
+	export ITW_TMP_REPLACEMENT=$(TESTS_DIR)/rust_tests_tmp ; \
+	mkdir -p $$ITW_TMP_REPLACEMENT; \
+	srcs=$(TOP_SRC_DIR)/rust-launcher ; \
+	outs=$(TOP_BUILD_DIR)/launcher.in.codecoverage  ; \
+	rm -rvf $$outs  ; \
+	cp -r $$srcs $$outs  ; \
+	pushd $$outs ; \
+	  export JAVA=$(JAVA) ; \
+	  export JRE=$(SYSTEM_JRE_DIR) ; \
+	  export SPLASH_PNG=$(SPLASH_PNG) ; \
+	  export ITW_LIBS=$(ITW_LIBS) ; \
+	  export PLUGIN_JAR=$(PLUGIN_JAR) ; \
+	  export NETX_JAR=$(NETX_JAR) ; \
+	  export JSOBJECT_JAR=$(JSOBJECT_JAR) ; \
+	  export TAGSOUP_JAR=$(TAGSOUP_JAR) ; \
+	  export RHINO_JAR=$(RHINO_JAR) ; \
+	  export MODULARJDK_ARGS_LOCATION=$(MODULARJDK_ARGS_LOCATION) ; \
+	  export MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ; \
+	  export BIN_LOCATION=$(bindir)/none ; \
+	  export PROGRAM_NAME=test ; \
+	  $(CARGO) test  --no-run ; \
+	popd ; \
+	rm -fv $(TOP_BUILD_DIR)/launcher.in.codecoverage/target/debug/launcher-*.d ; \
+	$$kcov $$outs $(TOP_BUILD_DIR)/launcher.in.codecoverage/target/debug/launcher-*
+endif
+
 if ENABLE_SHELL_LAUNCHERS
-launcher.build/$(javaws).sh: launcher/launchers.sh.in
+launcher.build/$(javaws).sh: shell-launcher/launchers.sh.in
 	mkdir -p launcher.build
 	MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ;\
 	BIN_LOCATION=$(bindir)/$(javaws).sh ;\
 	PROGRAM_NAME=$(javaws) ;\
 	$(edit_launcher_script) < $< > $@
 
-launcher.build/$(itweb_settings).sh: launcher/launchers.sh.in
+launcher.build/$(itweb_settings).sh: shell-launcher/launchers.sh.in
 	mkdir -p launcher.build
 	MAIN_CLASS=net.sourceforge.jnlp.controlpanel.CommandLine ;\
 	BIN_LOCATION=$(bindir)/$(itweb_settings).sh ;\
 	PROGRAM_NAME=$(itweb_settings) ;\
 	$(edit_launcher_script) < $< > $@
 
-launcher.build/$(policyeditor).sh: launcher/launchers.sh.in
+launcher.build/$(policyeditor).sh: shell-launcher/launchers.sh.in
 	mkdir -p launcher.build
 	MAIN_CLASS=net.sourceforge.jnlp.security.policyeditor.PolicyEditor ;\
 	BIN_LOCATION=$(bindir)/$(policyeditor).sh ;\
@@ -968,7 +1074,7 @@ launcher.build/$(policyeditor).sh: launcher/launchers.sh.in
 
 if WINDOWS_OR_INCLUDE_BATS
 # TODO get rid of this copypaste
-launcher.build/$(javaws).bat: launcher/launchers.bat.in
+launcher.build/$(javaws).bat: shell-launcher/launchers.bat.in
 	mkdir -p launcher.build
 	MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ;\
 	BIN_LOCATION=$(bindir)/$(javaws) ;\
@@ -976,7 +1082,7 @@ launcher.build/$(javaws).bat: launcher/launchers.bat.in
 	$(edit_launcher_script) $(fix_CRLF) < $< > $@
 
 # TODO get rid of this copypaste
-launcher.build/$(itweb_settings).bat: launcher/launchers.bat.in
+launcher.build/$(itweb_settings).bat: shell-launcher/launchers.bat.in
 	mkdir -p launcher.build
 	MAIN_CLASS=net.sourceforge.jnlp.controlpanel.CommandLine ;\
 	BIN_LOCATION=$(bindir)/$(itweb_settings) ;\
@@ -984,7 +1090,7 @@ launcher.build/$(itweb_settings).bat: launcher/launchers.bat.in
 	$(edit_launcher_script) $(fix_CRLF) < $< > $@
 
 # TODO get rid of this copypaste
-launcher.build/$(policyeditor).bat: launcher/launchers.bat.in
+launcher.build/$(policyeditor).bat: shell-launcher/launchers.bat.in
 	mkdir -p launcher.build
 	MAIN_CLASS=net.sourceforge.jnlp.security.policyeditor.PolicyEditor ;\
 	BIN_LOCATION=$(bindir)/$(policyeditor) ;\
@@ -1000,6 +1106,7 @@ if ENABLE_NATIVE_LAUNCHERS
 	rm -f launcher.build/$(itweb_settings)
 	rm -f launcher.build/$(policyeditor)
 	rm -rf launcher.in*
+	rm -rf $(TESTS_DIR)/rust_tests_tmp
 endif
 if ENABLE_SHELL_LAUNCHERS
 	rm -f launcher.build/$(javaws).sh

NEWS

@@ -8,7 +8,21 @@ GX  - http://bugs.gentoo.org/show_bug.cgi?id=X
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 1.7.2 (2019-03-11):
+New in release 1.8.2 (2019-07-15):
+* fix(JNLPFile): location/sourceLocation confusion
+* Fix hang in windows when javaws is launched outside the console
+* support handling of white space in PolicyURI when on file system
+* fix(ManifestAttributesChecker): jars must be relative to codebase
+* Added embedded mode
+* Update JNLPPolicy.java
+* If streams are disabled, and console enabled, silent also client application
+
+New in release 1.8.1 (2019-05-21):
+* backport deadlock fix from #219
+* handle jnlp filename with space for shortcuts (#180)
+* use ico-file instead of png-file as itw-icon and use it as default icon 
+
+New in release 1.8 (2019-03-12):
 * added support for javafx-desc and so allwong run of pure-javafx only applications
 * --nosecurity enhanced for possibility to skip invalid signatures
 * enhanced to allow resources to be read also from j2se/java element (OmegaT)
@@ -17,13 +31,9 @@ New in release 1.7.2 (2019-03-11):
 * Added support for windows desktop shortcuts via https://github.com/DmitriiShamrikov/mslinks
 * cache can now be operated by groups, list by -Xcacheids (details via -verbose, can filter by regex), Xclearcache now can clear only selected id. There is also gui to operate cache via id in itweb-settings now.
 * desktop shortcut name get shortened to title or file if title is missing.
+* shared native launchers
 * scripted launchers rework: Windows bat launchers rewritten to be feature complete, Linux shell launchers made portable, build enhanced to produce platform independent image
 
-New in release 1.7.1 (2017-12-15):
-* better work with authors file
-* better work with jdk9
-* Added possibility to turn off https preference via deployment properties
-
 New in release 1.7 (2017-07-19):
 * PR3366 - bash completion file was split to three, and is setup-able by bashcompdir environment variable
 * added experimental support for windows
@@ -40,9 +50,9 @@ New in release 1.7 (2017-07-19):
 * PR2669 - remove bash-specific syntax from top level Makefile.am
 * PR2489 - various NPEs when codebase is null
 * PR2855 - configure.ac: Remove unnecessary checks for libX11 and zlib
-* PR878 - (http-511) Handle HTTP error 511 Network Authentication Required (standard secure proxy authentification/captive portal detection) 
-* PR1190 - unuseable javaws cache handling 
-* PR3227 - can not save file with query longer then (together with name) then 255 chars 
+* PR878 - (http-511) Handle HTTP error 511 Network Authentication Required (standard secure proxy authentification/captive portal detection)
+* PR1190 - unuseable javaws cache handling
+* PR3227 - can not save file with query longer then (together with name) then 255 chars
 * comments in deployment.properties now should persists load/save
 * fixed bug in caching of files with query
 * fixed issues with recreating of existing shortcut
@@ -51,7 +61,7 @@ New in release 1.7 (2017-07-19):
 * RH1231441 Unable to read the text of the buttons of the security dialogue
 * Fixed RH1233697 icedtea-web: applet origin spoofing
 * Fixed RH1233667 icedtea-web: unexpected permanent authorization of unsigned applets
-* FIXED PR3263 - Cannot retrieve JavaScript Engine using ScriptEngineManager.getEngineByName 
+* FIXED PR3263 - Cannot retrieve JavaScript Engine using ScriptEngineManager.getEngineByName
 * fixed fatal impact of initialization error of FileLog
 * MissingALACAdialog made available also for unsigned applications (but ignoring actual manifest value) and fixed
 * more dialogs got remember me possibility
@@ -77,7 +87,7 @@ New in release 1.7 (2017-07-19):
   - support for SignedBy and Principals along with existing Codebase
 * Plugin
   - RH1273691 - Escaped equals signs in deployment.properties not un-escaped when used
-  - PR2746 - IcedTea-Web Plugin 1.6.1: net.sourceforge.jnlp.LaunchException 
+  - PR2746 - IcedTea-Web Plugin 1.6.1: net.sourceforge.jnlp.LaunchException
   - PR2714 - IcedTea-Web plugin sends uninitialized memory garbage across a pipe when NPN_GetValueForURL call fails
   - PR3198 - Error in webmin
   - PR2968 - IcedTea-Web crashes on Dell EqualLogic SAN

acinclude.m4

@@ -1072,6 +1072,13 @@ AC_DEFUN_ONCE([IT_SET_VERSION],
   FULL_VERSION="${PACKAGE_VERSION}${ICEDTEA_REV}${ICEDTEA_PKG}"
   AC_MSG_RESULT([${FULL_VERSION}])
   AC_SUBST([FULL_VERSION])
+
+  MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^\([[0-9]][[0-9]]*\)[[.]].*$/\1/g'`
+  MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's/^[[^.]]*[[.]]\([[0-9]][[0-9]]*\).*$/\1/g'`
+  MICRO_VERSION=`echo $PACKAGE_VERSION | sed 's/^[[^.]]*[[.]][[^.]]*[[.]]\([[0-9]][[0-9]]*\).*$/\1/g'`
+  AC_SUBST([MAJOR_VERSION])
+  AC_SUBST([MINOR_VERSION])
+  AC_SUBST([MICRO_VERSION])
 ])
 
 dnl Allows you to configure (enable/disable/set path to) the browser
@@ -1165,6 +1172,27 @@ AC_DEFUN_ONCE([IT_CHECK_FOR_WIX],
   fi
 ])
 
+
+AC_DEFUN([IT_CHECK_WITH_KCOV],
+[
+  AC_MSG_CHECKING([whether enable rust code coverage])
+  AC_ARG_WITH([kcov],
+	      [AS_HELP_STRING(--with-kcov,location of kcov directory)],
+  [
+    KCOV="${withval}"
+  ],
+  [ 
+    KCOV="no"
+  ])
+  AC_MSG_RESULT([${KCOV}])
+  if ! test "x${KCOV}" = "xno" ; then
+    if ! test -d "${KCOV}" ; then
+      AC_MSG_ERROR("kcov schould point to direcotry or - default - no")
+    fi
+  fi
+  AC_SUBST([KCOV])
+])
+
 AC_DEFUN([IT_CHECK_MODULARJDK_ARGS],
 [
   AC_MSG_CHECKING([where to place file with modular switches])

autogen.sh

+#!/bin/sh
+
+# Test for autoconf commands.
+
+# Test for autoconf.
+
+HAVE_AUTOCONF=false
+
+for AUTOCONF in autoconf autoconf259 autoconf2.59; do
+    if ${AUTOCONF} --version > /dev/null 2>&1; then
+        AUTOCONF_VERSION=`${AUTOCONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${AUTOCONF_VERSION}
+        case ${AUTOCONF_VERSION} in
+            2.59* | 2.6[0-9]* )
+                HAVE_AUTOCONF=true
+                break;
+                ;;
+        esac
+    fi
+done
+
+# Test for autoheader.
+
+HAVE_AUTOHEADER=false
+
+for AUTOHEADER in autoheader autoheader259 autoheader2.59; do
+    if ${AUTOHEADER} --version > /dev/null 2>&1; then
+        AUTOHEADER_VERSION=`${AUTOHEADER} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${AUTOHEADER_VERSION}
+        case ${AUTOHEADER_VERSION} in
+            2.59* | 2.6[0-9]* )
+                HAVE_AUTOHEADER=true
+                break;
+                ;;
+        esac
+    fi
+done
+
+# Test for autom4te.
+
+HAVE_AUTOM4TE=false
+
+for AUTOM4TE in autom4te autom4te259 autom4te2.59; do
+    if ${AUTOM4TE} --version > /dev/null 2>&1; then
+        AUTOM4TE_VERSION=`${AUTOM4TE} --version | head -1 | sed 's/^[^ ]* [^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${AUTOM4TE_VERSION}
+        case ${AUTOM4TE_VERSION} in
+            2.59* | 2.6[0-9]* )
+                HAVE_AUTOM4TE=true
+                break;
+                ;;
+        esac
+    fi
+done
+
+# Test for autoreconf.
+
+HAVE_AUTORECONF=false
+
+for AUTORECONF in autoreconf autoreconf2.59; do
+    if ${AUTORECONF} --version > /dev/null 2>&1; then
+        AUTORECONF_VERSION=`${AUTORECONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${AUTORECONF_VERSION}
+        case ${AUTORECONF_VERSION} in
+            2.59* | 2.6[0-9]* )
+                HAVE_AUTORECONF=true
+                break;
+                ;;
+        esac
+    fi
+done
+
+if test ${HAVE_AUTOCONF} = false; then
+    echo "No proper autoconf was found."
+    echo "You must have autoconf 2.59 or later installed."
+    exit 1
+fi
+
+if test ${HAVE_AUTOHEADER} = false; then
+    echo "No proper autoheader was found."
+    echo "You must have autoconf 2.59 or later installed."
+    exit 1
+fi
+
+if test ${HAVE_AUTOM4TE} = false; then
+    echo "No proper autom4te was found."
+    echo "You must have autom4te 2.59 or later installed."
+    exit 1
+fi
+
+if test ${HAVE_AUTORECONF} = false; then
+    echo "No proper autoreconf was found."
+    echo "You must have autoconf 2.59 or later installed."
+    exit 1
+fi
+
+
+# Test for automake commands.
+
+# Test for aclocal.
+
+HAVE_ACLOCAL=false
+
+for ACLOCAL in aclocal aclocal-1.10; do
+    if ${ACLOCAL} --version > /dev/null 2>&1; then
+        ACLOCAL_VERSION=`${ACLOCAL} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${ACLOCAL_VERSION}
+        case ${ACLOCAL_VERSION} in
+            1.9.[6-9] | 1.1[0-9]* )
+                HAVE_ACLOCAL=true
+                break;
+                ;;
+        esac
+    fi
+done
+
+# Test for automake.
+
+HAVE_AUTOMAKE=false
+
+for AUTOMAKE in automake automake-1.10; do
+    if ${AUTOMAKE} --version > /dev/null 2>&1; then
+        AUTOMAKE_VERSION=`${AUTOMAKE} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+#        echo ${AUTOMAKE_VERSION}
+        case ${AUTOMAKE_VERSION} in
+            1.9.[6-9] | 1.1[0-9]* )
+                HAVE_AUTOMAKE=true
+                break;
+                ;;
+        esac
+    fi
+done
+
+if test ${HAVE_ACLOCAL} = false; then
+    echo "No proper aclocal was found."
+    echo "You must have automake 1.9.6 or later installed."
+    exit 1
+fi
+
+if test ${HAVE_AUTOMAKE} = false; then
+    echo "No proper automake was found."
+    echo "You must have automake 1.9.6 or later installed."
+    exit 1
+fi
+
+
+export ACLOCAL AUTOCONF AUTOHEADER AUTOM4TE AUTOMAKE
+
+${AUTORECONF} --force --install

configure.ac

-AC_INIT([icedtea-web],[1.7.2],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
+AC_INIT([icedtea-web],[1.8.2],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile netx.manifest])
 AM_MAINTAINER_MODE([enable])
@@ -41,10 +41,32 @@ fi
 
 IT_CHECK_MODULARJDK_ARGS
 
-#shell launchers are only opinion for 1.7
-AM_CONDITIONAL([ENABLE_SHELL_LAUNCHERS], [true])
-#native launchers do not exists in 1.7
-AM_CONDITIONAL([ENABLE_NATIVE_LAUNCHERS], [false])
+AC_MSG_CHECKING([whether build legacy shell launchers])
+AC_ARG_ENABLE([shell-launchers],
+	      [AS_HELP_STRING([--enable-shell-launchers],
+	      		      [Enable build of legacy shell launchers])],
+	      [ENABLE_SHELL_LAUNCHERS="${enableval}"], [ENABLE_SHELL_LAUNCHERS='no'])
+AM_CONDITIONAL([ENABLE_SHELL_LAUNCHERS], [test x$ENABLE_SHELL_LAUNCHERS = xyes])
+AC_MSG_RESULT(${ENABLE_SHELL_LAUNCHERS})
+
+AC_PATH_PROG([RUSTC], [rustc],,)
+if test x"$RUSTC" = x ; then
+  if test x${ENABLE_SHELL_LAUNCHERS} = xno ; then
+    AC_MSG_ERROR([rust is used to compile launchers. No go])
+  else
+    echo "rust is used to compile launchers, is missing but you have enable-shell-launchers as yes, continuing with UNMAINTAINED shell launchers only"
+  fi
+else
+  AC_PATH_PROG([CARGO], [cargo],,)
+  if test x"$CARGO" = x ; then
+    if test x${ENABLE_SHELL_LAUNCHERS} = xno ; then
+      AC_MSG_ERROR([cargo is used to call rustc for launchers. No go])
+    else
+      echo "cargo is used to manage launchers sources, is missing but you have enable-shell-launchers as yes, continuing with UNMAINTAINED shell launchers only"
+    fi
+  fi
+fi
+AM_CONDITIONAL([ENABLE_NATIVE_LAUNCHERS], [test ! x"$RUSTC" = x -a ! x"$CARGO" = x])
 
 build_linux=no
 build_windows=no
@@ -71,6 +93,28 @@ AC_ARG_ENABLE([bats-on-linux],
 AM_CONDITIONAL([WINDOWS_OR_INCLUDE_BATS], [test "x$WINDOWS_OR_INCLUDE_BATS" = "xyes" -o "$build_windows" = "yes" ])
 AC_MSG_RESULT(${WINDOWS_OR_INCLUDE_BATS})
 
+IT_CHECK_WITH_KCOV
+
+AC_MSG_CHECKING([how to search for libraries in native launchers])
+AC_ARG_WITH([itw-libs],
+	      [AS_HELP_STRING([--with-itw-libs],
+	      		      [set way of searching system for jar depndencies - BUNDLED, for portable build (in application space); DISTRIBUTION, for linux (in installed path); BOTH, for both usages (should be for testing only])], [ITW_LIBS="${withval}"], [ITW_LIBS='none'])
+if test "x$build_windows" = xyes ; then
+  if test x"$ITW_LIBS" = xnone -o x"$ITW_LIBS" = x; then
+      ITW_LIBS="BUNDLED"
+      echo  -n "On Windows, presetting missing --with-itw-libs ITW_LIBS to $ITW_LIBS. "
+      echo  -n "On Windows, DISTRIBUTION nor BOTH do not have much sense... "
+  fi
+fi
+AC_MSG_RESULT(${ITW_LIBS})
+AC_SUBST(ITW_LIBS)
+if test x"$ITW_LIBS" = xnone -o x"$ITW_LIBS" = x; then
+    AC_MSG_ERROR([missing --with-itw-libs; mandatory on linux. Use BUNDLED, DISTRIBUTION or BOTH. use BOTH with care. ])
+fi
+if test ! "$ITW_LIBS" = BUNDLED -a ! "$ITW_LIBS" = DISTRIBUTION -a ! "$ITW_LIBS" = EMBEDDED; then
+    AC_MSG_ERROR([incorrect --with-itw-libs; mandatory are BUNDLED, DISTRIBUTION or EMBEDDED ])
+fi
+
 IT_CHECK_WITH_GCJ
 FIND_TOOL([ZIP], [zip])
 FIND_JAVAC
@@ -179,16 +223,16 @@ IT_FIND_OPTIONAL_JAR([wixgen], WIXGEN, [/usr/share/java/wixgen.jar $WIX_TOOLSET_
 echo -n "checking for MSI deps... "
 if test "x$WIX_TOOLSET_DIR" = "x" ; then
   if test "x$WIXGEN_JAR" = "x" ; then
-    echo  "No WiX tools, nor wixgen jar, correct - build on linux or on windows witout MSI" 
+    echo  "No WiX tools, nor wixgen jar, correct - build on linux or on windows witout MSI"
   else
-    echo  "No WiX tools, but wixgen jar - wixgen jar will do its job, but is useless. No MSI can be generated" 
+    echo  "No WiX tools, but wixgen jar - wixgen jar will do its job, but is useless. No MSI can be generated"
   fi
 else
   if test "x$WIXGEN_JAR" = "x" ; then
-    echo  "WiX tools, but no wixgen jar, fatal. You need wixgen.jar from https://github.com/akashche/wixgen" 
+    echo  "WiX tools, but no wixgen jar, fatal. You need wixgen.jar from https://github.com/akashche/wixgen"
     exit 1
   else
-    echo  "WiX tools and wixgen jar - build on windows with MSI generation support" 
+    echo  "WiX tools and wixgen jar - build on windows with MSI generation support"
   fi
 fi
 
@@ -211,6 +255,6 @@ am__fastdepCXX="#"
 echo "destroyed!"
 else
 echo "no"
-fi 
+fi
 
 AC_OUTPUT

netx/net/sourceforge/jnlp/JNLPFile.java

@@ -870,7 +870,7 @@ public class JNLPFile {
             specVersion = parser.getSpecVersion();
             fileVersion = parser.getFileVersion();
             codeBase = parser.getCodeBase();
-            sourceLocation = parser.getFileLocation() != null ? parser.getFileLocation() : location;
+            sourceLocation = parser.getFileLocation();
             info = parser.getInfo(root);
             parser.checkForInformation();
             update = parser.getUpdate(root);