Changeset 429 for trunk/icedtea-web/Makefile.in

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

File:

• trunk/icedtea-web/Makefile.in (modified) (75 diffs)

trunk/icedtea-web/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18 +17 @@
 # Source directories
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \   ]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs   ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -36 +80 @@
 build_triplet = @build@
 host_triplet = @host@
+@HAVE_TAGSOUP_FALSE@am__append_1 = net.sourceforge.jnlp.MalformedXMLParser.java
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in $(srcdir)/build.properties.in \
-        $(srcdir)/javac.in $(srcdir)/jrunscript.in \
-        $(srcdir)/netx.manifest.in $(top_srcdir)/configure AUTHORS \
-        COPYING ChangeLog INSTALL NEWS config.guess config.sub \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+        $(top_srcdir)/configure $(am__configure_deps) \
+        $(srcdir)/netx.manifest.in $(srcdir)/javac.in \
+        $(srcdir)/jrunscript.in $(srcdir)/build.properties.in AUTHORS \
+        COPYING ChangeLog INSTALL NEWS README config.guess config.sub \
         install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -53 +98 @@
 CONFIG_CLEAN_FILES = netx.manifest javac jrunscript build.properties
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -64 +127 @@
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
@@ -72 +137 @@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 ARCHFLAG = @ARCHFLAG@
 ARCH_PREFIX = @ARCH_PREFIX@
+ASM_AVAILABLE = @ASM_AVAILABLE@
+ASM_JAR = @ASM_JAR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BIN_BASH = @BIN_BASH@
 BROWSER_TESTS_MODIFICATION = @BROWSER_TESTS_MODIFICATION@
 BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
@@ -108 +177 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 HG = @HG@
 ICEDTEA_REVISION = @ICEDTEA_REVISION@
@@ -118 +185 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JACOCO_AVAILABLE = @JACOCO_AVAILABLE@
+JACOCO_JAR = @JACOCO_JAR@
 JAR = @JAR@
 JARSIGNER = @JARSIGNER@
@@ -162 +231 @@
 SYSTEM_JDK_DIR = @SYSTEM_JDK_DIR@
 SYSTEM_JRE_DIR = @SYSTEM_JRE_DIR@
+TAGSOUP_JAR = @TAGSOUP_JAR@
 USING_ECJ = @USING_ECJ@
 VERSION = @VERSION@
@@ -222 +292 @@
 @WITH_RHINO_FALSE@RHINO_RUNTIME = 
 @WITH_RHINO_TRUE@RHINO_RUNTIME = :$(RHINO_JAR)
+NETX_EXCLUDE_SRCS = $(am__append_1)
+
+# Conditional defintions
+@HAVE_TAGSOUP_TRUE@NETX_CLASSPATH_ARG = -classpath $(TAGSOUP_JAR)
 @CP_SUPPORTS_REFLINK_TRUE@REFLINK = --reflink=auto
 @SRC_DIR_HARDLINKABLE_FALSE@SRC_DIR_LINK = $(REFLINK)
@@ -228 +302 @@
 @ENABLE_DOCS_TRUE@ -bottom '<font size="-1"> <a href="http://icedtea.classpath.org/bugzilla">Submit a bug or feature</a></font>'
 
-@ENABLE_DOCS_TRUE@@JAVADOC_SUPPORTS_J_OPTIONS_TRUE@JAVADOC_MEM_OPTS = -J-Xmx1024m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m
+@ENABLE_DOCS_TRUE@@JAVADOC_SUPPORTS_J_OPTIONS_TRUE@JAVADOC_MEM_OPTS = -J-Xmx1024m -J-Xms128m
 @WITH_RHINO_FALSE@RHINO_TESTS = 
 @WITH_RHINO_TRUE@RHINO_TESTS = stamps/check-pac-functions.stamp
@@ -238 +312 @@
 javaws := $(shell echo javaws | sed '@program_transform_name@')
 itweb_settings := $(shell echo itweb-settings | sed '@program_transform_name@')
+policyeditor := $(shell echo policyeditor | sed '@program_transform_name@')
 
 # the launcher needs to know $(bindir) and $(datadir) which can be different at
 # make-time from configure-time
 edit_launcher_script = sed \
-  -e 's|[@]LAUNCHER_BOOTCLASSPATH[@]|$(LAUNCHER_BOOTCLASSPATH)|g' \
-  -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(javaws)|g' \
-  -e 's|[@]ITWEB_SETTINGS_BIN_LOCATION[@]|$(bindir)/$(itweb_settings)|g' \
-  -e 's|[@]JAVA[@]|$(JAVA)|g' \
-  -e 's|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g'
+  -e "s|[@]LAUNCHER_BOOTCLASSPATH[@]|$(LAUNCHER_BOOTCLASSPATH)|g" \
+  -e "s|[@]JAVAWS_SPLASH_LOCATION[@]|$(datadir)/$(PACKAGE_NAME)/javaws_splash.png|g" \
+  -e "s|[@]JAVA[@]|$(JAVA)|g" \
+  -e "s|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g" \
+  -e "s|[@]MAIN_CLASS[@]|$${MAIN_CLASS}|g" \
+  -e "s|[@]BIN_LOCATION[@]|$${BIN_LOCATION}|g" \
+  -e "s|[@]PROGRAM_NAME[@]|$${PROGRAM_NAME}|g"
 
 
@@ -257 +334 @@
 @ENABLE_PLUGIN_TRUE@PLUGIN_SRC = IcedTeaNPPlugin.cc IcedTeaScriptablePluginObject.cc \
 @ENABLE_PLUGIN_TRUE@        IcedTeaJavaRequestProcessor.cc IcedTeaPluginRequestProcessor.cc \
-@ENABLE_PLUGIN_TRUE@            IcedTeaPluginUtils.cc
+@ENABLE_PLUGIN_TRUE@            IcedTeaPluginUtils.cc IcedTeaParseProperties.cc
 
 @ENABLE_PLUGIN_TRUE@PLUGIN_OBJECTS = IcedTeaNPPlugin.o IcedTeaScriptablePluginObject.o \
 @ENABLE_PLUGIN_TRUE@        IcedTeaJavaRequestProcessor.o IcedTeaPluginRequestProcessor.o \
-@ENABLE_PLUGIN_TRUE@            IcedTeaPluginUtils.o
+@ENABLE_PLUGIN_TRUE@            IcedTeaPluginUtils.o IcedTeaParseProperties.o
 
 all: all-am
@@ -308 +385 @@
 build.properties: $(top_builddir)/config.status $(srcdir)/build.properties.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
 
 
@@ -356 +433 @@
 dist-gzip: distdir
         tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-        $(am__remove_distdir)
+        $(am__post_remove_distdir)
 
 dist-bzip2: distdir
         tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-        $(am__remove_distdir)
+        $(am__post_remove_distdir)
 
 dist-lzip: distdir
         tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-        $(am__remove_distdir)
-
-dist-lzma: distdir
-        tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-        $(am__remove_distdir)
+        $(am__post_remove_distdir)
 
 dist-xz: distdir
         tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-        $(am__remove_distdir)
+        $(am__post_remove_distdir)
 
 dist-tarZ: distdir
         tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-        $(am__remove_distdir)
+        $(am__post_remove_distdir)
 
 dist-shar: distdir
         shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-        $(am__remove_distdir)
+        $(am__post_remove_distdir)
 
 dist-zip: distdir
         -rm -f $(distdir).zip
         zip -rq $(distdir).zip $(distdir)
-        $(am__remove_distdir)
-
-dist dist-all: distdir
-        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-        $(am__remove_distdir)
+        $(am__post_remove_distdir)
+
+dist dist-all:
+        $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+        $(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -400 +473 @@
         *.tar.bz2*) \
           bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-        *.tar.lzma*) \
-          lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
         *.tar.lz*) \
           lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
@@ -413 +484 @@
           unzip $(distdir).zip ;;\
         esac
-        chmod -R a-w $(distdir); chmod a+w $(distdir)
-        mkdir $(distdir)/_build
-        mkdir $(distdir)/_inst
+        chmod -R a-w $(distdir)
+        chmod u+w $(distdir)
+        mkdir $(distdir)/_build $(distdir)/_inst
         chmod a-w $(distdir)
         test -d $(distdir)/_build || exit 0; \
@@ -447 +518 @@
           && cd "$$am__cwd" \
           || exit 1
-        $(am__remove_distdir)
+        $(am__post_remove_distdir)
         @(echo "$(distdir) archives ready for distribution: "; \
           list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
@@ -584 +655 @@
 
 .PHONY: all all-am all-local am--refresh check check-am check-local \
-        clean clean-generic clean-local dist dist-all dist-bzip2 \
-        dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
-        dist-zip distcheck distclean distclean-generic distcleancheck \
-        distdir distuninstallcheck dvi dvi-am html html-am info \
-        info-am install install-am install-data install-data-am \
-        install-data-local install-dvi install-dvi-am install-exec \
-        install-exec-am install-exec-local install-html \
+        clean clean-generic clean-local cscopelist-am ctags-am dist \
+        dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+        dist-xz dist-zip distcheck distclean distclean-generic \
+        distcleancheck distdir distuninstallcheck dvi dvi-am html \
+        html-am info info-am install install-am install-data \
+        install-data-am install-data-local install-dvi install-dvi-am \
+        install-exec install-exec-am install-exec-local install-html \
         install-html-am install-info install-info-am install-man \
         install-pdf install-pdf-am install-ps install-ps-am \
         install-strip installcheck installcheck-am installdirs \
         maintainer-clean maintainer-clean-generic mostlyclean \
-        mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-        uninstall-local
-
+        mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+        uninstall-am uninstall-local
+
+
+export TOP_BUILD_DIR = $(abs_top_builddir)
 
 export NETX_DIR = $(abs_top_builddir)/netx.build
 export NETX_SRCDIR = $(abs_top_srcdir)/netx
 export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
-export NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
-export NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
 
 export REPORT_STYLES_DIRNAME=report-styles
@@ -611 +682 @@
 
 export NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
-export NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
+export NETX_TEST_DIR=$(TESTS_DIR)/netx
+export NETX_UNIT_TEST_DIR=$(NETX_TEST_DIR)/unit
 
 export JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
 export JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
 
-export JNLP_TESTS_ENGINE_SRCDIR=$(TESTS_SRCDIR)/test-extensions
-export JNLP_TESTS_ENGINE_TESTS_SRCDIR=$(TESTS_SRCDIR)/test-extensions-tests
-export JNLP_TESTS_SRCDIR=$(TESTS_SRCDIR)/reproducers
-export JNLP_TESTS_ENGINE_DIR=$(TESTS_DIR)/jnlp_testsengine
-export JNLP_TESTS_ENGINE_TESTS_DIR=$(TESTS_DIR)/netx/jnlp_testsengine_tests
-export JNLP_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/jnlp_test_server
-export JNLP_TESTS_DIR=$(TESTS_DIR)/jnlp_tests
+export JACOCO_OPERATOR_DIR=$(TESTS_DIR)/jacoco-operator
+export JACOCO_OPERATOR_SRCDIR=$(TESTS_SRCDIR)/jacoco-operator
+
+export TEST_EXTENSIONS_SRCDIR=$(TESTS_SRCDIR)/test-extensions
+export TEST_EXTENSIONS_TESTS_SRCDIR=$(TESTS_SRCDIR)/test-extensions-tests
+export REPRODUCERS_TESTS_SRCDIR=$(TESTS_SRCDIR)/reproducers
+export TEST_EXTENSIONS_DIR=$(TESTS_DIR)/test-extensions
+export CPP_UNITTEST_FRAMEWORK_SRCDIR=$(TESTS_SRCDIR)/UnitTest++
+export CPP_UNITTEST_SRCDIR=$(TESTS_SRCDIR)/cpp-unit-tests
+export CPP_UNITTEST_DIR=$(TESTS_DIR)/cpp-unit-tests
+export TEST_EXTENSIONS_COMPATIBILITY_SYMLINK=$(TESTS_DIR)/netx/jnlp_testsengine
+export TEST_EXTENSIONS_TESTS_DIR=$(TESTS_DIR)/test-extensions-tests
+export REPRODUCERS_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/reproducers_test_server_deploydir
+export REPRODUCERS_BUILD_DIR=$(TESTS_DIR)/reproducers.classes
 export PRIVATE_KEYSTORE_NAME=teststore.ks
 export PRIVATE_KEYSTORE_PASS=123456789
@@ -628 +707 @@
 export EXPORTED_TEST_CERT_SUFFIX=crt
 export TEST_CERT_ALIAS=icedteaweb
-export PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs
+export PUBLIC_KEYSTORE_STUB=icedtea-web/security/trusted.certs
 export PUBLIC_KEYSTORE_PASS=changeit
+export SOFTKILLER=softkiller
 
 export JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
@@ -640 +720 @@
 export EMMA_SUFFIX=_withEmma
 export META_MANIFEST = META-INF/MANIFEST.MF
-export SIGNED_REPRODUCERS=signed
+export SIGNED_REPRODUCERS=signed signed2
 export SIMPLE_REPRODUCERS=simple
 export CUSTOM_REPRODUCERS=custom
 export ALL_NONCUSTOM_REPRODUCERS=$(SIMPLE_REPRODUCERS) $(SIGNED_REPRODUCERS)
 export ALL_REPRODUCERS=$(ALL_NONCUSTOM_REPRODUCERS) $(CUSTOM_REPRODUCERS)
+
+export JACOCO_PATH:=$(shell dirname "$(JACOCO_JAR)")
+export JACOCO_AGENT=org.jacoco.agent.jar
+export JACOCO_ANT=org.jacoco.ant.jar
+export JACOCO_REPORT=org.jacoco.report.jar
+export JACOCO_AGENTRT=org.jacoco.agent.rt.jar
+export JACOCO_CORE=org.jacoco.core.jar
+export JACOCO_JAVAWS_RESULTS=$(TEST_EXTENSIONS_DIR)/jacoco_javaws.exec
+export JACOCO_PLUGIN_RESULTS=$(TEST_EXTENSIONS_DIR)/jacoco_plugin.exec
+export JACOCO_CLASSPATH=$(JACOCO_PATH)/$(JACOCO_CORE):$(JACOCO_PATH)/$(JACOCO_AGENT):$(JACOCO_PATH)/$(JACOCO_REPORT):$(JACOCO_PATH)/$(JACOCO_AGENTRT):$(JACOCO_PATH)/$(JACOCO_ANT):$(ASM_JAR)
+export JACOCO_AGENT_SWITCH_BODY=-javaagent:$(JACOCO_PATH)/$(JACOCO_AGENTRT)
+export JACOCO_BASE_EXCLUDE=org.junit.*:junit.*
+export JACOCO_ADVANCED_EXCLUDE=:*jacoco*:java.lang.*:java.reflect.*:java.util.*:sun.reflect.*
+export JACOCO_AGENT_SWITCH="$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)"
+export JACOCO_AGENT_JAVAWS_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),xboot=true,destfile=$(JACOCO_JAVAWS_RESULTS)\"
+export JACOCO_AGENT_PLUGIN_SWITCH=\"$(JACOCO_AGENT_SWITCH_BODY)=excludes=$(JACOCO_BASE_EXCLUDE)$(JACOCO_ADVANCED_EXCLUDE),xboot=true,destfile=$(JACOCO_PLUGIN_RESULTS)\"
+export JACOCO_OPERATOR_EXEC=$(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(JACOCO_OPERATOR_DIR):$(JACOCO_CLASSPATH):. org.jacoco.operator.Main
 
 # linking variables
@@ -654 +751 @@
 export OPERA_GLOBAL32_PLUGINDIR=/usr/lib/opera/plugins
 export BUILT_PLUGIN_LIBRARY=IcedTeaPlugin.so
+export CPP_UNITTEST_FRAMEWORK_BUILDDIR=$(CPP_UNITTEST_DIR)/UnitTest++
+export CPP_UNITTEST_FRAMEWORK_LIB_NAME=libUnitTest++.a
+export CPP_UNITTEST_FRAMEWORK_LIB=$(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/$(CPP_UNITTEST_FRAMEWORK_LIB_NAME)
+export CPP_UNITTEST_EXECUTABLE=$(CPP_UNITTEST_DIR)/IcedTeaPluginUnitTests
 export MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
 export MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
@@ -680 +781 @@
 #  - we want full privileges
 #
-export LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
-export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
+export LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)"
+export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(TAGSOUP_JAR)"'
+export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME):$(JACOCO_CLASSPATH):$(TAGSOUP_JAR)"'
 
 # Fake update version to work with the Deployment Toolkit script used by Oracle
@@ -692 +794 @@
 
 export NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \
+        net.sourceforge.jnlp.about \
         net.sourceforge.jnlp.cache net.sourceforge.jnlp.config \
         net.sourceforge.jnlp.controlpanel net.sourceforge.jnlp.event \
         net.sourceforge.jnlp.runtime net.sourceforge.jnlp.security \
         net.sourceforge.jnlp.security.viewer net.sourceforge.jnlp.services \
-        net.sourceforge.jnlp.tools net.sourceforge.jnlp.util
-
-# Conditional defintions
+        net.sourceforge.jnlp.tools net.sourceforge.jnlp.util \
+        sun.applet
+
 @ENABLE_PLUGIN_TRUE@export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
 @ENABLE_PLUGIN_TRUE@export LIVECONNECT_DIR = netscape sun/applet
@@ -706 +809 @@
 @ENABLE_PLUGIN_TRUE@export ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) stamps/liveconnect-dist.stamp
 @ENABLE_PLUGIN_TRUE@export PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
+#this is for plugin testcoverage
+@ENABLE_PLUGIN_TRUE@export COVERABLE_PLUGIN_DIR=$(TESTS_DIR)/icedteanp-build-with-jacoco
 
 export PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
 
-export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
- itweb-settings.desktop.in $(top_srcdir)/tests
+export EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in policyeditor.desktop.in  \
+ itweb-settings.desktop.in launcher $(top_srcdir)/tests html-gen.sh netx-dist-tests-whitelist NEW_LINE_IFS
 
 # reproducers `D`shortcuts
-export DTEST_SERVER=-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR)
+export DTEST_SERVER=-Dtest.server.dir=$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
 export DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws)
 export DBROWSERS=-Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA):$(MIDORI):$(EPIPHANY)
@@ -725 +830 @@
 # =================
 
-all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
- javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop
+all-local: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \
+ javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop \
+ launcher.build/$(policyeditor) policyeditor.desktop
 
 check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
 
-clean-local: clean-netx clean-plugin clean-liveconnect clean-extra  \
+clean-local: clean-netx clean-plugin clean-liveconnect \
  clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests clean-bootstrap-directory
         if [ -e stamps ] ; then \
@@ -746 +852 @@
 @ENABLE_PLUGIN_TRUE@    ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
         ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
+        ${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
         ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
-        ${INSTALL_DATA} extra-lib/about.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
         ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
+        ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
 
 install-data-local:
         ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
         ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1
-        ${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
+        ${INSTALL_DATA} $(NETX_SRCDIR)/itweb-settings.1 $(DESTDIR)$(mandir)/man1
+        ${INSTALL_DATA} $(NETX_SRCDIR)/policyeditor.1 $(DESTDIR)$(mandir)/man1
 @ENABLE_DOCS_TRUE@      ${mkinstalldirs} $(DESTDIR)$(htmldir)
 @ENABLE_DOCS_TRUE@      (cd ${abs_top_builddir}/docs/netx; \
@@ -770 +878 @@
         rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
         rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
-        rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jnlp
-        rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
         rm -f $(DESTDIR)$(mandir)/man1/javaws.1
+        rm -f $(DESTDIR)$(mandir)/man1/itweb-settings.1
+        rm -f $(DESTDIR)$(mandir)/man1/policyeditor.1
         rm -f $(DESTDIR)$(bindir)/$(javaws)
         rm -f $(DESTDIR)$(bindir)/$(itweb_settings)
+        rm -f $(DESTDIR)$(bindir)/$(policyeditor)
         rm -rf $(DESTDIR)$(htmldir)
 
@@ -790 +899 @@
 @ENABLE_PLUGIN_TRUE@      -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
 @ENABLE_PLUGIN_TRUE@      $(GLIB_CFLAGS) \
-@ENABLE_PLUGIN_TRUE@      $(GTK_CFLAGS) \
 @ENABLE_PLUGIN_TRUE@      $(MOZILLA_CFLAGS) \
+@ENABLE_PLUGIN_TRUE@      -fvisibility=hidden \
 @ENABLE_PLUGIN_TRUE@      -fPIC -o $@ -c $<
 
@@ -799 +908 @@
 @ENABLE_PLUGIN_TRUE@      $(PLUGIN_OBJECTS) \
 @ENABLE_PLUGIN_TRUE@      $(GLIB_LIBS) \
-@ENABLE_PLUGIN_TRUE@      $(GTK_LIBS) \
-@ENABLE_PLUGIN_TRUE@      $(MOZILLA_LIBS)\
+@ENABLE_PLUGIN_TRUE@      $(MOZILLA_LIBS) \
 @ENABLE_PLUGIN_TRUE@      -shared -o $@
+
+# Start of CPP Unit test targets
+
+# Note that UnitTest++ has its own makefile, however this is avoided because it creates an in-source build.
+@ENABLE_PLUGIN_TRUE@$(CPP_UNITTEST_FRAMEWORK_LIB): $(CPP_UNITTEST_FRAMEWORK_SRCDIR)
+@ENABLE_PLUGIN_TRUE@    mkdir -p $(CPP_UNITTEST_FRAMEWORK_BUILDDIR) && \
+@ENABLE_PLUGIN_TRUE@    pushd $(CPP_UNITTEST_FRAMEWORK_SRCDIR) && \
+@ENABLE_PLUGIN_TRUE@    for cppfile in $$(find $(CPP_UNITTEST_FRAMEWORK_SRCDIR) -name '*.cpp') ; \
+@ENABLE_PLUGIN_TRUE@    do \
+@ENABLE_PLUGIN_TRUE@      objfile="$(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/$$(basename $${cppfile%.cpp}).o" ; \
+@ENABLE_PLUGIN_TRUE@      $(CXX) $(CXXFLAGS) -c $$cppfile -o $$objfile || exit 1 ; \
+@ENABLE_PLUGIN_TRUE@    done ; \
+@ENABLE_PLUGIN_TRUE@    ar cr $(CPP_UNITTEST_FRAMEWORK_LIB) $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o ; \
+@ENABLE_PLUGIN_TRUE@    popd
+
+@ENABLE_PLUGIN_TRUE@clean-unittest++:
+@ENABLE_PLUGIN_TRUE@    rm -f $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o
+@ENABLE_PLUGIN_TRUE@    rm -f $(CPP_UNITTEST_FRAMEWORK_LIB)
+@ENABLE_PLUGIN_TRUE@    if [ -e $(CPP_UNITTEST_FRAMEWORK_BUILDDIR) ] ; then \
+@ENABLE_PLUGIN_TRUE@            rmdir $(CPP_UNITTEST_FRAMEWORK_BUILDDIR) ; \
+@ENABLE_PLUGIN_TRUE@    fi
+
+@ENABLE_PLUGIN_TRUE@stamps/cpp-unit-tests-compile.stamp: $(CPP_UNITTEST_FRAMEWORK_LIB) $(CPP_UNITTEST_SRCDIR) $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
+@ENABLE_PLUGIN_TRUE@    mkdir -p $(CPP_UNITTEST_DIR) && \
+@ENABLE_PLUGIN_TRUE@    pushd $(CPP_UNITTEST_SRCDIR) && \
+@ENABLE_PLUGIN_TRUE@    for cppfile in $$(find $(CPP_UNITTEST_SRCDIR) -name '*.cc') ; \
+@ENABLE_PLUGIN_TRUE@    do \
+@ENABLE_PLUGIN_TRUE@    objfile="$(CPP_UNITTEST_DIR)/$$(basename $${cppfile%.cc}).o" ; \
+@ENABLE_PLUGIN_TRUE@    echo "Compiling $$cppfile to $$objfile"; \
+@ENABLE_PLUGIN_TRUE@    $(CXX) $(CXXFLAGS) \
+@ENABLE_PLUGIN_TRUE@       $(DEFS) $(VERSION_DEFS) \
+@ENABLE_PLUGIN_TRUE@      -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
+@ENABLE_PLUGIN_TRUE@      -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
+@ENABLE_PLUGIN_TRUE@      -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
+@ENABLE_PLUGIN_TRUE@      -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
+@ENABLE_PLUGIN_TRUE@      -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
+@ENABLE_PLUGIN_TRUE@      -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
+@ENABLE_PLUGIN_TRUE@      -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
+@ENABLE_PLUGIN_TRUE@      $(GLIB_CFLAGS) \
+@ENABLE_PLUGIN_TRUE@      $(MOZILLA_CFLAGS) \
+@ENABLE_PLUGIN_TRUE@      "-I$(CPP_UNITTEST_FRAMEWORK_SRCDIR)/src" \
+@ENABLE_PLUGIN_TRUE@      "-I$(PLUGIN_SRCDIR)" \
+@ENABLE_PLUGIN_TRUE@      -o $$objfile -c $$cppfile || exit 1 ; \
+@ENABLE_PLUGIN_TRUE@    done ; \
+@ENABLE_PLUGIN_TRUE@    popd ; \
+@ENABLE_PLUGIN_TRUE@    mkdir -p stamps ; \
+@ENABLE_PLUGIN_TRUE@    touch $@
+
+@ENABLE_PLUGIN_TRUE@$(CPP_UNITTEST_EXECUTABLE): $(CPP_UNITTEST_FRAMEWORK_LIB) stamps/cpp-unit-tests-compile.stamp 
+@ENABLE_PLUGIN_TRUE@    cd $(CPP_UNITTEST_DIR) && \
+@ENABLE_PLUGIN_TRUE@    $(CXX) $(CXXFLAGS) \
+@ENABLE_PLUGIN_TRUE@      $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) \
+@ENABLE_PLUGIN_TRUE@      $(CPP_UNITTEST_DIR)/*.o \
+@ENABLE_PLUGIN_TRUE@      -lrt \
+@ENABLE_PLUGIN_TRUE@      -lpthread \
+@ENABLE_PLUGIN_TRUE@      $(GLIB_LIBS) \
+@ENABLE_PLUGIN_TRUE@      $(MOZILLA_LIBS) \
+@ENABLE_PLUGIN_TRUE@      $(CPP_UNITTEST_FRAMEWORK_LIB)\
+@ENABLE_PLUGIN_TRUE@      $(BUILT_CPP_UNIT_TEST_FRAMEWORK) -o $@
+
+@ENABLE_PLUGIN_TRUE@clean-cpp-unit-tests: 
+@ENABLE_PLUGIN_TRUE@    rm -f stamps/cpp-unit-tests-compile.stamp
+@ENABLE_PLUGIN_TRUE@    rm -f $(CPP_UNITTEST_EXECUTABLE)
+@ENABLE_PLUGIN_TRUE@    rm -f $(CPP_UNITTEST_DIR)/*.o
+
+@ENABLE_PLUGIN_TRUE@run-cpp-unit-tests: $(CPP_UNITTEST_EXECUTABLE)
+@ENABLE_PLUGIN_TRUE@    $(CPP_UNITTEST_EXECUTABLE)
+
+# End of CPP Unit test targets
 
 @ENABLE_PLUGIN_TRUE@clean-IcedTeaPlugin:
@@ -833 +1010 @@
               -d $(abs_top_builddir)/liveconnect \
               -bootclasspath $(NETX_DIR):$(RUNTIME) \
+              $(NETX_CLASSPATH_ARG) \
               -sourcepath $(LIVECONNECT_SRCS) \
               @liveconnect-source-files.txt ; \
@@ -863 +1041 @@
 
 netx-source-files.txt:
-        find $(NETX_SRCDIR) -name '*.java' | sort > $@
+        find $(NETX_SRCDIR) -name '*.java' | sort > $@ ; \
+        for src in $(NETX_EXCLUDE_SRCS) ; \
+        do \
+          sed -i "/$${src}/ d" $@ ; \
+        done
 @WITH_RHINO_FALSE@      sed -i '/RhinoBasedPacEvaluator/ d' $@
-
-stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp
+@HAVE_JAVA7_FALSE@      sed -i '/VariableX509TrustManagerJDK7/ d' $@
+
+stamps/netx-html-gen.stamp:
+        (cd $$NETX_SRCDIR/..; \
+        mkdir -p html-gen; \
+        cp AUTHORS NEWS COPYING ChangeLog html-gen/; \
+        export HTML_GEN_DEBUG=true; \
+        bash html-gen.sh 36; \
+        unset HTML_GEN_DEBUG)
+        ${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR)
+        rm -r $(NETX_SRCDIR)/../html-gen/
+        mkdir -p stamps
+        touch $@
+
+stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp stamps/netx-html-gen.stamp
         mkdir -p $(NETX_DIR)
         $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
@@ -872 +1067 @@
             -sourcepath $(NETX_SRCDIR) \
             -bootclasspath $(RUNTIME) \
+            $(NETX_CLASSPATH_ARG) \
             @netx-source-files.txt
         (cd $(NETX_RESOURCE_DIR); \
@@ -889 +1085 @@
          mkdir -p lib ; \
          $(BOOT_DIR)/bin/jar cfm lib/classes.jar \
-          $(abs_top_builddir)/netx.manifest javax/jnlp net ; \
+          $(abs_top_builddir)/netx.manifest javax/jnlp net sun; \
          cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \
          find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
          cd src ; \
-         $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net )
+         $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net sun)
         mkdir -p stamps
         touch $@
@@ -902 +1098 @@
         rm -f netx-source-files.txt
         rm -f stamps/netx.stamp
+        rm -f stamps/netx-html-gen.stamp
+        rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html
 
 clean-desktop-files:
@@ -907 +1105 @@
         rm -f itweb-settings.desktop
 
-# extras -- used to create about.jar for javaws.
-extra-source-files.txt:
-        find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
-
-stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp
-        mkdir -p extra-lib
-        $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d extra-lib \
-          -sourcepath $(abs_top_srcdir)/extra -cp netx.build \
-          -bootclasspath $(RUNTIME) @extra-source-files.txt
-        (cd $(NETX_EXTRA_DIR); \
-         for files in $$(find . -type f); \
-         do \
-           ${INSTALL_DATA} -D $${files} \
-           $(NETX_EXTRA_DIST_DIR)/$${files}; \
-         done)
-        mkdir -p stamps
-        touch $@
-
-clean-extra:
-        rm -rf extra-lib
-        rm -f stamps/extra-class-files.stamp
-        rm -f extra-source-files.txt
-
-extra-lib/about.jar: stamps/extra-class-files.stamp
-        $(BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
-
-launcher.build/$(javaws): launcher/javaws.in
+launcher.build/$(javaws): launcher/launchers.in
         mkdir -p launcher.build
+        MAIN_CLASS=net.sourceforge.jnlp.runtime.Boot ;\
+        BIN_LOCATION=$(bindir)/$(javaws) ;\
+        PROGRAM_NAME=$(javaws) ;\
         $(edit_launcher_script) < $< > $@
 
-launcher.build/$(itweb_settings): launcher/itweb-settings.in
+launcher.build/$(itweb_settings): launcher/launchers.in
         mkdir -p launcher.build
+        MAIN_CLASS=net.sourceforge.jnlp.controlpanel.CommandLine ;\
+        BIN_LOCATION=$(bindir)/$(itweb_settings) ;\
+        PROGRAM_NAME=$(itweb_settings) ;\
+        $(edit_launcher_script) < $< > $@
+
+launcher.build/$(policyeditor): launcher/launchers.in
+        mkdir -p launcher.build
+        MAIN_CLASS=net.sourceforge.jnlp.security.policyeditor.PolicyEditor ;\
+        BIN_LOCATION=$(bindir)/$(policyeditor) ;\
+        PROGRAM_NAME=$(policyeditor) ;\
         $(edit_launcher_script) < $< > $@
 
@@ -944 +1129 @@
         rm -f launcher.build/$(javaws)
         rm -f launcher.build/$(itweb_settings)
+        rm -f launcher.build/$(policyeditor)
         if [ -e launcher.build ] ; then \
           rmdir launcher.build ; \
@@ -954 +1140 @@
         sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(itweb_settings)#" \
           < $(srcdir)/itweb-settings.desktop.in > itweb-settings.desktop
+
+policyeditor.desktop: $(srcdir)/policyeditor.desktop.in
+        sed 's#PATH_TO_POLICYEDITOR#$(bindir)/$(policyeditor)#' \
+        < $(srcdir)/policyeditor.desktop.in > policyeditor.desktop
 
 # documentation
@@ -997 +1187 @@
 # ==========================
 
-clean-tests: clean-netx-tests
+clean-tests: clean-netx-tests clean-cpp-unit-tests clean-unittest++
+        if [ -e $(CPP_UNITTEST_DIR) ] ; then \
+                rmdir $(CPP_UNITTEST_DIR) ; \
+        fi
         if [ -e $(TESTS_DIR) ]; then \
                 rmdir $(TESTS_DIR) ; \
@@ -1011 +1204 @@
         find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@
 
-$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt stamps/netx-dist-tests-compile.stamp
+jacoco-operator-source-files.txt:
+        find $(JACOCO_OPERATOR_SRCDIR) -name '*.java' | sort > $@
+
+$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt stamps/test-extensions-compile.stamp
         mkdir -p $(JUNIT_RUNNER_DIR) && \
         $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
           -d $(JUNIT_RUNNER_DIR) \
-          -classpath $(JUNIT_JAR):$(JNLP_TESTS_ENGINE_DIR) \
+          -classpath $(JUNIT_JAR):$(TEST_EXTENSIONS_DIR) \
           @junit-runner-source-files.txt && \
         $(BOOT_DIR)/bin/jar cf $@  -C $(JUNIT_RUNNER_DIR) .
 
 stamps/junit-jnlp-dist-dirs: junit-jnlp-dist-simple.txt stamps/junit-jnlp-dist-signed.stamp junit-jnlp-dist-custom.txt
-        mkdir -p $(JNLP_TESTS_SERVER_DEPLOYDIR)
-        mkdir -p $(JNLP_TESTS_DIR)
+        mkdir -p $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
+        mkdir -p $(REPRODUCERS_BUILD_DIR)
         touch $@
 
 junit-jnlp-dist-custom.txt:
-        cd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
+        cd $(REPRODUCERS_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
         find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
 
 junit-jnlp-dist-simple.txt:
-        cd $(JNLP_TESTS_SRCDIR)/simple/ ; \
+        cd $(REPRODUCERS_TESTS_SRCDIR)/simple/ ; \
         find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
 
@@ -1035 +1231 @@
         types=($(SIGNED_REPRODUCERS)) ; \
         for which in "$${types[@]}" ; do \
-          pushd $(JNLP_TESTS_SRCDIR)/$$which/ ; \
+          pushd $(REPRODUCERS_TESTS_SRCDIR)/$$which/ ; \
           find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
           popd ; \
@@ -1042 +1238 @@
         touch $@
 
-stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs
+stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/liveconnect-dist.stamp stamps/netx-dist.stamp stamps/plugin.stamp
         types=($(ALL_NONCUSTOM_REPRODUCERS)); \
         for which in "$${types[@]}" ; do \
@@ -1050 +1246 @@
           for dir in "$${simpleReproducers[@]}" ; do \
             echo "processing: $$dir" ; \
-            mkdir -p "$(JNLP_TESTS_DIR)/$$dir" ; \
-            if [ -e "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ]; then \
+            mkdir -p "$(REPRODUCERS_BUILD_DIR)/$$dir" ; \
+            if [ -e "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/srcs/" ]; then \
               d=`pwd` ; \
-              cd "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ; \
+              cd "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/srcs/" ; \
               srcFiles=`find . -mindepth 1 -type f -name "*.java" | sed "s/.\/*//"` ; \
               notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
-              $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar -d "$(JNLP_TESTS_DIR)/$$dir/" $$srcFiles ; \
+              $(BOOT_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \
               if [ -n "$$notSrcFiles" ] ; then \
-                cp -R --parents $$notSrcFiles "$(JNLP_TESTS_DIR)/$$dir/" ; \
+                cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
               fi ; \
-              cd "$(JNLP_TESTS_DIR)/$$dir/" ; \
+              cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \
               if [ -f $(META_MANIFEST) ]; \
               then \
-                $(BOOT_DIR)/bin/jar cfm "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $(META_MANIFEST) * ; \
+                $(BOOT_DIR)/bin/jar cfm "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $(META_MANIFEST) * ; \
               else \
-                $(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
+                $(BOOT_DIR)/bin/jar cf "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
               fi; \
               cd "$$d" ; \
@@ -1084 +1280 @@
             IFS="$$IFS_BACKUP" ; \
           for dir in "$${signedReproducers[@]}" ; do \
-           $(BOOT_DIR)/bin/jarsigner -keystore $$keystore -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)  "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar"  $$tcaw ; \
+           $(BOOT_DIR)/bin/jarsigner -keystore $$keystore -storepass $(PRIVATE_KEYSTORE_PASS) -keypass $(PRIVATE_KEYSTORE_PASS)  "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar"  $$tcaw ; \
           done ; \
         done ; \
@@ -1091 +1287 @@
 
 stamps/change-dots-to-paths.stamp: stamps/netx-dist-tests-sign-some-reproducers.stamp
-        pushd  $(JNLP_TESTS_SERVER_DEPLOYDIR); \
+        pushd  $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR); \
         types=($(ALL_NONCUSTOM_REPRODUCERS)); \
         for which in "$${types[@]}" ; do \
@@ -1127 +1323 @@
 stamps/exported-test-certs.stamp: stamps/change-dots-to-paths.stamp
         -types=($(SIGNED_REPRODUCERS)) ; \
+        PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \
+        if test "x$$PUBLIC_KEYSTORE" = x; then \
+          PUBLIC_KEYSTORE=${HOME}/.config ; \
+        fi ;\
+        PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
+        keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
+        [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \
         for which in "$${types[@]}" ; do \
-          $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) ; \
+          $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \
         done ;
         types=($(SIGNED_REPRODUCERS)) ; \
         for which in "$${types[@]}" ; do \
-          keytool -export -alias $(TEST_CERT_ALIAS)_$$which -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) -storepass $(PRIVATE_KEYSTORE_PASS) -keystore $(PRIVATE_KEYSTORE_NAME) ; \
+          $(BOOT_DIR)/bin/keytool -export -alias $(TEST_CERT_ALIAS)_$$which -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) -storepass $(PRIVATE_KEYSTORE_PASS) -keystore $(PRIVATE_KEYSTORE_NAME) ; \
         done ;
         mkdir -p stamps && \
@@ -1139 +1342 @@
 stamps/netx-dist-tests-import-cert-to-public: stamps/exported-test-certs.stamp
         types=($(SIGNED_REPRODUCERS)) ; \
+        PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \
+        if test "x$$PUBLIC_KEYSTORE" = x; then \
+          PUBLIC_KEYSTORE=${HOME}/.config ; \
+        fi ;\
+        PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
+        keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
+        [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \
         for which in "$${types[@]}" ; do \
-          yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\
+          yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\
         done ;
         mkdir -p stamps && \
@@ -1147 +1357 @@
 netx-dist-tests-remove-cert-from-public:
         -types=($(SIGNED_REPRODUCERS)) ; \
+        PUBLIC_KEYSTORE=$$XDG_CONFIG_HOME ; \
+        if test "x$$PUBLIC_KEYSTORE" = x; then \
+          PUBLIC_KEYSTORE=${HOME}/.config ; \
+        fi ;\
+        PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
+        keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
+        [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \
         for which in "$${types[@]}" ; do \
-          $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $(PUBLIC_KEYSTORE) -storepass $(PUBLIC_KEYSTORE_PASS) ; \
+          $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \
         done ;
         -rm -rf stamps/netx-dist-tests-import-cert-to-public
 
-netx-dist-tests-source-files.txt:
-        find $(JNLP_TESTS_ENGINE_SRCDIR) -name '*.java' | sort > $@
-
-stamps/netx-dist-tests-compile.stamp: stamps/netx.stamp \
- stamps/junit-jnlp-dist-dirs netx-dist-tests-source-files.txt
-        mkdir -p $(JNLP_TESTS_ENGINE_DIR);
+test-extensions-source-files.txt:
+        find $(TEST_EXTENSIONS_SRCDIR) -name '*.java' | sort > $@
+
+stamps/test-extensions-compile.stamp: stamps/netx-dist.stamp stamps/plugin.stamp stamps/junit-jnlp-dist-dirs test-extensions-source-files.txt
+        mkdir -p $(TEST_EXTENSIONS_DIR);
+        mkdir -p $(NETX_TEST_DIR);
+        ln -s $(TEST_EXTENSIONS_DIR) $(TEST_EXTENSIONS_COMPATIBILITY_SYMLINK);
         $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-         -d $(JNLP_TESTS_ENGINE_DIR) \
-         -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar \
-         @netx-dist-tests-source-files.txt && \
+         -d $(TEST_EXTENSIONS_DIR) \
+         -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar \
+         @test-extensions-source-files.txt && \
         mkdir -p stamps && \
         touch $@
 
-netx-dist-tests-tests-source-files.txt:
-        find $(JNLP_TESTS_ENGINE_TESTS_SRCDIR) -name '*.java' | sort > $@
-
-stamps/netx-dist-tests-tests-compile.stamp: stamps/junit-jnlp-dist-dirs netx-dist-tests-tests-source-files.txt  stamps/netx-dist-tests-compile.stamp
-        mkdir -p $(JNLP_TESTS_ENGINE_TESTS_DIR);
+test-extensions-tests-source-files.txt:
+        find $(TEST_EXTENSIONS_TESTS_SRCDIR) -name '*.java' | sort > $@
+
+stamps/test-extensions-tests-compile.stamp: stamps/junit-jnlp-dist-dirs test-extensions-tests-source-files.txt  stamps/test-extensions-compile.stamp
+        mkdir -p $(TEST_EXTENSIONS_TESTS_DIR);
         $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-         -d $(JNLP_TESTS_ENGINE_TESTS_DIR) \
-         -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
-         @netx-dist-tests-tests-source-files.txt && \
+         -d $(TEST_EXTENSIONS_TESTS_DIR) \
+         -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \
+         @test-extensions-tests-source-files.txt && \
         mkdir -p stamps && \
         touch $@
 
-stamps/netx-dist-tests-compile-testcases.stamp: stamps/netx.stamp stamps/junit-jnlp-dist-dirs \
- netx-dist-tests-source-files.txt stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-tests-compile.stamp
+stamps/compile-reproducers-testcases.stamp: stamps/netx-dist.stamp stamps/plugin.stamp stamps/junit-jnlp-dist-dirs \
+ test-extensions-source-files.txt stamps/test-extensions-compile.stamp stamps/test-extensions-tests-compile.stamp
         types=($(ALL_REPRODUCERS)); \
         for which in "$${types[@]}" ; do \
@@ -1186 +1404 @@
           for dir in "$${simpleReproducers[@]}" ; do \
             $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-              -d $(JNLP_TESTS_ENGINE_TESTS_DIR) \
-              -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
-            "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/"* ; \
+              -d $(TEST_EXTENSIONS_TESTS_DIR) \
+              -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \
+            "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/"*.java ; \
+            if [ -d "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases" ]; then \
+                pushd "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases" ; \
+                NONJAVA_RESOURCES=`ls | grep -v ".*\\.java$$"` ; \
+                if [ -n "$$NONJAVA_RESOURCES" ]; then \
+                    cp $$NONJAVA_RESOURCES $(TEST_EXTENSIONS_TESTS_DIR)/ ; \
+                fi ; \
+                popd ; \
+            fi ; \
           done ; \
         done ; \
@@ -1194 +1420 @@
         touch $@
 
-stamps/netx-dist-tests-copy-resources.stamp: stamps/junit-jnlp-dist-dirs
+stamps/copy-reproducers-resources.stamp: stamps/junit-jnlp-dist-dirs
         types=($(ALL_REPRODUCERS)); \
         for which in "$${types[@]}" ; do \
@@ -1201 +1427 @@
           IFS="$$IFS_BACKUP" ; \
           for dir in "$${simpleReproducers[@]}" ; do \
-            cp -R "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/"*  $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
+            cp -R "$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/resources/"*  $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/ ; \
           done ; \
         done ; \
@@ -1209 +1435 @@
 $(REPRODUCERS_CLASS_NAMES): $(REPRODUCERS_CLASS_WHITELIST)
         whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
-        cd $(JNLP_TESTS_ENGINE_TESTS_DIR) ; \
+        cd $(TEST_EXTENSIONS_TESTS_DIR) ; \
         class_names= ; \
         for test in `find -type f` ; do \
@@ -1231 +1457 @@
         echo $$class_names > $(REPRODUCERS_CLASS_NAMES)
 
-stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
- javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop \
- stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
- stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-compile-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/netx-dist-tests-copy-resources.stamp\
+$(TESTS_DIR)/$(SOFTKILLER):
+        cd  $(TESTS_SRCDIR)/$(SOFTKILLER); \
+        $(MAKE) ; \
+        mv $(SOFTKILLER) $(TESTS_DIR)/
+
+stamps/run-netx-dist-tests.stamp: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \
+ javaws.desktop stamps/docs.stamp launcher.build/$(itweb_settings) itweb-settings.desktop launcher.build/$(policyeditor) policyeditor.desktop \
+ stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public $(TESTS_DIR)/softkiller \
+ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp\
  $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp
-        cd $(JNLP_TESTS_ENGINE_DIR) ; \
+        cd $(TEST_EXTENSIONS_DIR) ; \
         class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
-        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(JNLP_TESTS_ENGINE_TESTS_DIR) \
+        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) ; \
           $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
-         -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
-@WITH_XSLTPROC_TRUE@    $(XSLTPROC)  $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(JNLP_TESTS_ENGINE_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_reproducers.html
-@WITH_XSLTPROC_TRUE@    $(XSLTPROC)  --stringparam logs logs_reproducers.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html
+         -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names
+@WITH_XSLTPROC_TRUE@    -$(XSLTPROC)  --stringparam logs logs_reproducers.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(TEST_EXTENSIONS_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html
+@WITH_XSLTPROC_TRUE@    -$(XSLTPROC)  $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(TEST_EXTENSIONS_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_reproducers.html
+@WITH_XSLTPROC_TRUE@    -$(XSLTPROC)  $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/textreport.xsl $(TEST_EXTENSIONS_DIR)/tests-output.xml > $(TESTS_DIR)/summary_reproducers.txt
         touch $@
 
 stamps/process-custom-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
- stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-compile-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/netx-dist-tests-copy-resources.stamp\
+ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp\
  $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES)
         . $(abs_top_srcdir)/NEW_LINE_IFS ; \
@@ -1252 +1484 @@
         IFS="$$IFS_BACKUP" ; \
         for dir in "$${customReproducers[@]}" ; do \
-          pushd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/$$dir/srcs; \
+          pushd $(REPRODUCERS_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/$$dir/srcs; \
           $(MAKE) prepare-reproducer ; \
           popd ; \
@@ -1264 +1496 @@
         IFS="$$IFS_BACKUP" ; \
         for dir in "$${customReproducers[@]}" ; do \
-          pushd $(JNLP_TESTS_SRCDIR)/custom/$$dir/srcs; \
+          pushd $(REPRODUCERS_TESTS_SRCDIR)/custom/$$dir/srcs; \
           $(MAKE) clean-reproducer ; \
           popd ; \
@@ -1273 +1505 @@
 #although this targets will indeed create symbolic links to enable 
 #icedtea-web plugin inside browser it is intended for testing purposes
-@ENABLE_PLUGIN_TRUE@stamps/user-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp \
+@ENABLE_PLUGIN_TRUE@stamps/user-links.stamp: stamps/netx-dist.stamp stamps/plugin.stamp \
 @ENABLE_PLUGIN_TRUE@ launcher.build/$(javaws) stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) 
 @ENABLE_PLUGIN_TRUE@    if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
@@ -1303 +1535 @@
 @ENABLE_PLUGIN_TRUE@    fi
 
-@ENABLE_PLUGIN_TRUE@stamps/global-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
+@ENABLE_PLUGIN_TRUE@stamps/global-links.stamp: stamps/netx-dist.stamp stamps/plugin.stamp launcher.build/$(javaws) \
 @ENABLE_PLUGIN_TRUE@ stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
 @ENABLE_PLUGIN_TRUE@    if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
@@ -1378 +1610 @@
 
 stamps/netx-unit-tests-compile.stamp: stamps/netx.stamp \
- netx-unit-tests-source-files.txt stamps/netx-dist-tests-compile.stamp
+ netx-unit-tests-source-files.txt stamps/test-extensions-compile.stamp
         mkdir -p $(NETX_UNIT_TEST_DIR) && \
         $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
          -d $(NETX_UNIT_TEST_DIR) \
-         -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
+         -classpath $(JUNIT_JAR):$(abs_top_builddir)/liveconnect/lib/classes.jar:$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR):$(TAGSOUP_JAR) \
          @netx-unit-tests-source-files.txt && \
         mkdir -p stamps && \
@@ -1412 +1644 @@
         cd $(NETX_UNIT_TEST_DIR) ; \
         class_names=`cat $(UNIT_CLASS_NAMES)` ; \
-        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(JNLP_TESTS_ENGINE_DIR):. \
-          $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names 
-@WITH_XSLTPROC_TRUE@    $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(NETX_UNIT_TEST_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_unit.html
-@WITH_XSLTPROC_TRUE@    $(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html
+        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \
+          $(BOOT_DIR)/bin/java -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names 
+@WITH_XSLTPROC_TRUE@    -$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html
+@WITH_XSLTPROC_TRUE@    -$(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(NETX_UNIT_TEST_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_unit.html
+@WITH_XSLTPROC_TRUE@    -$(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/textreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/summary_unit.txt
         mkdir -p stamps && \
         touch $@
@@ -1429 +1662 @@
 @WITH_EMMA_TRUE@        done ;\
 @WITH_EMMA_TRUE@        class_names=`cat $(UNIT_CLASS_NAMES)` ; \
-@WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emmarun \
+@WITH_EMMA_TRUE@        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) ; \
+@WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emmarun \
 @WITH_EMMA_TRUE@         -Dreport.html.out.encoding=UTF-8 \
 @WITH_EMMA_TRUE@         -raw \
@@ -1444 +1678 @@
 @WITH_EMMA_TRUE@         -cp $(BOOT_DIR)/jre/lib/resources.jar \
 @WITH_EMMA_TRUE@         -cp $(RHINO_RUNTIME) \
-@WITH_EMMA_TRUE@         -cp $(JNLP_TESTS_ENGINE_DIR) \
+@WITH_EMMA_TRUE@         -cp $(TEST_EXTENSIONS_DIR) \
+@WITH_EMMA_TRUE@         -cp $(TEST_EXTENSIONS_SRCDIR) \
+@WITH_EMMA_TRUE@if HAVE_TAGSOUP
+@WITH_EMMA_TRUE@         -cp $(TAGSOUP_JAR) \
+@WITH_EMMA_TRUE@endif
 @WITH_EMMA_TRUE@         -cp . \
 @WITH_EMMA_TRUE@         -ix "-org.junit.*" \
@@ -1457 +1695 @@
         touch $@
 
+stamps/compile-jacoco-operator.stamp: jacoco-operator-source-files.txt
+@WITH_JACOCO_TRUE@      mkdir -p $(JACOCO_OPERATOR_DIR) && \
+@WITH_JACOCO_TRUE@      $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+@WITH_JACOCO_TRUE@        -d $(JACOCO_OPERATOR_DIR) \
+@WITH_JACOCO_TRUE@        -classpath $(JACOCO_CLASSPATH) \
+@WITH_JACOCO_TRUE@        @jacoco-operator-source-files.txt ;
+@WITH_JACOCO_FALSE@     echo "Sorry, jacoco coverage report generator  cant be compiled without jacoco installed. Try installing jacoco or specify with-jacoco value" ;
+@WITH_JACOCO_FALSE@     exit 5
+        touch $@
+
+#warning,  during this target tests.build/netx/unit/tests-output.xml is backup and rewriten (but not coresponding html file)
+#xml results run with jacoco agent however, can be wrong, co the new tests-output.xml is then renamed and orginal one restored
+stamps/run-unit-test-code-coverage-jacoco.stamp: stamps/netx-unit-tests-compile.stamp $(JUNIT_RUNNER_JAR)  \
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES) stamps/compile-jacoco-operator.stamp
+@WITH_JACOCO_TRUE@      filename=" " ; \
+@WITH_JACOCO_TRUE@      cd $(NETX_UNIT_TEST_SRCDIR) ; \
+@WITH_JACOCO_TRUE@      for file in `find . -type f \! -iname "*.java"`; do\
+@WITH_JACOCO_TRUE@              filename=`echo $$file `; \
+@WITH_JACOCO_TRUE@              cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
+@WITH_JACOCO_TRUE@      done ; \
+@WITH_JACOCO_TRUE@      cd $(NETX_UNIT_TEST_DIR) ; \
+@WITH_JACOCO_TRUE@      for file in $(EMMA_MODIFIED_FILES) ; do \
+@WITH_JACOCO_TRUE@        mv $(NETX_UNIT_TEST_DIR)/$$file  $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
+@WITH_JACOCO_TRUE@      done ;\
+@WITH_JACOCO_TRUE@      class_names=`cat $(UNIT_CLASS_NAMES)` ; \
+@WITH_JACOCO_TRUE@      CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) ; \
+@WITH_JACOCO_TRUE@        $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH  CommandLine $$class_names ; \
+@WITH_JACOCO_TRUE@      for file in $(EMMA_MODIFIED_FILES) ; do \
+@WITH_JACOCO_TRUE@        mv $(NETX_UNIT_TEST_DIR)/$$file  $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
+@WITH_JACOCO_TRUE@        mv $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)"  $(NETX_UNIT_TEST_DIR)/$$file ; \
+@WITH_JACOCO_TRUE@      done ; \
+@WITH_JACOCO_TRUE@      $(JACOCO_OPERATOR_EXEC) \
+@WITH_JACOCO_TRUE@        report --die-soon --html-output coverage --xml-output coverage.xml --input-file jacoco.exec \
+@WITH_JACOCO_TRUE@        --input-srcs  $(NETX_SRCDIR) $(PLUGIN_SRCDIR)/java $(NETX_UNIT_TEST_SRCDIR) $(JUNIT_RUNNER_SRCDIR) $(TEST_EXTENSIONS_SRCDIR) \
+@WITH_JACOCO_TRUE@        --input-builds $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar $(NETX_UNIT_TEST_DIR) $(JUNIT_RUNNER_JAR)  $(TEST_EXTENSIONS_DIR) \
+@WITH_JACOCO_TRUE@        --title "IcedTea-Web unit-tests codecoverage" ;
+@WITH_JACOCO_FALSE@     echo "Sorry, coverage report cant be run without jacoco installed. Try installing jacoco or specify with-jacoco value" ;
+@WITH_JACOCO_FALSE@     exit 5
+        touch $@
+
 #warning,  during this target tests.build/netx/jnlp_testsengine/tests-output.xml is backup and rewriten (but not coresponding html file)
 #xml results run from emma sandbox, however, can be wrong, co the new tests-output.xml is then renamed and orginal one restored
@@ -1462 +1740 @@
 @WITH_EMMA_TRUE@        cd $(TESTS_DIR) ; \
 @WITH_EMMA_TRUE@        for file in $(EMMA_MODIFIED_FILES) ; do \
-@WITH_EMMA_TRUE@          mv $(JNLP_TESTS_ENGINE_DIR)/$$file $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
+@WITH_EMMA_TRUE@          mv $(TEST_EXTENSIONS_DIR)/$$file $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
 @WITH_EMMA_TRUE@        done ;\
 @WITH_EMMA_TRUE@        echo "backuping javaws and netx.jar in $(DESTDIR)" ; \
@@ -1490 +1768 @@
 @WITH_EMMA_TRUE@            testcases_srcs[k]="-sp" ; \
 @WITH_EMMA_TRUE@            k=$$((k+1)) ; \
-@WITH_EMMA_TRUE@            testcases_srcs[k]="$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
+@WITH_EMMA_TRUE@            testcases_srcs[k]="$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
 @WITH_EMMA_TRUE@            k=$$((k+1)) ; \
 @WITH_EMMA_TRUE@            done ; \
 @WITH_EMMA_TRUE@          done ; \
-@WITH_EMMA_TRUE@        cd $(JNLP_TESTS_ENGINE_DIR) ; \
+@WITH_EMMA_TRUE@        cd $(TEST_EXTENSIONS_DIR) ; \
 @WITH_EMMA_TRUE@        class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
+@WITH_EMMA_TRUE@        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) ; \
 @WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/java  \
 @WITH_EMMA_TRUE@         $(EMMA_JAVA_ARGS) \
 @WITH_EMMA_TRUE@          $(REPRODUCERS_DPARAMETERS) \
-@WITH_EMMA_TRUE@         -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) emmarun  \
+@WITH_EMMA_TRUE@         -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH -cp $(EMMA_JAR) emmarun  \
 @WITH_EMMA_TRUE@           -raw \
 @WITH_EMMA_TRUE@           -cp $(NETX_DIR)/lib/classes.jar \
@@ -1509 +1788 @@
 @WITH_EMMA_TRUE@           -cp $(RHINO_RUNTIME) \
 @WITH_EMMA_TRUE@           -cp . \
-@WITH_EMMA_TRUE@           -cp $(JNLP_TESTS_ENGINE_TESTS_DIR) \
+@WITH_EMMA_TRUE@           -cp $(TEST_EXTENSIONS_SRCDIR) \
+@WITH_EMMA_TRUE@           -cp $(TEST_EXTENSIONS_TESTS_DIR) \
 @WITH_EMMA_TRUE@           -ix "-org.junit.*" \
 @WITH_EMMA_TRUE@           -ix "-junit.*" \
 @WITH_EMMA_TRUE@           CommandLine $$class_names ; \
-@WITH_EMMA_TRUE@        mv $(JNLP_TESTS_ENGINE_DIR)/coverage.ec $(JNLP_TESTS_ENGINE_DIR)/coverageX.ec ; \
-@WITH_EMMA_TRUE@        mv $(JNLP_TESTS_ENGINE_DIR)/coverage.es $(JNLP_TESTS_ENGINE_DIR)/coverageX.es ; \
+@WITH_EMMA_TRUE@        mv $(TEST_EXTENSIONS_DIR)/coverage.ec $(TEST_EXTENSIONS_DIR)/coverageX.ec ; \
+@WITH_EMMA_TRUE@        mv $(TEST_EXTENSIONS_DIR)/coverage.es $(TEST_EXTENSIONS_DIR)/coverageX.es ; \
 @WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) emma merge \
 @WITH_EMMA_TRUE@          -in $(TESTS_DIR)/coverage.em \
-@WITH_EMMA_TRUE@          -in $(JNLP_TESTS_ENGINE_DIR)/coverageX.ec \
-@WITH_EMMA_TRUE@          -in $(JNLP_TESTS_ENGINE_DIR)/coverageX.es ; \
+@WITH_EMMA_TRUE@          -in $(TEST_EXTENSIONS_DIR)/coverageX.ec \
+@WITH_EMMA_TRUE@          -in $(TEST_EXTENSIONS_DIR)/coverageX.es ; \
 @WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR)  -Demma.report.html.out.encoding=UTF-8 emma report \
 @WITH_EMMA_TRUE@          -Dreport.html.out.encoding=UTF-8 \
-@WITH_EMMA_TRUE@          -in $(JNLP_TESTS_ENGINE_DIR)/coverage.es  \
+@WITH_EMMA_TRUE@          -in $(TEST_EXTENSIONS_DIR)/coverage.es  \
 @WITH_EMMA_TRUE@          -sp $(NETX_SRCDIR) \
 @WITH_EMMA_TRUE@          -sp $(NETX_UNIT_TEST_SRCDIR) \
 @WITH_EMMA_TRUE@          -sp $(JUNIT_RUNNER_SRCDIR) \
-@WITH_EMMA_TRUE@          -sp $(JNLP_TESTS_ENGINE_SRCDIR) \
-@WITH_EMMA_TRUE@          -sp $(JNLP_TESTS_ENGINE_TESTS_SRCDIR) \
+@WITH_EMMA_TRUE@          -sp $(TEST_EXTENSIONS_SRCDIR) \
+@WITH_EMMA_TRUE@          -sp $(TEST_EXTENSIONS_TESTS_SRCDIR) \
 @WITH_EMMA_TRUE@          -r html \
 @WITH_EMMA_TRUE@          -r xml \
@@ -1536 +1816 @@
 @WITH_EMMA_TRUE@        mv $$netx_backup $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar ; \
 @WITH_EMMA_TRUE@        for file in $(EMMA_MODIFIED_FILES) ; do \
-@WITH_EMMA_TRUE@          mv $(JNLP_TESTS_ENGINE_DIR)/$$file  $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
-@WITH_EMMA_TRUE@          mv $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)"  $(JNLP_TESTS_ENGINE_DIR)/$$file ; \
+@WITH_EMMA_TRUE@          mv $(TEST_EXTENSIONS_DIR)/$$file  $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
+@WITH_EMMA_TRUE@          mv $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)"  $(TEST_EXTENSIONS_DIR)/$$file ; \
 @WITH_EMMA_TRUE@        done ;\
-@WITH_EMMA_TRUE@        rm $(JNLP_TESTS_ENGINE_DIR)/coverage.txt ; 
+@WITH_EMMA_TRUE@        rm $(TEST_EXTENSIONS_DIR)/coverage.txt ; 
 @WITH_EMMA_FALSE@       echo "Sorry, coverage report cant be run without emma installed. Try install emma or specify with-emma value" ;
 @WITH_EMMA_FALSE@       exit 5
         touch $@
 
-run-test-code-coverage: run-unit-test-code-coverage run-reproducers-test-code-coverage
+$(COVERABLE_PLUGIN_DIR):
+        mkdir -p $(COVERABLE_PLUGIN_DIR);
+
+$(COVERABLE_PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
+        cd $(COVERABLE_PLUGIN_DIR) && \
+        $(CXX) $(CXXFLAGS) \
+           $(DEFS) $(VERSION_DEFS) \
+          -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
+          -DPLUGIN_NAME="\"IcedTea-Web Plugin with jacoco coverage agent\"" \
+          -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
+          -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
+          -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
+          -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
+          -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_COVERAGE_BOOTCLASSPATH) \
+          -DCOVERAGE_AGENT=$(JACOCO_AGENT_PLUGIN_SWITCH) \
+          $(GLIB_CFLAGS) \
+          $(MOZILLA_CFLAGS) \
+          -fvisibility=hidden \
+          -fPIC -o $@ -c $<
+
+$(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
+        cd $(COVERABLE_PLUGIN_DIR) && \
+        $(CXX) $(CXXFLAGS) \
+          $(PLUGIN_OBJECTS) \
+          $(GLIB_LIBS) \
+          $(MOZILLA_LIBS) \
+          -shared -o $@
+
+stamps/build-fake-plugin.stamp:  $(COVERABLE_PLUGIN_DIR)  $(addprefix $(PLUGIN_SRCDIR)/,$(PLUGIN_SRC)) $(addprefix $(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) stamps/liveconnect-dist.stamp  $(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY)
+        touch $@
+
+#warning,  during this target tests.build/netx/jnlp_testsengine/tests-output.xml is backup and rewriten (but not coresponding html file)
+#xml results run with jacoco agent, however, can be wrong, co the new tests-output.xml is then renamed and orginal one restored
+stamps/run-reproducers-test-code-coverage-jacoco.stamp: stamps/run-netx-dist-tests.stamp $(REPRODUCERS_CLASS_NAMES) \
+stamps/compile-jacoco-operator.stamp stamps/build-fake-plugin.stamp
+@WITH_JACOCO_TRUE@      cd $(TESTS_DIR) ; \
+@WITH_JACOCO_TRUE@      for file in $(EMMA_MODIFIED_FILES) ; do \
+@WITH_JACOCO_TRUE@        mv $(TEST_EXTENSIONS_DIR)/$$file $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
+@WITH_JACOCO_TRUE@      done ;\
+@WITH_JACOCO_TRUE@      echo "backuping javaws in $(DESTDIR)$(bindir)" ; \
+@WITH_JACOCO_TRUE@      javaws_backup=$(DESTDIR)$(bindir)/javaws_backup ; \
+@WITH_JACOCO_TRUE@      mv $(DESTDIR)$(bindir)/javaws $$javaws_backup ;  \
+@WITH_JACOCO_TRUE@      echo "patching $(javaws)" ; \
+@WITH_JACOCO_TRUE@      nw_bootclasspath="$(LAUNCHER_BOOTCLASSPATH):$(JACOCO_CLASSPATH)" ; \
+@WITH_JACOCO_TRUE@      cat $$javaws_backup | sed "s|COMMAND.k.=\"..JAVA.\"|COMMAND[k]=\"\\$$\\{JAVA\\}\" ;  k=1 ; COMMAND[k]=$(JACOCO_AGENT_JAVAWS_SWITCH)|" | sed "s,$(LAUNCHER_BOOTCLASSPATH),$$nw_bootclasspath," > $(DESTDIR)$(bindir)/$(javaws) ; \
+@WITH_JACOCO_TRUE@      chmod 777 $(DESTDIR)$(bindir)/$(javaws) ; \
+@WITH_JACOCO_TRUE@      echo "backuping plugin in $(DESTDIR)/$(libdir)$(BUILT_PLUGIN_LIBRARY)" ; \
+@WITH_JACOCO_TRUE@      plugin_backup=$(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)_backup ; \
+@WITH_JACOCO_TRUE@      mv $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) $$plugin_backup ;  \
+@WITH_JACOCO_TRUE@      echo "fakeing plugin" ; \
+@WITH_JACOCO_TRUE@      cp $(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) ; \
+@WITH_JACOCO_TRUE@      testcases_srcs=( ) ; \
+@WITH_JACOCO_TRUE@      k=0 ; \
+@WITH_JACOCO_TRUE@      types=($(ALL_REPRODUCERS)); \
+@WITH_JACOCO_TRUE@      for which in "$${types[@]}" ; do \
+@WITH_JACOCO_TRUE@        . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+@WITH_JACOCO_TRUE@        simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+@WITH_JACOCO_TRUE@        IFS="$$IFS_BACKUP" ; \
+@WITH_JACOCO_TRUE@        for dir in "$${simpleReproducers[@]}" ; do \
+@WITH_JACOCO_TRUE@          testcases_srcs[k]="$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
+@WITH_JACOCO_TRUE@          k=$$((k+1)) ; \
+@WITH_JACOCO_TRUE@          done ; \
+@WITH_JACOCO_TRUE@        done ; \
+@WITH_JACOCO_TRUE@      cd $(TEST_EXTENSIONS_DIR) ; \
+@WITH_JACOCO_TRUE@      class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
+@WITH_JACOCO_TRUE@      CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) ; \
+@WITH_JACOCO_TRUE@        $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) $(REPRODUCERS_DPARAMETERS) \
+@WITH_JACOCO_TRUE@       -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names ; \
+@WITH_JACOCO_TRUE@      if [ -f $(JACOCO_JAVAWS_RESULTS) ] ; then \
+@WITH_JACOCO_TRUE@        jacoco_javaws_results=$(JACOCO_JAVAWS_RESULTS) ; \
+@WITH_JACOCO_TRUE@        $(JACOCO_OPERATOR_EXEC) \
+@WITH_JACOCO_TRUE@          report --die-soon --html-output coverage-javaws --xml-output coverage-javaws.xml --input-file $(JACOCO_JAVAWS_RESULTS) \
+@WITH_JACOCO_TRUE@          --input-srcs  $(NETX_SRCDIR) \
+@WITH_JACOCO_TRUE@          --input-builds $(NETX_DIR)/lib/classes.jar \
+@WITH_JACOCO_TRUE@          --title "IcedTea-Web javaws reproducers codecoverage" ; \
+@WITH_JACOCO_TRUE@      fi; \
+@WITH_JACOCO_TRUE@      if [ -f $(JACOCO_PLUGIN_RESULTS) ] ; then \
+@WITH_JACOCO_TRUE@        jacoco_plugin_results=$(JACOCO_PLUGIN_RESULTS) ; \
+@WITH_JACOCO_TRUE@        $(JACOCO_OPERATOR_EXEC) \
+@WITH_JACOCO_TRUE@          report --die-soon --html-output coverage-plugin --xml-output coverage-plugin.xml --input-file $(JACOCO_PLUGIN_RESULTS) \
+@WITH_JACOCO_TRUE@          --input-srcs  $(NETX_SRCDIR) $(PLUGIN_SRCDIR)/java \
+@WITH_JACOCO_TRUE@          --input-builds $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar \
+@WITH_JACOCO_TRUE@          --title "IcedTea-Web plugin reproducers codecoverage" ; \
+@WITH_JACOCO_TRUE@      fi; \
+@WITH_JACOCO_TRUE@      $(JACOCO_OPERATOR_EXEC) \
+@WITH_JACOCO_TRUE@        merge --die-soon --input-files jacoco.exec $$jacoco_javaws_results $$jacoco_plugin_results  --output-file jacoco-merged-reproducers.exec ; \
+@WITH_JACOCO_TRUE@      $(JACOCO_OPERATOR_EXEC) \
+@WITH_JACOCO_TRUE@        report --html-output coverage --xml-output coverage.xml --input-file jacoco-merged-reproducers.exec \
+@WITH_JACOCO_TRUE@        --input-srcs  $(NETX_SRCDIR) $(PLUGIN_SRCDIR)/java  $(JUNIT_RUNNER_SRCDIR) $(TEST_EXTENSIONS_SRCDIR) $(TEST_EXTENSIONS_TESTS_SRCDIR) "$${testcases_srcs[@]}" \
+@WITH_JACOCO_TRUE@        --input-builds $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar  $(JUNIT_RUNNER_JAR)  $(TEST_EXTENSIONS_DIR) $(TEST_EXTENSIONS_TESTS_DIR) \
+@WITH_JACOCO_TRUE@        --title "IcedTea-Web reproducers-tests codecoverage" ; \
+@WITH_JACOCO_TRUE@      echo "restoring javaws in $(DESTDIR)$(bindir)" ; \
+@WITH_JACOCO_TRUE@      rm -f $(DESTDIR)$(bindir)/$(javaws);  \
+@WITH_JACOCO_TRUE@      mv $$javaws_backup $(DESTDIR)$(bindir)/$(javaws);  \
+@WITH_JACOCO_TRUE@      echo "restoring  plugin in $(DESTDIR)/$(libdir)$(BUILT_PLUGIN_LIBRARY)" ; \
+@WITH_JACOCO_TRUE@      mv $$plugin_backup $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) ; \
+@WITH_JACOCO_TRUE@      for file in $(EMMA_MODIFIED_FILES) ; do \
+@WITH_JACOCO_TRUE@        mv $(TEST_EXTENSIONS_DIR)/$$file  $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
+@WITH_JACOCO_TRUE@        mv $(TEST_EXTENSIONS_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)"  $(TEST_EXTENSIONS_DIR)/$$file ; \
+@WITH_JACOCO_TRUE@      done ;
+@WITH_JACOCO_FALSE@     echo "Sorry, coverage report cant be run without jacoco installed. Try installing jacoco or specify with-jacoco value" ;
+@WITH_JACOCO_FALSE@     exit 5
+        touch $@
+
+run-test-code-coverage-jacoco: stamps/run-unit-test-code-coverage-jacoco.stamp stamps/run-reproducers-test-code-coverage-jacoco.stamp
+@WITH_JACOCO_TRUE@      cd $(TESTS_DIR) ; \
+@WITH_JACOCO_TRUE@      k=0 ; \
+@WITH_JACOCO_TRUE@      types=($(ALL_REPRODUCERS)); \
+@WITH_JACOCO_TRUE@      for which in "$${types[@]}" ; do \
+@WITH_JACOCO_TRUE@        . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+@WITH_JACOCO_TRUE@        simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+@WITH_JACOCO_TRUE@        IFS="$$IFS_BACKUP" ; \
+@WITH_JACOCO_TRUE@        for dir in "$${simpleReproducers[@]}" ; do \
+@WITH_JACOCO_TRUE@          testcases_srcs[k]="$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
+@WITH_JACOCO_TRUE@          k=$$((k+1)) ; \
+@WITH_JACOCO_TRUE@          done ; \
+@WITH_JACOCO_TRUE@        done ; \
+@WITH_JACOCO_TRUE@      class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
+@WITH_JACOCO_TRUE@      $(JACOCO_OPERATOR_EXEC) \
+@WITH_JACOCO_TRUE@        merge --die-soon --input-files $(TEST_EXTENSIONS_DIR)/jacoco-merged-reproducers.exec $(NETX_UNIT_TEST_DIR)/jacoco.exec  --output-file  jacoco-merged.exec; \
+@WITH_JACOCO_TRUE@      $(JACOCO_OPERATOR_EXEC) \
+@WITH_JACOCO_TRUE@        report --html-output coverage --xml-output coverage.xml --input-file jacoco-merged.exec \
+@WITH_JACOCO_TRUE@        --input-srcs  $(NETX_SRCDIR) $(PLUGIN_SRCDIR)/java  $(JUNIT_RUNNER_SRCDIR) $(TEST_EXTENSIONS_SRCDIR) $(TEST_EXTENSIONS_TESTS_SRCDIR) "$${testcases_srcs[@]}" \
+@WITH_JACOCO_TRUE@        --input-builds $(NETX_DIR)/lib/classes.jar $(abs_top_builddir)/liveconnect/lib/classes.jar  $(JUNIT_RUNNER_JAR)  $(TEST_EXTENSIONS_DIR) $(TEST_EXTENSIONS_TESTS_DIR) \
+@WITH_JACOCO_TRUE@        --input-srcs  $(NETX_UNIT_TEST_SRCDIR)  \
+@WITH_JACOCO_TRUE@        --input-builds $(NETX_UNIT_TEST_DIR)  \
+@WITH_JACOCO_TRUE@        --title "IcedTea-Web complete codecoverage" ; 
+@WITH_JACOCO_FALSE@     echo "Sorry, coverage report cant be run without jacoco installed. Try installing jacoco or specify with-jacoco value" ;
+@WITH_JACOCO_FALSE@     exit 5
+
+run-test-code-coverage: stamps/run-unit-test-code-coverage.stamps stamps/run-reproducers-test-code-coverage.stamps
 @WITH_EMMA_TRUE@        cd $(TESTS_DIR) ; \
 @WITH_EMMA_TRUE@        k=0 ; \
@@ -1555 +1965 @@
 @WITH_EMMA_TRUE@            testcases_srcs[k]="-sp" ; \
 @WITH_EMMA_TRUE@            k=$$((k+1)) ; \
-@WITH_EMMA_TRUE@            testcases_srcs[k]="$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
+@WITH_EMMA_TRUE@            testcases_srcs[k]="$(REPRODUCERS_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
 @WITH_EMMA_TRUE@            k=$$((k+1)) ; \
 @WITH_EMMA_TRUE@          done ; \
@@ -1561 +1971 @@
 @WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) emma merge \
 @WITH_EMMA_TRUE@         -in $(NETX_UNIT_TEST_DIR)/coverage.es \
-@WITH_EMMA_TRUE@         -in $(JNLP_TESTS_ENGINE_DIR)/coverage.es ; \
+@WITH_EMMA_TRUE@         -in $(TEST_EXTENSIONS_DIR)/coverage.es ; \
 @WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR)  -Demma.report.html.out.encoding=UTF-8 emma report \
 @WITH_EMMA_TRUE@         -Dreport.html.out.encoding=UTF-8 \
@@ -1569 +1979 @@
 @WITH_EMMA_TRUE@         -sp $(NETX_UNIT_TEST_SRCDIR) \
 @WITH_EMMA_TRUE@         -sp $(JUNIT_RUNNER_SRCDIR) \
-@WITH_EMMA_TRUE@         -sp $(JNLP_TESTS_ENGINE_SRCDIR) \
-@WITH_EMMA_TRUE@         -sp $(JNLP_TESTS_ENGINE_TESTS_SRCDIR) \
+@WITH_EMMA_TRUE@         -sp $(TEST_EXTENSIONS_SRCDIR) \
+@WITH_EMMA_TRUE@         -sp $(TEST_EXTENSIONS_TESTS_SRCDIR) \
 @WITH_EMMA_TRUE@         "$${testcases_srcs[@]}" \
 @WITH_EMMA_TRUE@         -r html \
@@ -1577 +1987 @@
 @WITH_EMMA_FALSE@       exit 5
 
-clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests clean-test-code-coverage
+run-test-server-on-44321: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
+ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp
+        cd $(TEST_EXTENSIONS_DIR) ; \
+        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) ; \
+          $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
+         -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH net.sourceforge.jnlp.ServerAccess
+
+run-test-server-on-random-port: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
+ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp
+        cd $(TEST_EXTENSIONS_DIR) ; \
+        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) ; \
+          $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
+         -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH net.sourceforge.jnlp.ServerAccess randomport 
+
+clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests clean-test-code-coverage-jacoco clean-test-code-coverage
         if [ -e $(TESTS_DIR)/netx ]; then \
           rmdir $(TESTS_DIR)/netx ; \
@@ -1598 +2022 @@
         rm -rf  $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)/
         rm -f  $(TESTS_DIR)/*.html
-
-clean-netx-dist-tests: clean_tests_reports netx-dist-tests-remove-cert-from-public clean-custom-reproducers
-        rm -f netx-dist-tests-source-files.txt
-        rm -rf $(JNLP_TESTS_ENGINE_TESTS_DIR)
-        rm -rf $(JNLP_TESTS_DIR)
-        rm -rf $(JNLP_TESTS_SERVER_DEPLOYDIR)
-        rm -rf $(JNLP_TESTS_ENGINE_DIR)
+        rm -f $(TESTS_DIR)/summary_unit.txt
+        rm -f $(TESTS_DIR)/summary_reproducers.txt
+
+clean-$(SOFTKILLER):
+        rm -f $(TESTS_DIR)/softkiller
+
+clean-netx-dist-tests: clean_tests_reports netx-dist-tests-remove-cert-from-public clean-custom-reproducers clean-$(SOFTKILLER)
+        rm -f test-extensions-source-files.txt
+        rm -f test-extensions-tests-source-files.txt
+        rm -f $(TEST_EXTENSIONS_COMPATIBILITY_SYMLINK)
+        rm -rf $(TEST_EXTENSIONS_TESTS_DIR)
+        rm -rf $(REPRODUCERS_BUILD_DIR)
+        rm -rf $(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)
+        rm -rf $(TEST_EXTENSIONS_DIR)
         rm -f stamps/junit-jnlp-dist-dirs
-        rm -f stamps/netx-dist-tests-compile.stamp
-        rm -f stamps/netx-dist-tests-tests-compile.stamp
+        rm -f stamps/test-extensions-compile.stamp
+        rm -f stamps/test-extensions-tests-compile.stamp
         rm -f stamps/netx-dist-tests-prepare-reproducers.stamp
-        rm -f stamps/netx-dist-tests-compile-testcases.stamp
-        rm -f stamps/netx-dist-tests-copy-resources.stamp
+        rm -f stamps/compile-reproducers-testcases.stamp
+        rm -f stamps/copy-reproducers-resources.stamp
         rm -f stamps/netx-dist-tests-sign-some-reproducers.stamp
         rm -f stamps/change-dots-to-paths.stamp
@@ -1640 +2071 @@
 clean-reproducers-test-code-coverage:
         if [ -e stamps/run-reproducers-test-code-coverage.stamp ]; then \
-         rm -rf $(JNLP_TESTS_ENGINE_DIR)/coverage ; \
-         rm -f $(JNLP_TESTS_ENGINE_DIR)/coverage.xml ; \
-         rm -f $(JNLP_TESTS_ENGINE_DIR)/coverage.es ; \
-         rm -f $(JNLP_TESTS_ENGINE_DIR)/tests-output_withEmma.xml ; \
+         rm -rf $(TEST_EXTENSIONS_DIR)/coverage ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/coverage.xml ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/coverage.es ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/tests-output_withEmma.xml ; \
          rm -f stamps/run-reproducers-test-code-coverage.stamp ; \
         fi
@@ -1654 +2085 @@
           rm -f $(TESTS_DIR)/coverage.em ; \
         fi
+
+clean-unit-test-code-coverage-jacoco:
+        if [ -e stamps/run-unit-test-code-coverage-jacoco.stamp ]; then \
+          rm -rf $(NETX_UNIT_TEST_DIR)/coverage ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverage.xml ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/jacoco.exec ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/tests-output_withEmma.xml ; \
+          rm -f stamps/run-unit-test-code-coverage-jacoco.stamp ; \
+        fi      
+
+clean-reproducers-test-code-coverage-jacoco:
+        if [ -e stamps/run-reproducers-test-code-coverage-jacoco.stamp ]; then \
+         rm -rf $(TEST_EXTENSIONS_DIR)/coverage-javaws ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/coverage-javaws.xml ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/jacoco_javaws.exec ; \
+         rm -rf $(TEST_EXTENSIONS_DIR)/coverage-plugin ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/coverage-plugin.xml ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/jacoco_plugin.exec ; \
+         rm -rf $(TEST_EXTENSIONS_DIR)/coverage ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/coverage.xml ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/jacoco-merged-reproducers.exec ; \
+         rm -f $(TEST_EXTENSIONS_DIR)/tests-output_withEmma.xml ; \
+         rm -f stamps/run-reproducers-test-code-coverage-jacoco.stamp ; \
+        fi
+
+clean-test-code-coverage-jacoco: clean-unit-test-code-coverage-jacoco clean-reproducers-test-code-coverage-jacoco clean-test-code-coverage-tools-jacoco
+        if [ -e $(TESTS_DIR)/coverage.xml ]; then \
+          rm -rf $(TESTS_DIR)/coverage  ; \
+          rm -f $(TESTS_DIR)/jacoco-merged.exec; \
+        fi
+
+clean-test-code-coverage-tools-jacoco:
+        rm -rf  $(JACOCO_OPERATOR_DIR)
+        rm -rf  $(COVERABLE_PLUGIN_DIR)
+        rm -f stamps/compile-jacoco-operator.stamp;
+        rm -f jacoco-operator-source-files.txt
+        rm -f stamps/build-fake-plugin.stamp
 
 # plugin tests
@@ -1772 +2240 @@
 run-reproducers-test-code-coverage: stamps/run-reproducers-test-code-coverage.stamp
 
+run-unit-test-code-coverage-jacoco: stamps/run-unit-test-code-coverage-jacoco.stamp
+
+run-reproducers-test-code-coverage-jacoco: stamps/run-reproducers-test-code-coverage-jacoco.stamp
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.