Changeset 418

trunk/icedtea-web

Property svn:mergeinfo set to
/branches/vendor/sourceforge/icedtea-web/1.3 merged eligible
/branches/vendor/sourceforge/icedtea-web/current merged eligible

trunk/icedtea-web/AUTHORS

-              r348
+              r418
 Deepak Bhole <dbhole@redhat.com>
 Ricardo MartÃn Camarero <rickyepoderi@yahoo.es>
+Danesh Dadachanji <ddadacha@redhat.com>
+Adam Domurad <adomurad@redhat.com>
 Thomas Fitzsimmons <fitzsim@redhat.com>
 Mark Greenwood <mark@dcs.shef.ac.uk>
+Andrew John Hughes <gnu_andrew@member.fsf.org, ahughes@redhat.com>
+Peter Hatina <phatina@redhat.com>
+Andrew John Hughes <ahughes@redhat.com>
 Matthias Klose <doko@ubuntu.com>
+MichaÅ GÃ³rny < mgorny@gentoo.org >
 Francis Kung <fkung@redhat.com>
+Denis Lila <dlila@redhat.com>
 DJ Lucas <dj@lucasit.com>
 Omair Majid <omajid@redhat.com>
 Jon A. Maxwell <jmaxwell@users.sourceforge.net>
+Thomas Meyer <thomas@m3y3r.de>
+Saad Mohammad <smohammad@redhat.com>
+Martin Olsson  <martin@minimum.se>
 Andrew Su <asu@redhat.com>
 Joshua Sumali <jsumali@redhat.com>
+Jiri Vanek <jvanek@redhat.com>
 Mark Wielaard <mark@klomp.org>
 Man Lung Wong <mwong@redhat.com>

trunk/icedtea-web/ChangeLog

-              r348
+              r418
+-08-31  Deepak Bhole <dbhole@redhat.com>
+        * NEWS: Prepare for 1.1.2
+        * configure.ac: Same
+-08-27  Deepak Bhole <dbhole@redhat.com>
+        * configure.ac: Prepare for 1.3
+        * NEWS: Same
+-08-27  Deepak Bhole <dbhole@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (getAccessControlContextForClassLoading): Catch ClassCircularityErrors and
+        ignore them (thus denying permission to caller).
+-08-13  Jiri Vanek  <jvanek@redhat.com>
+        * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
+        (executeProcessUponURL)Fixed wrong call in previous commit which was
+        causing null process name.
+        * tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java:
+        Removed unused import.
+-08-13  Jiri Vanek  <jvanek@redhat.com>
+        Reproducers of PR955
+        * tests/reproducers/simple/LocalisedInformationElement/resources/LocalisedInformationElement1.jnlp:
+        * tests/reproducers/simple/LocalisedInformationElement/resources/LocalisedInformationElement2.jnlp:
+        * tests/reproducers/simple/LocalisedInformationElement/resources/LocalisedInformationElement3.jnlp:
+        * tests/reproducers/simple/LocalisedInformationElement/resources/LocalisedInformationElement4.jnlp:
+        Test jnlp files with various combinations of locales, reproducers of PR955.
+        * tests/reproducers/simple/LocalisedInformationElement/resources/LocalisedInformationElement_noLoc.jnlp
+        Jnlp file with which is not affected by PR955 and is helping to catch error in LOCALE changing hack
+        * tests/reproducers/simple/LocalisedInformationElement/srcs/LocalisedInformationElement.java:
+        Reproducer main class, after loading prints out default locale.
+        * tests/reproducers/simple/LocalisedInformationElement/testcases/LocalisedInformationElementTest.java:
+        Testcases launching above jnlps under various locales.
+        * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
+        Added set of methods allowing passing of custom variables to ThreadedProcess.
+        * tests/test-extensions/net/sourceforge/jnlp/ThreadedProcess.java:
+        Added processing of custom variables.
+-08-22  Danesh Dadachanji  <ddadacha@redhat.com>
+        Fix PR955: regression: SweetHome3D fails to run
+        * NEWS: Added entry for PR955
+        * netx/net/sourceforge/jnlp/JNLPFile.java: New enum Match that represents
+        the level of precision to use when matching locales.
+        (localMatches): Renamed to localeMatches, added matchLevel paramater
+        and updated conditionals to handle the level of precision specified by it.
+        (getVendor): New method that returns an information's vendor text.
+        (getInformation): Added override methods for getTitle and getVendor
+        that are used by the anonymous class to filter by locale. All three
+        methods now go through all levels of precision to search for the best
+        fitted locale.
+        (getResources), (getResourcesDescs): Updated to check if any level of
+        precision matches when searching for locales.
+        (parse): Added call to checkForTitleVendor.
+        * netx/net/sourceforge/jnlp/Parser.java
+        (checkForTitleVendor): New method to check for availability of localized
+        title and vendor from the information tags. Throws ParseException.
+        (getInfo): Replace loop with foreach loop.
+        (getInformationDesc): Remove check for present title and vendor.
+        (getLocale): Variant returned can now use everything after the eigth
+        element of the locale's string.
+        * netx/net/sourceforge/jnlp/resources/Messages.properties:
+        Update missing title and vendor messages to mention localization.
+        * tests/reproducers/simple/InformationTitleVendorParser/testcases/InformationTitleVendorParserTest.java:
+        Update output string as per new changes to Messages internationalizations.
+        * tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java:
+        New unit test that checks the localesMatches method in JNLPFile.
+        * tests/netx/unit/net/sourceforge/jnlp/MockJNLPFile.java:
+        New class used to create a mock JNLPFile object.
+        * tests/netx/unit/net/sourceforge/jnlp/ParserTest.java:
+        New unit test that checks that the return of getTitle and getVendor
+        have localized information.
+-08-21  Jiri Vanek  <jvanek@redhat.com>
+        * tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java:
+        (sigInt), (sigKill), (sigTerm) new methods for various killing of
+        processes by kill.
+        (kill) new method, launching kill process.
+        (destroyProcess ) is now calling sigInt instead of unwrapped sigTerm.
+-08-21  Jiri Vanek  <jvanek@redhat.com>
+        * launcher/javaws.in: java is now launched by exec
+-08-17  Adam Domurad  <adomurad@redhat.com>
+        Fixes PR588, cookies set in the java cookie jar are now stored properly
+        * plugin/icedteanp/IcedTeaNPPlugin.cc
+        (set_cookie_info): New, uses setvalueforurl
+        (consume_plugin_message): Additional message added allowing
+        set_cookie_info to be used from the java side.
+        * plugin/icedteanp/java/sun/applet/PluginCookieManager.java: Now
+        overrides put method, results in set_cookie_info calls in C++
+        * plugin/icedteanp/java/sun/applet/PluginMain.java: Passes
+        PluginStreamHandler to PluginCookieManager to allow C++ side
+        communication
+-08-17  Adam Domurad  <adomurad@redhat.com>
+        * plugin/icedteanp/IcedTeaNPPlugin.cc
+        (consume_plugin_message): New, called by consume_message, handles
+        cookie and proxy info retrieval, and setting cookie info
+        (consume_message): Call consume_plugin_message for "plugin ..."
+        messages
+-08-17  Adam Domurad  <adomurad@redhat.com>
+        Reproducers for PR588, sets persistent and session cookies in the
+        cookie jar and tries to read them with various means.
+        * tests/reproducers/signed/SavingCookies/resources/CheckCookie.html:
+        Print the cookie store contents
+        * tests/reproducers/signed/SavingCookies/resources/CheckCookieAndGotoClear.html:
+        Print the cookie store contents, and then go to
+        ClearPersistentCookie.html with showDocument
+        * tests/reproducers/signed/SavingCookies/resources/ClearPersistentCookie.html:
+        Clear the test cookie so it does not interfere with further tests
+        * tests/reproducers/signed/SavingCookies/resources/SavePersistentCookie.html:
+        Create a persistent cookie
+        * tests/reproducers/signed/SavingCookies/resources/SavePersistentCookieAndGotoCheck.html:
+        Create a persistent cookie and check it with showDocument
+        * tests/reproducers/signed/SavingCookies/resources/SaveSessionCookie.html:
+        Create a session cookie
+        * tests/reproducers/signed/SavingCookies/resources/SaveSessionCookieAndGotoCheck.html:
+        Create a session cookie and check it with showDocument
+        * tests/reproducers/signed/SavingCookies/srcs/CheckingCookies.java:
+        Checks the contents of the cookie store.
+        Depending on the test, this may go to another page upon completion.
+        * tests/reproducers/signed/SavingCookies/srcs/SavingCookies.java:
+        Store cookies in the java cookie store. Depending on the test, this may
+        go to another page upon completion.
+        * tests/reproducers/signed/SavingCookies/testcases/SavingCookiesTests.java
+        Test driver for testing persistent and session cookies in different
+        ways
+-08-18  Jiri Vanek  <jvanek@redhat.com>
+        * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: added
+        VERBOSE_OPTION constant with -verbose value for javaws launching.
+-08-17  Jiri Vanek  <jvanek@redhat.com>
+        * tests/reproducers/simple/deadlocktest/testcases/DeadLockTestTest.java:
+        (testDeadLockTestTerminatedBody) removed tests for killed-process and
+        termination of remaining javas put on correct place.
+        * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
+        (executeBrowser)  stout and stderr listeners forwarded to next method in
+        correct order.
+-08-14  Danesh Dadachanji  <ddadacha@redhat.com>
+        Small addition to NEWS entry and bug annotation indicating the PR975 fix.
+        * NEWS: Add entry for PR975
+        * tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java:
+        Add bug annotation for PR975.
+-08-14  Danesh Dadachanji  <ddadacha@redhat.com>
+        Classpaths in jars' manifests are only considered when the applet is run
+        without using jnlp_href and a JNLP file.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (activateJars):
+        Add conditional check for use of jnlp_href.
+        * tests/reproducers/signed/Classpath.Manifest.Test.Helper/srcs/CheckForClasspath.java:
+        Applet whose jar is stored in a subdir under the test engine server.
+        * tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestAppletTest.html:
+        * tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestAppletTest.jnlp:
+        * tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestApplicationTest.jnlp:
+        * tests/reproducers/signed/ClasspathManifestTest/resources/ClasspathManifestJNLPHrefTest.html:
+        * tests/reproducers/signed/ClasspathManifestTest/srcs/ClasspathManifest.java:
+        * tests/reproducers/signed/ClasspathManifestTest/srcs/META-INF/MANIFEST.MF:
+        * tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java:
+        Test if manifest entry is searched for classpath only when in the plugin
+        is run without using jnlp_href.
+-08-14  Adam Domurad  <adomurad@redhat.com>
+        Reproducer for allowing unsigned content in META-INF/ folder.
+        Derives from ReadPropertiesSigned test's signed jar.
+        * tests/reproducers/custom/UnsignedContentInMETAINF/resources/UnsignedContentInMETAINF.jnlp:
+        New, runs a modified version of ReadPropertiesSigned.jar (UnsignedContentInMETAINF.jar)
+        * tests/reproducers/custom/UnsignedContentInMETAINF/srcs/META-INF/unsigned_file_in_metainf:
+        New, placed into a modified version of ReadPropertiesSigned.jar
+        (UnsignedContentInMETAINF.jar) so that there is unsigned content in the
+        META-INF/ folder.
+        * tests/reproducers/custom/UnsignedContentInMETAINF/srcs/Makefile:
+        New, creates a modified version of ReadPropertiesSigned.jar, named
+        UnsignedContentInMETAINF.jar, and places unsigned content inside its
+        META-INF/ folder
+        * tests/reproducers/custom/UnsignedContentInMETAINF/testcases/UnsignedContentInMETAINF.java:
+        Test driver for jnlp file
+-08-14  Adam Domurad  <adomurad@redhat.com>
+        Unit test for method in JCV, isMetaInfFile()
+        * netx/net/sourceforge/jnlp/tools/JarCertVerifier.java:
+        Made isMetaInfFile package-private for testing purposes.
+        * tests/netx/unit/net/sourceforge/jnlp/tools/JarCertVerifierTest.java:
+        New, tests isMetaInfFile
+-08-07  Adam Domurad  <adomurad@redhat.com>
+        Fixes PR1106, plugin crashing with firefox + archlinux/gentoo
+        * plugin/icedteanp/IcedTeaNPPlugin.cc
+        (initialize_browser_functions): Account for the fact that
+        browserTable->size can be larger than sizeof(NPNetscapeFuncs)
+-07-31  Jiri Vanek  <jvanek@redhat.com>
+            Peter Hatina  <phatina@redhat.com>
+        Introduced configure option --with-gtk=2|3|default to be able
+        to compile against different version of GTK+ (2.x or 3.x).
+        * NEWS: mentioned bug fix
+        * acinclude.m4: (ITW_GTK_CHECK_VERSION) macro for getting GTK+ version
+        (ITW_GTK_CHECK) macro for checking GTK+ version
+-07-24  Adam Domurad  <adomurad@redhat.com>
+        CVE-2012-3422, RH840592: Potential read from an uninitialized
+        memory location.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc
+        (get_cookie_info): Only attempt to perform this operation if there is a
+        valid plugin instance
+        (get_proxy_info): Only attempt to perform this operation if there is a
+        valid plugin instance
+-07-24  Adam Domurad  <adomurad@redhat.com>
+        * plugin/icedteanp/IcedTeaPluginUtils.cc
+        (IcedTeaPluginUtilities::strSplit): Replace usage of " " with proper
+        delimiter
+-07-24  Adam Domurad  <adomurad@redhat.com>
+        Refactor JNLPFile#launchType into its own interface type (as opposed to
+        Object), LaunchDesc.
+        * netx/net/sourceforge/jnlp/AppletDesc.java: Add override annotation to
+        getMainClass().
+        * netx/net/sourceforge/jnlp/ApplicationDesc.java: Same as above
+        * netx/net/sourceforge/jnlp/InstallerDesc.java: Same as above
+        * netx/net/sourceforge/jnlp/JNLPFile.java: Make launchType a
+        LaunchDesc object. Update getLaunchInfo() accordingly.
+        * netx/net/sourceforge/jnlp/LaunchDesc.java: New launch description.
+        * netx/net/sourceforge/jnlp/Parser.java
+        (getLauncher): Return type changed to LaunchDesc
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Replace
+        occurences of instanceof with respect to launchType.
+-07-18  Danesh Dadachanji  <ddadacha@redhat.com>
+        Fix RH838417, Fix RH838559: Disambiguate signed applet security prompt
+        from certificate warning.
+        * NEWS: Added entries for RH838417 and RH838559.
+        * netx/net/sourceforge/jnlp/resources/Messages.properties:
+        Added SWarnFullPermissionsIgnorePolicy and updated SHttpsUnverified.
+        * netx/net/sourceforge/jnlp/security/CertWarningPane.java: Display
+        SWarnFullPermissionsIgnorePolicy if the cert is from a jar and is either
+        unverified or has a signing error. Also added warning.png to HTTPS dialogs.
+-07-11  Jiri Vanek  <jvanek@redhat.com>
+        try to close browser before kill it
+        * tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java:
+        * tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java:
+        * tests/reproducers/simple/CheckServices/testcases/CheckServicesTests.java
+        (evaluateSignedApplet) addapted to properly closed browser
+        * tests/reproducers/simple/CheckServices/srcs/CheckServices.java:
+        removed fixme section as it shuld work now
+        * tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java
+        (destroyProcess) new method, launching kill with SIGTERM before clasical
+        process.destroy()
+        * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
+        removed Set<Thread> terminated, should be removed long ago
+-07-09  Saad Mohammad  <smohammad@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (initializeExtensions):
+        Checks and assigns the main-class name prior to the for loop.
+-07-09  Martin Olsson  <martin@minimum.se>
+        * plugin/icedteanp/IcedTeaPluginUtils.cc: Change calls from g_free
+        to free when allocated with calloc.
+        * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+        (PluginRequestProcessor::call): Make sure args_array doesnt hold
+        garbage when freed.
+        (_loadURL): Change calls from g_free to free when allocated with
+        calloc.
+-07-09  Adam Domurad  <adomurad@redhat.com>
+        Ignore invalid jar files in applets, like the oracle plugin does.
+        * netx/net/sourceforge/jnlp/cache/IllegalResourceDescriptorException.java:
+        New exception type for ResourceTracker to throw instead of
+        IllegalArgumentException
+        * netx/net/sourceforge/jnlp/cache/IllegalResourceDescriptorException.java:
+        Throws IllegalArgumentDescriptorException instead of
+        IllegalArgumentException.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+        (isInvalidJar): New, checks for ZipException in new JarFile(...)
+        (shouldFilterInvalidJars): New, checks if we are in an applet
+        (initializeResources): if 'shouldFilterInvalidJars()' is true and a jar
+        is not a valid jar file, the jar is filtered out and normal execution
+        continues.
+-07-03  Saad Mohammad  <smohammad@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+        (JNLPClassLoader): New constructor that accepts an additional parameter
+        containing the main class name.
+        (getInstance): Accepts mainName as parameter to override application's
+        main class name
+        (initializeExtensions): Passes in the name of the application's main class
+        when creating a new JNLPClassLoader instance.
+        (initializeResources): If the loader owns no jars, it will consider
+        itself as signed if all of the extension loaders are signed. Also, if the
+        extension jars have the main class, it will set foundMainJar to true.
+        (initializeResources): If the main class was not found, check if it was
+        found within the extension jars.
+        (checkForMain): Uses the overwritten main class name (if set) when
+        searching for the main within the jars.
+        (hasMainJar): Returns true if this loader holds the main jar.
+        (hasMainInExtensions): Returns true if extension loaders have the main jar
+        * tests/jnlp_tests/signed/ExtensionJnlp/resources/UsesSignedJarExtension.jnlp:
+        * tests/jnlp_tests/signed/ExtensionJnlp/resources/UsesSignedJnlpExtension.jnlp:
+        * tests/jnlp_tests/signed/ExtensionJnlp/resources/UsesSignedJnlpJarAndSignedJarExtension.jnlp:
+        Launching jnlps that use extension jnlp as its resource.
+        * tests/jnlp_tests/signed/ExtensionJnlp/resources/UsesSignedJar.jnlp:
+        Launching jnlp that directly launches SignedJarResource class.
+        * tests/jnlp_tests/signed/ExtensionJnlp/resources/UsesSignedJnlp.jnlp:
+        Launching jnlp that directly launches SignedJnlpResource class.
+        * tests/jnlp_tests/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java:
+        Testcase that tests the launching of jnlp files containing extension jnlps
+        as resource.
+        * tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarExtension.jnlp:
+        Component jnlp file that is used as an extension resource.
+        * tests/jnlp_tests/signed/SignedJarResource/srcs/SignedJarResource.java:
+        A simple java class that outputs a string.
+        * tests/jnlp_tests/signed/SignedJnlpResource/resources/UnmatchingSignedJnlpExtension.jnlp:
+        Component jnlp file that is used as an extension resource and does not
+        match the signed jnlp file.
+        * tests/jnlp_tests/signed/SignedJnlpResource/resources/MatchingSignedJnlpExtension.jnlp:
+        Component jnlp file that is used as an extension resource and matches the
+        signed jnlp file.
+        * tests/jnlp_tests/signed/SignedJnlpResource/srcs/JNLP-INF/APPLICATION_TEMPLATE.jnlp:
+        Signed jnlp file.
+        * tests/jnlp_tests/signed/SignedJnlpResource/srcs/SignedJnlpResource.java:
+        A simple java class that outputs a string.
+-07-02  Jiri Vanek  <jvanek@redhat.com>
+        Added missing headers
+        * tests/reproducers/simple/CreateClassLoader/resources/CreateClassLoader.jnlp:
+        * tests/reproducers/simple/ReadEnvironment/resources/ReadEnvironment.jnlp:
+        * tests/reproducers/simple/ReadProperties/resources/ReadProperties1.jnlp:
+        * tests/reproducers/simple/ReadProperties/resources/ReadProperties2.jnlp:
+        * tests/reproducers/simple/RedirectStreams/resources/RedirectStreams.jnlp:
+        * tests/reproducers/simple/ReplaceSecurityManager/resources/ReplaceSecurityManager.jnlp:
+        * tests/reproducers/simple/SetContextClassLoader/resources/SetContextClassLoader.jnlp:
+        * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
+        * tests/test-extensions/net/sourceforge/jnlp/annotations/Bug.java:
+        * tests/test-extensions/net/sourceforge/jnlp/annotations/KnownToFail.java:
+        * tests/test-extensions/net/sourceforge/jnlp/annotations/NeedsDisplay.java:
+        * tests/test-extensions/net/sourceforge/jnlp/annotations/TestInBrowsers.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browser.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/BrowserFactory.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/BrowserTest.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/BrowserTestRunner.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browsers.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Chrome.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Chromium.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Firefox.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/LinuxBrowser.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Midory.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/MozillaFamilyLinuxBrowser.java:
+        * tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Opera.java:
+        added license headers
+-07-02  Jiri Vanek  <jvanek@redhat.com>
+        Makefile adapted to recent (three changelog items) refactoring
+        * Makefile.am: (JNLP_TESTS_ENGINE_SRCDIR) now points correctly to
+        test-extensions. (JNLP_TESTS_ENGINE_TESTS_SRCDIR) new variable for
+        test-extensions-tests. (JNLP_TESTS_SRCDIR) now points to reproducers.
+        (JNLP_TESTS_ENGINE_TESTS_DIR) new variable for built
+        JNLP_TESTS_ENGINE_TESTS_SRCDIR
+        (netx-dist-tests-tests-source-files.txt) new target for list of
+        content of JNLP_TESTS_ENGINE_TESTS_SRCDIR.
+        (stamps/netx-dist-tests-tests-compile.stamp) new target for compiling
+        netx-dist-tests-tests-source-files.txt
+        (netx-dist-tests-source-files.tx) now depends on
+        stamps/netx-dist-tests-tests-compile.stamp
+        ($(REPRODUCERS_CLASS_NAMES)) target is now working in JNLP_TESTS_ENGINE_TESTS_DIR
+        instead of JNLP_TESTS_ENGINE_DIR
+        (stamps/run-netx-dist-tests.stamp): added JNLP_TESTS_ENGINE_TESTS_DIR to classpath
+        (stamps/run-unit-test-code-coverage.stamp), (stamps/run-reproducers-test-code-coverage.stamp)
+        added JNLP_TESTS_ENGINE_TESTS_DIR to classpath and
+        JNLP_TESTS_ENGINE_TESTS_SRCDIR to sources path
+-07-02  Jiri Vanek  <jvanek@redhat.com>
+        All tests from test-extensions extracted to test-extensions-tests.
+        All inner classes in test-extensions extracted as outer classes
+        * tests/test-extensions/net/sourceforge/jnlp/ResourcesTest.java:
+        moved to test-extensions-tests
+        * tests/test-extensions-tests/net/sourceforge/jnlp/ResourcesTest.java:
+        new file, copied from test-extensions
+        * tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java:
+        all tests from original ServerAccess.java
+        * tests/test-extensions/net/sourceforge/jnlp/ContentReader.java:
+        * tests/test-extensions/net/sourceforge/jnlp/LogItem.java:
+        * tests/test-extensions/net/sourceforge/jnlp/LoggingBottleneck.java:
+        * tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java:
+        * tests/test-extensions/net/sourceforge/jnlp/ProcessResult.java:
+        * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java:
+        * tests/test-extensions/net/sourceforge/jnlp/TestsLogs.java:
+        * tests/test-extensions/net/sourceforge/jnlp/ThreadedProcess.java:
+        * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java:
+        new files, extracted classes from ServerAccess
+        * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
+        extracted tests and inner classes
+-07-02  Jiri Vanek  <jvanek@redhat.com>
+        hg move tests/netx/jnlp_testsengine/ tests/test-extensions
+-07-02  Jiri Vanek  <jvanek@redhat.com>
+        hg move tests/jnlp_tests/ tests/reproducers
+-06-29  Jiri Vanek  <jvanek@redhat.com>
+        Fixed resource tests and Browsers.none behavior
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:
+        Added slash into all executeBrowsers urls.
+        Added midori and epiphany to simple proxies test.
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserTestRunner.java:
+        Corrected handling of Browsers.none together with -Dmodified.browsers.run switch
+-06-28  Omair Majid  <omajid@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (findClass): Invoke CodeBaseClassLoader.findClass with a flag to avoid
+        infinite recursion.
+        (CodeBaseClassLoader.findClass(String)): Delegate to ...
+        (CodeBaseClassLoader.findClass(String,boolean)): New method.
+        * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java
+        (testParentClassLoaderIsAskedForClasses): New method.
+-06-28 Jiri Vanek <jvanek@redhat.com>
+        Correctly backup all log files re-writable by emma during code-coverage
+        * Makefile.am: (EMMA_MODIFIED_FILES) new variable with list of files to
+        backup/restore. (stamps/run-unit-test-code-coverage.stamp) and
+        (stamps/run-reproducers-test-code-coverage.stamp) are now iterating over
+        EMMA_MODIFIED_FILES instead of enumerating them
+-06-28  Jiri Vanek  <jvanek@redhat.com>
+        Removed repeated re-runing of tests during coverage, stamped pac tests
+        * Makefile.am: (check-pac-functions) moved to target aliases and replaced
+        by stamps/check-pac-functions.stamp.
+        (clean-netx-unit-tests) added removing of  stamps/check-pac-functions.stamp
+        (stamps/exported-test-certs.stamp): no longer depends on
+        netx-dist-tests-remove-cert-from-public, logic of it have to be
+        copy-pasted from here.
+        (stamps/run-unit-test-code-coverage.stamp): no longer depends on check,
+        but was added direct dependences
+-06-28  Adam Domurad  <adomurad@redhat.com>
+        Allow for folders in archive tag.
+        * netx/net/sourceforge/jnlp/PluginBridge.java:
+        (PluginBridge) Changes jar -> archive, parse contents with
+        addArchiveEntries.
+        (addArchiveEntries) New method. Adds entries ending with / to the list
+        of folders.
+        (getCodeBaseFolders) Returns the folders collected by addArchiveEntries
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+        (initializeResources) If ran as plugin, add archive tag folders to the
+        code base loader.
+-06-27  Adam Domurad  <adomurad@redhat.com>
+        Tests folders in archive tag
+        * tests/jnlp_tests/custom/AppletFolderInArchiveTag/testcases/AppletFolderInArchiveTagTests.java:
+        Runs html file in browser
+        * tests/jnlp_tests/custom/AppletFolderInArchiveTag/srcs/Makefile:
+        packages compiled source files in folder
+        * tests/jnlp_tests/custom/AppletFolderInArchiveTag/srcs/AppletFolderInArchiveTag.java:
+        Simple output to confirm it is running
+        * tests/jnlp_tests/custom/AppletFolderInArchiveTag/resources/AppletFolderInArchiveTag.html:
+        Has folder in its archive tag that contains a class file
+-06-26  Jiri Vanek  <jvanek@redhat.com>
+        Added slipped midori and epiphany to recognized browsers.
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserFactory.java:
+        (BrowserFactory) added slipped cases for creating Epiphany and Midori singletons
+-06-26  Jiri Vanek  <jvanek@redhat.com>
+        * Makefile.am:  Most crucial variables exported to be used by custom Makefiles
+        (CUSTOM_REPRODUCERS): new variable to hold custom name
+        (ALL_NONCUSTOM_REPRODUCERS): new variable for gathering all except custom reproducers
+        (ALL_REPRODUCERS): now contains also custom ones
+        (stamps/junit-jnlp-dist-dirs): now depends also on junit-jnlp-dist-custom.txt
+        (junit-jnlp-dist-custom.txt): new target scanning for directories in jnlp_tests/custom
+        and saving them as list for future purposes.
+        (stamps/netx-dist-tests-prepare-reproducers.stamp): and
+        ( stamps/change-dots-to-paths.stamp):iterate through ALL_NONCUSTOM_REPRODUCERS
+        instead of ALL__REPRODUCERS
+        (stamps/process-custom-reproducers.stamp) : new target for iterating by
+        junit-jnlp-dist-custom.txt through  jnlp_tests/custom/srcs* and launching
+        make prepare-reproducer in each.
+        (clean-custom-reproducers): same as above but launching make clean-reproducer
+        (run-netx-dist-tests) now depends on stamps/process-custom-reproducers.stamp
+        (clean-netx-dist-tests): now depends on clean-custom-reproducers and is removing
+        stamps/netx-dist-tests-copy-resources.stamp
+        (stamps/netx-dist-tests-copy-resources.stamp): new target extracting
+        copying of resources from stamps/netx-dist-tests-compile-testcases.stamp
+        * tests/jnlp_tests/README: described this mechanism a bit
+-06-26 Jiri Vanek <jvanek@redhat.com>
+        Reproducer for classes which should be loaded before verification but are not
+        * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-applet-hack.jnlp
+        jnlp launcher of applet variant with injecting new url to classlaoder
+        * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-applet-new.jnlp
+        jnlp launcher of applet variant with custom classlaoder
+        * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-hack.html
+        html launcher of applet variant with injecting new url to classlaoder
+        * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-hack.jnlp
+        jnlp launcher of application variant with injecting new url to classlaoder
+        * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-new.html
+        html launcher of applet variant with custom classlaoder
+        * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/resources/InternalClassloaderWithDownloadedResource-new.jnlp
+        jnlp launcher of application variant with custom classlaoder
+        * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/srcs/InternalClassloaderWithDownloadedResource.java:
+        Both application and applet reproducing behavior of this bug
+        * tests/jnlp_tests/signed/InternalClassloaderWithDownloadedResource/testcases/InternalClassloaderWithDownloadedResourceTest.java:
+        Testcase launching jnlp application, jnlp applet and html applet
+-06-26  Jiri Vanek  <jvanek@redhat.com>
+        Last hope for not downloaded resources to be verified
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+        (getCodeSourceSecurity): will now try to download and verify resource
+        which was downloaded outside of netx.
+        (alreadyTried) set for memory of once tried resources to not try again
+-06-25  Adam Domurad  <adomurad@redhat.com>
+        Small comment cleanup to classes with missing or wrong descriptions.
+        * plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java:
+        Comment at top fixed
+        * plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java:
+        Same
+        * plugin/icedteanp/java/sun/applet/PluginException.java: Same
+        * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java: Same
+        * netx/net/sourceforge/jnlp/PluginBridge.java: Add class description.
+        * plugin/icedteanp/java/sun/applet/PluginCallRequest.java:
+        Removed FIXME that had already been fixed.
+-06-25  Adam Domurad  <adomurad@redhat.com>
+        Allow passing of plugin tables and browser tables in NP_Initialize that
+        are not the expected length but still large enough for our purposes.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc
+        (initialize_browser_functions): New function to check size of passed
+        browser function table, and initialize 'browser_functions' global
+        variable.
+        (initialize_plugin_table): New function to check size of passed
+        plugin function table, and initialize proper plugin callbacks.
+        (NP_Initialize): Make use of initialization helper functions, get
+        rid of old size tests and error if the helper functions fail.
+-06-20  Adam Domurad  <adomurad@redhat.com>
+        * netx/net/sourceforge/jnlp/tools/JarCertVerifier.java
+        (verifyJar): two for loops made into for-each loops
+-06-19  Jiri Vanek  <jvanek@redhat.com>
+        various test for browser engine
+        * tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests.html:
+        fixed missing parenthesis
+        * tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests2.html:
+        new test excluding XslowX for applets
+        * tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests:
+        (doubleChrome) test for ensuring that two chrome browsers launched
+        behind themselves will not cause errors as they were without
+        criticalFixes patch
+        (AppletInBrowserTest) and (AppletInBrowserTestXslowX) testing methods
+        for all browser
+        * tests/jnlp_tests/simple/AppletTest/testcases/AppletBaseURLTest:
+        * tests/jnlp_tests/simple/AppletTest/testcases/CheckServicesTests:
+        * tests/jnlp_tests/simple/AppletTest/testcases/AppletReadsInvalidJarTests:
+        Included @TestInBrowser instead of plain executeBrowser
+        * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: improved
+        to print sometimes something out
+        * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java:
+        (testDeadLockTestTerminatedBody) enhanced to ensure that not so much is
+        lost when process is terminated, but showing that something can be lost
+        (which is correct)
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:
+        (testNonExisitngBrowserWillNotDeadlock) testing taht when no browser is
+        set, then no deadlock happens as happen before criticalFixes's deadlyException
+        (testUnexistingProcessWillFailRecognizedly)  is actually testing deadlyException
+        (testNonExisitngBrowserWillNotCauseMess) some but with annotation which
+        was also harming output of tool little bit without TestInBrowsersAnnotation fixed.
+        (testBrowsers2) is testing all browsers configuration without annotation
+        and (testBrowser3) do the same configuration tests annotation driven
+        (testBrowser) body of above two methods. Is testing whether used
+        browsers are correctly linked with latest build
+        (testBrowsers1) is testing parsing of -D variable
+        (testListeners) annotated that needs display
+        * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java:
+        annotated with Bug annotation
+-06-19  Jiri Vanek  <jvanek@redhat.com>
+        introduced possibility to run comfortably applets+html reproducers
+        * Makefile.am: used BROWSER_TESTS_MODIFICATION variable to pass global
+        switch from configure
+        * acinclude.m4: (IT_SET_GLOBAL_BROWSERTESTS_BHAVIOUR) new method
+        handling --with-browser-tests
+        * configure.ac: used IT_SET_GLOBAL_BROWSERTESTS_BHAVIOUR
+        switch and passing  BROWSER_TESTS_MODIFICATION variable to Makefile.
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        (currentBrowser) variable holding injected browser for ServerAccess instance
+        (loggedBrowser) static variable keeping id of (currentBrowser) for static
+        logging purposes
+        (modifyMethodWithForBrowser) new function changing the name of method to
+        "method - browser" for logging purposes
+        (getBrowserLocation) - returning path to process to be launched when
+        browser requested
+        (getBrowserParams) - gathering set default's browser settings
+        (set/getCurrentBrowsers) - set browser by id/return id of set browser
+        (set/getCurrentBrowser) - set browser instance /returns instance of
+        current browser
+        (executeBrowser) family of methods now cooperate with above methods for
+        default set browser
+        (executeBrowser(Browser) family to work with implicit browser
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/TestInBrowsers.java:
+        annotation for determining which browser(s) to use with annotated method
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/Browser.java:
+        interface for dealing with various browsers
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserFactory.java:
+        singleton for mapping configured browsers x requested browser x browsers proxies
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserTest.java:
+        Forefather of all testcases which have methods to do tests iniside browser.
+        Is allowing correct annotation -> proxy trasnver to VirtualServer for
+        selected method and is requesting custom runner from junit framework
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserTestRunner.java:
+        custom test Ruuner which is responsible for translating annotation and
+        run the method mutlipletimes for each requested browser and to name it properly
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/Browsers.java:
+        enumeration of abstract browsers and theirs sets or subsets.
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/*:
+        individual browsers proxies and theirs abstractions,namely:
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Opera.java:
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Firefox.java:
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Chrome.java:
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Chromium.java:
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Midori.java:
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java:
+        proxies for  browsers as name suggests
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/LinuxBrowser.java:
+        abstract forefather for all browsers implementing Browser interface. Is
+        setting /usr/bin as bin path, libjavaplugin.so as default plugin library name,
+        intorducing stubs for methods (eg 32/64 bit libs)
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/MozillaFamilyLinuxBrowser:
+        forefather for all browsers except Opera. Is unifying .mozilla/plugins directories
+-06-15  Jiri Vanek  <jvanek@redhat.com>
+        * tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests.html:
+        Added quotes around parameters  of html applet tag.
+        * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java:
+        Output verification is counting with repeated and probably unfinished outputs.
+        * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java
+        Is now printing out sentence in intervals to avoid destroy-consume as much as possible
+        * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java:
+        Added bug annotation with threads on distro-pkg-dev
+-06-15  Adam Domurad  <adomurad@redhat.com>
+        Fixed two memory leaks
+        * plugin/icedteanp/IcedTeaNPPlugin.cc
+        (consume_message): Call to g_strsplit matched with call to g_strfreev.
+        * plugin/icedteanp/IcedTeaPluginUtils.cc
+        (post): Removed copy of string, which assumed consumer freed string
+        (which was not true and not always possible)
+-06-11  Danesh Dadachanji  <ddadacha@redhat.com>
+        PR855: AppletStub getDocumentBase() doesn't return full URL
+        * NEWS: Added PR855 entry.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_get_documentbase):
+        Assign documentbase_copy directly to href's value instead of iterating
+        through the segments to remove the file from the path.
+        * tests/jnlp_tests/simple/AppletBaseURLTest/srcs/AppletBaseURL.java:
+        * tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java:
+        * tests/jnlp_tests/simple/AppletBaseURLTest/resources/AppletBaseURLTest.html:
+        * tests/jnlp_tests/simple/AppletBaseURLTest/resources/AppletBaseURLTest.jnlp:
+        * tests/jnlp_tests/simple/AppletBaseURLTest/resources/AppletJNLPHrefBaseURLTest.html:
+        New reproducer that checks the URLS that document and codebase
+        point are correct.
+-06-13  Danesh Dadachanji  <ddadacha@redhat.com>
+        Update CheckServices reproducer to handle browser testcase.
+        * tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java:
+        Added browser test and annotation, refactored asserts into helper method.
+        * tests/jnlp_tests/simple/CheckServices/resources/CheckPluginServices.html:
+        New browser test file that runs applet using jnlp_href.
+-06-13  Jiri Vanek  <jvanek@redhat.com>
+        * tests/junit-runner/JunitLikeXmlOutputListener.java:
+        Introduced TEST_IGNORED_ATTRIBUTE to mark test as ignored if should be.
+        * tests/report-styles/jreport.xsl: Applied correct text and style for
+        tests with attribute ignored.
+-06-12  Adam Domurad  <adomurad@redhat.com>
+        Fixes PR722, javaws failing to run with unsigned content in META-INF/
+        * NEWS: Added entry: Fixes PR722
+        * netx/net/sourceforge/jnlp/tools/JarCertVerifier.java: Changed
+        isSignatureRelated => isMetaInfFile. Now all files under META-INF/ are
+        disregarded in checking the jar signage.
+-06-11  Jiri Vanek  <jvanek@redhat.com>
+        Implemented xml logging backend
+        * Makefile.am: (stamps/run-netx-unit-tests.stamp) and
+        (stamps/run-netx-dist-tests.stamp) removed redirection of streams as
+        logging is now done in ServerAccess tests extensions
+        added xsltproc execution above generated xml log
+        xsltproc generating results html files is now receiving result of above
+        as parameter
+        * tests/report-styles/jreport.xsl: log parameter is now accepted, and
+        if set, then all tests are linking into specified file to show the log
+        * tests/report-styles/report.css: added styles for new links
+        * tests/report-styles/index.js: new functions to work for result of below sheet
+        * tests/report-styles/logs.xsl: new file, sheet to convert xml log to html file
+        * tests/report-styles/output.css: new file, styles of above html file
+        * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java:
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        Tests', server's and ProcessAssasin's logs are now redirected to bottleneck
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        (LOGS_REPRINT) flag for debugging purposes, will enable reprinting to
+        stdout/err again
+        (DEFAULT_LOG_FILE ) default name of xml output
+        (DEFAULT_STDERR_FILE)(DEFAULT_STDOUT_FILE)(DEFAULT_STDLOGS_FILE) default
+        values of plain text output files
+        (*ELEMENT) and( (*ATTRIBUTE) variables keeping repeated names of xml
+        output parts
+        (writeXmlLog) method called from Sytsem.hook to save xml log
+        (addToXmlLog) method to record item to xml structure
+        (TestsLogs) and (LogItem) inner classes to keep logging information
+        (log) is now reprinting message with id to std out/err dependently on
+        (LOGS_REPRINT) but always to internal streams, possilbe exception is thrown
+        (logException) new method, shortcut to log exception in same way as message
+        (getTestMethod) now can handle methods inside ServerAccess class too
+-06-11  Adam Domurad  <adomurad@redhat.com>
+        * NEWS: Added mention of fixing PR518
+-06-07  Saad Mohammad  <smohammad@redhat.com>
+        Allows the user to configure browser paths and/or disable browsers.
+        * acinclude.m4 (IT_FIND_BROWSER): Checks if the browser is set to be
+        disabled, or if the path provided is valid. Otherwise, it locates the
+        default path to the browser if found on the system.
+        * configure.ac: Uses IT_FIND_BROWSER to find/configure browsers.
+-06-06  Deepak Bhole <dbhole@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (getAccessControlContextForClassLoading): Iterate over codebase URLs only
+        if codeBaseLoader is not null.
+-06-05  Deepak Bhole <dbhole@redhat.com>
+        PR861: Allow loading from non codebase hosts. Allow code to connect to
+        hosting server.
+        * netx/net/sourceforge/jnlp/SecurityDesc.java
+        (getSandBoxPermissions): Only add host if it is not empty.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (getPermissions): Add SocketPermission for code source host.
+        (findLoadedClassAll): Call super methods privileged so that connection to
+        non codebase hosts can be made.
+        (findClass): Same.
+        (findResourcesBySearching): Same. Also use privileged context for enum
+        operations because the enum is defined on the fly by URLClassLoader and
+        checks for hosting server connectivity via next().
+        (getAccessControlContextForClassLoading): New method. Returns a control
+        context for classloader operations like find/load/etc.
+        (CodeBaseClassLoader::findClass): Call super methods privileged so that
+        connection to non codebase hosts can be made.
+        (CodeBaseClassLoader::findResource): Same.
+-06-05  Jiri Vanek  <jvanek@redhat.com>
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/KnownToFail.java
+        New file. Annotation for marking failing tests.
+        * tests/report-styles/jreport.xsl:
+        * tests/junit-runner/LessVerboseTextListener.java:
+        * tests/junit-runner/JunitLikeXmlOutputListener.java:  Added counting
+        and printing of @KnownToFail annotations if presented.
+        * tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java:
+        (SpacesCanBeEverywhereRemoteTests1) (SpacesCanBeEverywhereRemoteTests2)
+        (SpacesCanBeEverywhereRemoteTests3)
+        * tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java: (testTemplateCDATA)
+        (testApplicationCDATA)
+        * tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java:
+        (testCDataFirstChild) (testCDataSecondChild) (testCommentInAttributes)
+        * tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java:
+        (testMalformedArguments) (testTagNotClosed) (testUnquotedAttributes)
+        marked as KnownToFail
+-06-05  Jiri Vanek  <jvanek@redhat.com>
+        isDateInRange renamed to isDateInRange_internallForIcedTeaWebTesting
+        * netx/net/sourceforge/jnlp/runtime/pac-funcs.js: and
+        * tests/netx/pac/pac-funcs-test.js:
+        (isDateInRange): Renamed to isDateInRange_internallForIcedTeaWebTesting.
+        (isDateInRange_internallForIcedTeaWebTesting): New function
+-06-04  Saad Mohammad <smohammad@redhat.com>
+        Added signed jnlp file tests.
+        * tests/jnlp_tests/signed/SignedJnlpApplication/resources/SignedJnlpApplication1.jnlp:
+        Launching jnlp file that matches the signed jnlp application file.
+        * tests/jnlp_tests/signed/SignedJnlpApplication/resources/SignedJnlpApplication2.jnlp:
+        * tests/jnlp_tests/signed/SignedJnlpApplication/resources/SignedJnlpApplication3.jnlp:
+        Launching jnlp file that does not match the signed jnlp application file.
+        * tests/jnlp_tests/signed/SignedJnlpApplication/srcs/JNLP-INF/APPLICATION.jnlp:
+        Signed jnlp application file.
+        * tests/jnlp_tests/signed/SignedJnlpApplication/srcs/SignedJnlpApplication.java:
+        A simple java class that outputs a string.
+        * tests/jnlp_tests/signed/SignedJnlpApplication/testcases/SignedJnlpApplicationTest.java:
+        Testcase that tests the launching of applications with a signed jnlp
+        application file.
+        * tests/jnlp_tests/signed/SignedJnlpTemplate/resources/SignedJnlpTemplate1.jnlp:
+        Launching jnlp file that matches the signed jnlp application template file.
+        * tests/jnlp_tests/signed/SignedJnlpTemplate/resources/SignedJnlpTemplate2.jnlp:
+        * tests/jnlp_tests/signed/SignedJnlpTemplate/resources/SignedJnlpTemplate3.jnlp:
+        Launching jnlp file that does not match the signed jnlp application
+        template file.
+        * tests/jnlp_tests/signed/SignedJnlpTemplate/srcs/JNLP-INF/APPLICATION_TEMPLATE.jnlp:
+        Signed jnlp application template file.
+        * tests/jnlp_tests/signed/SignedJnlpTemplate/srcs/SignedJnlpTemplate.java:
+        A simple java class that outputs a string.
+        * tests/jnlp_tests/signed/SignedJnlpTemplate/testcases/SignedJnlpTemplateTest.java:
+        Testcase that tests the launching of applications with a signed jnlp
+        application template file.
+        * tests/jnlp_tests/simple/UnsignedJnlpApplication/resources/UnsignedJnlpApplication1.jnlp:
+        Launching jnlp file that matches the unsigned jnlp application file.
+        * tests/jnlp_tests/simple/UnsignedJnlpApplication/resources/UnsignedJnlpApplication2.jnlp:
+        * tests/jnlp_tests/simple/UnsignedJnlpApplication/resources/UnsignedJnlpApplication3.jnlp:
+        Launching jnlp file that does not match the unsigned jnlp application file.
+        * tests/jnlp_tests/simple/UnsignedJnlpApplication/srcs/JNLP-INF/APPLICATION.jnlp:
+        Unsigned jnlp application file.
+        * tests/jnlp_tests/simple/UnsignedJnlpApplication/srcs/UnsignedJnlpApplication.java:
+        A simple java class that outputs a string.
+        * tests/jnlp_tests/simple/UnsignedJnlpApplication/testcases/UnsignedJnlpApplicationTest.java:
+        Testcase that tests the launching of applications with an unsigned jnlp
+        application file.
+        * tests/jnlp_tests/simple/UnsignedJnlpTemplate/resources/UnsignedJnlpTemplate1.jnlp:
+        Launching jnlp file that matches the unsigned jnlp application
+        template file.
+        * tests/jnlp_tests/simple/UnsignedJnlpTemplate/resources/UnsignedJnlpTemplate2.jnlp:
+        * tests/jnlp_tests/simple/UnsignedJnlpTemplate/resources/UnsignedJnlpTemplate3.jnlp:
+        Launching jnlp file that does not match the unsigned jnlp application
+        template file.
+        * tests/jnlp_tests/simple/UnsignedJnlpTemplate/srcs/JNLP-INF/APPLICATION_TEMPLATE.jnlp:
+        Unsigned jnlp application template file.
+        * tests/jnlp_tests/simple/UnsignedJnlpTemplate/srcs/UnsignedJnlpTemplate.java:
+        A simple java class that outputs a string.
+        * tests/jnlp_tests/simple/UnsignedJnlpTemplate/testcases/UnsignedJnlpTemplateTest.java:
+        Testcase that tests the launching of applications with an unsigned jnlp
+        application template file.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestOne/resources/SignedJnlpCaseTestOne1.jnlp:
+        Launching jnlp file that matches the signed jnlp application file.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestOne/resources/SignedJnlpCaseTestOne2.jnlp:
+        Launching jnlp file that does not match the signed jnlp application file.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestOne/srcs/JNLP-INF/aPpLiCaTioN.jnlp:
+        Signed jnlp application file.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestOne/srcs/SignedJnlpCase.java:
+        A simple java class that outputs a string.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestOne/testcases/SignedJnlpCaseOneTest.java:
+        Testcase that tests the case-sensitivity of the signed jnlp application's
+        filename.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestTwo/resources/SignedJnlpCaseTestTwo1.jnlp:
+        Launching jnlp file that matches the signed jnlp application template file.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestTwo/resources/SignedJnlpCaseTestTwo2.jnlp:
+        Launching jnlp file that does not match the signed jnlp application
+        template file.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestTwo/srcs/JNLP-INF/aPpLiCaTiOn_tEmPlAte.jnlp:
+        Signed jnlp application template file.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestTwo/srcs/SignedJnlpCase.java:
+        A simple java class that outputs a string.
+        * tests/jnlp_tests/signed/SignedJnlpCaseTestTwo/testcases/SignedJnlpCaseTwoTest.java:
+        Testcase that tests the case-sensitivity of the signed jnlp application
+        template's filename.
+-06-04  Danesh Dadachanji  <ddadacha@redhat.com>
+        Fix to handle absolute paths passed into jnlp_href's value.
+        * netx/net/sourceforge/jnlp/PluginBridge.java
+        (PluginBridge): Uses context of codebase to evaluate jnlp_href's value.
+        Uses JNLPCreator's create method to make new JNLPFile variables.
+        New constructor that wraps around the original one, creating a new
+        JNLPCreator to use.
+        * netx/net/sourceforge/jnlp/JNLPCreator.java: New strategy pattern class
+        to be used to wrap around the creation of a JNLPFile. Replace this creator
+        when unit testing to skip running parsing code.
+        * tests/netx/unit/net/sourceforge/jnlp/PluginBridgeTest.java:
+        New class to unit test getEvaluatedJNLPHref.
+-06-04  Adam Domurad  <adomurad@redhat.com>
+        Added self to AUTHORS.
+        This patch fixes PR518, ensures null termination of strings based off
+        of NPVariant results.
+        * plugin/icedteanp/IcedTeaPluginUtils.h: Added declaration of
+        NPVariantAsString
+        * plugin/icedteanp/IcedTeaPluginUtils.cc
+        (NPVariantAsString): New. Converts an NPVariant to a
+        std::string, assumes it is a valid NPString.
+        (isObjectJSArray): Now uses NPVariantAsString, minor cleanup.
+        * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+        (plugin_get_documentbase): Now uses NPVariantAsString.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc
+        (NPVariantToString): Now uses NPVariantAsString, minor cleanup.
+-06-01  Deepak Bhole <dbhole@redhat.com>
+        PR863: Error passing strings to applet methods in Chromium
+        * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+        (createJavaObjectFromVariant): Account for length of the characters.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_get_documentbase): Same.
+        * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (_eval): Print the
+        string's c_str rather than utf8characters.
+        * plugin/icedteanp/IcedTeaPluginUtils.cc (printNPVariant): Account for
+        length of the characters.
+        (NPVariantToString): Same.
+        (isObjectJSArray): Same.
+-05-30  Jiri Vanek  <jvanek@redhat.com>
+        Enabled multiple certificates and extracted variables
+        * Makefile.am: EXPORTED_TEST_CERT by EXPORTED_TEST_CERT_PREFIX and
+        EXPORTED_TEST_CERT_SUFFIX for further composition
+        SIGNED_REPRODUCERS new variable for  iterating through signed reproducers
+        SIMPLE_REPRODUCERS new variable for  iterating through simple reproducers
+        ALL_REPRODUCER new variable for  iterating through all reproducers
+        (junit-jnlp-dist-signed.txt) replaced by
+        (stamps/junit-jnlp-dist-signed.stamp) which generates
+        junit-jnlp-dist-signedX.txt for each directory with signed reproducers
+        (stamps/netx-dist-tests-prepare-reproducers.stamp)
+        (stamps/change-dots-to-paths.stamp)
+        (stamps/netx-dist-tests-compile-testcases.stamp)
+        (run-netx-dist-codecoverage): extracted variables
+        (clean-netx-dist-tests): iterates through all the list and removes them
+        (stamps/netx-dist-tests-sign-some-reproducers.stamp): now iterate through
+        SIGNED_REPRODUCERS and creates special certificate for each member. Each
+        jar from this directory is then signed by corresponding certificate
+        (netx-dist-tests-remove-cert-from-public): iterates through all certificates
+        (stamps/netx-dist-tests-import-cert-to-public): exports each certificate
+        created during tests preparations
+        ($(EXPORTED_TEST_CERT)) replaced by stamps/exported-test-certs.stamp which
+        create for each of SIGNED_REPRODUCERS individual certificate
+        (tests/jnlp_tests/README): mentioned possibility of multiple certificate
+-05-29  Jiri Vanek  <jvanek@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getPermissions):
+        New rethrow of exceptions and following condition make more accurate.
+-05-29  Jiri Vanek  <jvanek@redhat.com>
+        Get rid of repeated sout/serr  in reproducers testcases/unit tests and
+        introduce bottleneck for loging.
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        (PROCESS_LOG) static flag for enabling/disabling automatic logging of
+        statically executed processes.
+        (logErrorReprint) (logOutputReprint) (logNoReprint) new methods, to call
+        logging bottleneck.
+        (log) main logging bottleneck, reprint message to according stream with
+        calling test-class and test-method as suffix.
+        (getTestMethod) new method to analyze calling test-method.
+        (executeProcess) enhanced for conditional automatic logging of start of
+        process and outputs of process.
+        * tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java:
+        * tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java:
+        * tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.java:
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java:
+        * tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java:
+        * tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java:
+        * tests/jnlp_tests/simple/AddShutdownHook/testcases/AddShutdownHookTest.java:
+        * tests/jnlp_tests/simple/AllStackTraces/testcases/AllStackTracesTest.java:
+        * tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java:
+        * tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java:
+        * tests/jnlp_tests/simple/CreateClassLoader/testcases/CreateClassLoaderTest.java:
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/testcases/InformationTitleVendorParserTest.java:
+        * tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java:
+        * tests/jnlp_tests/simple/ReadEnvironment/testcases/ReadEnvironmentTest.java:
+        * tests/jnlp_tests/simple/ReadProperties/testcases/ReadPropertiesTest.java:
+        * tests/jnlp_tests/simple/RedirectStreams/testcases/RedirectStreamsTest.java:
+        * tests/jnlp_tests/simple/ReplaceSecurityManager/testcases/ReplaceSecurityManagerTest.java:
+        * tests/jnlp_tests/simple/SetContextClassLoader/testcases/SetContextClassLoaderTest.java:
+        * tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java:
+        * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java:
+        * tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.java:
+        * tests/jnlp_tests/simple/simpletest2/testcases/SimpleTest2Test.java:
+        * tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java:
+        * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java:
+        * tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java:
+        all System.out replaced by ServerAccess.logOutputReprint
+        and System.err replaced by ServerAccess.logErrorReprint
+-05-25  Adam Domurad <adomurad@redhat.com>
+        Changed for-loops over iterators and indices to for-each loops if they
+        were sufficient and clearer.
+        * netx/net/sourceforge/jnlp/JNLPFile.java: Changed for-loops that could
+        be expressed more clearly as for-each loops.
+        * netx/net/sourceforge/jnlp/PluginBridge.java: Same
+        * netx/net/sourceforge/jnlp/ResourcesDesc.java: Same
+        * netx/net/sourceforge/jnlp/cache/CacheUtil.java: Same
+        * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java: Same
+        * netx/net/sourceforge/jnlp/cache/Resource.java: Same
+        * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: Same
+        * netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java: Same
+        * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java: Same
+        * plugin/icedteanp/java/netscape/javascript/JSObject.java: Same
+        * plugin/icedteanp/java/sun/applet/JavaConsole.java: Same
+        * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Same
+-05-23  Adam Domurad  <adomurad@redhat.com>
+        Removed instances of snprintf where buffer size was not known. Added
+        buffer size constant for allocating buffers for numeric conversions.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc: Removed usage of snprintf for
+        simple blanking of strings. Buffer size was misguided previously.
+        Used NUM_STR_BUFFER_SIZE constant to replace magic numbers/
+        * plugin/icedteanp/IcedTeaPluginUtils.cc: Made
+        NPVariantToString(NPVariant variant, std::string* result) use two
+        space indentation. Used NUM_STR_BUFFER_SIZE constant to replace magic
+        numbers.
+        * plugin/icedteanp/IcedTeaPluginUtils.h: Added constant,
+        NUM_STR_BUFFER_SIZE.
+-05-24  Danesh Dadachanji <ddadacha@redhat.com>
+        Fix use of src dir instead of build dir when whitelisting.
+        * Makefile.am (REPRODUCERS_CLASS_WHITELIST): Use abs_top_srcdir
+        instead of abs_top_builddir.
+-05-23  Martin Olsson <martin@minimum.se>
+        * plugin/icedteanp/IcedTeaPluginUtils.cc:
+        Tiny fixup for changeset 383; don't do free(stack_variable).
+-05-20  Jiri Vanek  <jvanek@redhat.com>
+        Reproducers engine enhanced for jars in subdirectories by "." naming convention
+        * Makefile.am: (stamps/change-dots-to-paths.stamp) new target to copy jars
+        with dots (.jar omitted) to the java-like package/directory structure in
+        jnlp_test_server
+        (EXPORTED_TEST_CERT) now depends on  stamps/change-dots-to-paths.stamp
+        (clean-netx-dist-tests) removes stamps/change-dots-to-paths.stamp too.
+-05-24  Jiri Vanek  <jvanek@redhat.com>
+        Introduced whitelist for reproducers
+        * netx-dist-tests-whitelist: new file, contains regular expressions
+        (separated by space) for expr to select testcases which only will be
+        run. By default set to all by expression .*
+        * Makefile.am: (REPRODUCERS_CLASS_NAMES) When class with testcases is
+        going to be included in list, it is at first check for match in whitelist.
+        If there is no match, will not be included.
+-05-24  Martin Olsson <martin@minimum.se>
+        * plugin/icedteanp/IcedTeaPluginUtils.cc:
+        Fix two typos.
+-05-23  Deepak Bhole <dbhole@redhat.com>
+        * AUTHORS: Added Martin Olsson to list.
+-05-23  Martin Olsson  <martin@minimum.se>
+        * plugin/icedteanp/IcedTeaNPPlugin.cc:
+        Use g_mutex_free instead of g_free to free appletviewer_mutex (fixes
+        crash).
+-05-23  Deepak Bhole <dbhole@redhat.com>
+        * ChangeLog: Converted spaces to tabs in an older entry
+-05-23  Jiri Vanek  <jvanek@redhat.com>
+        * netx/net/sourceforge/jnlp/resources/Messages.properties: fixed error
+        in PBadNonrelativeUrl
+-05-23 Jiri Vanek  <jvanek@redhat.com>
+        Added more debugging outputs
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+        (getCodeSourceSecurity): added output message when no SecurityDesc is found
+        for some url/resource
+        * netx/net/sourceforge/jnlp/resources/Messages.properties: added LNoSecInstance
+        and LCertFoundIn values
+        * netx/net/sourceforge/jnlp/security/KeyStores.java: (getPathToKeystore):
+        new method, able to search for file used for creating of KeyStore if possible
+        * netx/net/sourceforge/jnlp/security/CertificateUtils.java: (inKeyStores)
+        using getPathToKeystore for debug output
+-05-23  Jiri Vanek  <jvanek@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getPermissions):
+        Any exception from this method is consumed somewhere. I have cough exception,
+        reprint it in debug mode and re-throw (to be lost). Main condition in this
+        method had several possible NullPointer exceptions. Separated and thrown before
+        this condition.
+-05-23  Jiri Vanek  <jvanek@redhat.com>
+        Enhanced about dialog
+        * extra/net/sourceforge/javaws/about/Main.java: Main frame and Main tab
+        renamed from "About NetX" to "About IcedTea-Web and NetX".
+        * extra/net/sourceforge/javaws/about/resources/about.html: mentioned
+        IcedTea-Web.
+        * extra/net/sourceforge/javaws/about/resources/notes.html: List of authors
+        synchronized with AUTHORS, mentioned classpath's IcedTea-Web as homepage
+        of IcedTea-web.
+-05-23  Jiri Vanek  <jvanek@redhat.com>
+        Fixed error in reproducers source preparation
+        * Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp) removed
+        inappropriately used quotes when copying notSrcFiles. Source files now
+        copied only if src dir exists in reproducer
+-05-22  Adam Domurad  <adomurad@redhat.com>
+        Changed allocation of small, fixed-size buffers to stack-based
+        allocations. Changed occurences of sprintf to the safer function
+        snprintf, added buffer information. While unlikely to change
+        functionality, snprintf adds an extra check to prevent buffer
+        overflows.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc: Allocation of small buffers
+        using malloc changed to stack allocation & changed sprintf calls to
+        buffer-size aware snprintf calls.
+        * plugin/icedteanp/IcedTeaPluginUtils.cc: Same as above.
+-05-22  Jiri Vanek  <jvanek@redhat.com>
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java:
+        * tests/jnlp_tests/simple/AddShutdownHook/testcases/AddShutdownHookTest.java:
+        * tests/jnlp_tests/simple/AllStackTraces/testcases/AllStackTracesTest.java:
+        * tests/jnlp_tests/simple/CreateClassLoader/testcases/CreateClassLoaderTest.java:
+        * tests/jnlp_tests/simple/ReadEnvironment/testcases/ReadEnvironmentTest.java:
+        * tests/jnlp_tests/simple/ReadProperties/testcases/ReadPropertiesTest.java:
+        * tests/jnlp_tests/simple/RedirectStreams/testcases/RedirectStreamsTest.java:
+        * tests/jnlp_tests/simple/ReplaceSecurityManager/testcases/ReplaceSecurityManagerTest.java:
+        * tests/jnlp_tests/simple/SetContextClassLoader/testcases/SetContextClassLoaderTest.java:
+        All exact matches upon AccessControlException replaced by regular expression matching both jdk7 and jdk6 syntax
+-05-21  Jiri Vanek  <jvanek@redhat.com>
+        * Makefile.am: mzilla-filesystem linking targets now counts also with
+        midori and epiphany. Extracted duplicated entries to variables
+        * configure.ac: added  check for midori and epiphany
+-05-21  Jiri Vanek  <jvanek@redhat.com>
+        Added detection of installed browsers and added targets to create
+        symbolic links from install dir to browsers' plugin directories.
+        Primarily for testing purposes
+        * Makefile.am: (stamps/user-links.stamp) with alias (links) - new target for
+        creating symlinks for all users. One must be root to execute this target.
+        (stamps/global-links.stamp) with alias (user-links) - new target
+        for creating symlinks for logged user only. Because opera is missing this feature,
+        quite useless for testing or dependence targets, but good for live user.
+        (restore-global-links): target for restoring original global links.
+        One must be root again
+        (restore-user-links): target for restoring user's links
+        * configure.ac: added basic check whether and which browsers are
+        installed
+-05-18  Jiri Vanek  <jvanek@redhat.com>
+        Fixed behavior when encoded/characters needed encoding included in url
+        * NEWS: mentioned PR811
+        * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (urlEquals) Enhanced
+        to be able compare encoded/decoded urls correctly.
+        (notNullUrlEquals) new method to separate comparing of individual parts of
+        url from null checks
+        * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: (addResource)
+        is now encoding url if needed. (normalizeUrl) new method to encode path in
+        url of all except file protocol. (normalizeChunk) New method for encoding
+        of atomic piece.
+-05-18  Jiri Vanek  <jvanek@redhat.com>
+        More tests for Spaces and characters in urls
+        * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: and
+        * netx/net/sourceforge/jnlp/cache/CacheUtil.java: for unit-tests
+        purposes (cacheDir) make to point to tmp dir when no
+        DeploymentConfiguration exists.
+        * tests/jnlp_tests/signed/Spaces can be everywhere signed/:
+        couple of new test doing the same as simple "Spaces can be everywhere"
+        but are signed
+        * tests/jnlp_tests/simple/Spaces can be everywhere/: added new test-cases
+        and html/jnlp test files to try more combinations of encodable characters
+        x launches
+        * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java:
+        unittest for url encoder behavior
+        * tests/netx/unit/net/sourceforge/jnlp/cache/CacheUtilTest.java:
+        unittest for urlEquals function
+-05-17  Adam Domurad  <adomurad@redhat.com>
+        Fixed uses of == to compare String objects to .equals where
+        appropriate.
+        Noted a non-obvious use of == to compare a 'magic' String reference.
+        * netx/net/sourceforge/jnlp/JNLPFile.java:
+        Changed calls that compare String contents from == to .equals
+        * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java:
+        Same
+        * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java:
+        Same
+        * netx/net/sourceforge/jnlp/Version.java: Added comment explaining why
+        == was used vs .equals
+-05-14  Jiri Vanek  <jvanek@redhat.com>
+        * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java:
+        * tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java:
+        System.out replaced with System.err
+-05-14  Jiri Vanek  <jvanek@redhat.com>
+        * tests/junit-runner/JunitLikeXmlOutputListener.java: fixed indentation
+        and spacing
+-05-11  Thomas Meyer  <thomas@m3y3r.de>
+        * tests/netx/unit/net/sourceforge/jnlp/util/PropertiesFileTest.java: Add
+        some unit tests for the PropertiesFile class
+        * tests/netx/unit/net/sourceforge/jnlp/cache/CacheLRUWrapperTest.java: Add
+        some unit tests for the CacheLRUWrapper class
+        * netx/net/sourceforge/jnlp/util/PropertiesFile.java: Use last
+        modification timestamp of the underlying file to lazy load properties.
+        (load): Only reload file, if the file modification timestamp has changed.
+        (store): Actually fsync() the file to disk.
+        * netx/net/sourceforge/jnlp/services/XPersistenceService.java (create):
+        Fix coding style
+        * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java (load): Only check
+        data when the recently_used file was reloaded.
+-05-02  Jiri Vanek  <jvanek@redhat.com>
+        Introduced new annotations Bug (to connect test/reproducer with documentation)
+        and NeedsDisplay which tells the launching engine that this particular
+        test needs Display. Based on ptisnovs's ideas and jtreg experiences
+        *Makefile.am: (JUNIT_RUNNER_JAR), (stamps/run-netx-unit-tests.stamp) and
+        (stamps/run-unit-test-code-coverage.stamp) are now dependent on (stamps/netx-dist-tests-compile)
+         and classpaths inside them have been enriched for JNLP_TESTS_ENGINE_DIR
+        which contains definitions of those annotations
+        *tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java: and
+        *tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java: and
+        *tests/jnlp_tests/simple/Spaces can be everywhere/testcase/SpacesCanBeEverywhereTests.java:
+         filled Bug annotations
+        *tests/junit-runner/JunitLikeXmlOutputListener.java: made to understand
+        Bug annotation
+        *tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/NeedsDisplay.java:
+        and
+        *tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/Bug.java:
+        annotations definitions
+        *tests/report-styles/jreport.xsl: made nice links from bug annotation
+        prepared by JunitLikeXmlOutputListener
+-04-24  Omair Majid  <omajid@redhat.com>
+        * Makefile.am
+        (RUNTIME): Add resources.jar.
+        (stamps/run-unit-test-code-coverage.stamp) [WITH_EMMA]: Add resouces.jar
+        to classpath.
+        (stamps/run-reproducers-test-code-coverage.stamp) [WITH_EMMA]: Include
+        resources.jar in classpath.
+        (stamps/bootstrap-directory.stamp): Create a link to resources.jar in
+        BOOT_DIR.
+-04-19  Omair Majid  <omajid@redhat.com>
+        PR918: java applet windows uses a low resulution black/white icon
+        * NEWS: Update with fix.
+        * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Remove windowIcon.
+        (initialize): Do not call loadWindowIcon.
+        (getWindowIcon): Remove.
+        (setWindowIcon): Remove.
+        (loadWindowIcon): Remove.
+        * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
+        (checkTopLevelWindow): Do not set the icon for all top level windows. Use
+        the default java icon instead.
+        * netx/net/sourceforge/jnlp/util/ImageResources.java: New file. Provides
+        access to icons.
+        * netx/net/sourceforge/jnlp/JNLPSplashScreen.java (JNLPSplashScreen),
+        * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java
+        (getListener),
+        * netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java
+        (AdvancedProxySettingsDialog),
+        * netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java (CacheViewer),
+        * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java (ControlPanel),
+        * netx/net/sourceforge/jnlp/security/SecurityDialog.java (SecurityDialog),
+        * netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java
+        (CertificateViewer),
+        * netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java (show),
+        * plugin/icedteanp/java/sun/applet/JavaConsole.java (initialize):
+        Explicitly load icons.
+        * tests/netx/unit/net/sourceforge/jnlp/util/ImageResourcesTest.java: Test
+        for ImageResources class.
+-04-18  Jiri Vanek  <jvanek@redhat.com>
+        Allowed signed applets in automatic reproducers tests
+        * tests/jnlp_tests/signed/AppletTestSigned/resources/AppletTestSigned.html:
+        html file for launching signed applet. Its style is different from the one for
+        calling unsigned applets - red.
+        * tests/jnlp_tests/signed/AppletTestSigned/resources/AppletTestSigned.jnlp:
+        jnlp file for launched signed applet
+        * tests/jnlp_tests/signed/AppletTestSigned/srcs/AppletTestSigned.java
+        body of signed applet
+        * tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java:
+        (AppletTestSignedTest): testing method to launch signed applet in javaws
+        (AppletTestSignedFirefoxTest): testing method to launch signed applet in
+        browser
+        * Makefile.am: PUBLIC_KEYSTORE_PASS, EXPORTED_TEST_CERT, TEST_CERT_ALIAS,
+        PUBLIC_KEYSTORE PUBLIC_KEYSTORE_PASS: new global variables holding
+        keystores' credentials
+        (clean-local): clean-bootstrap-directory moved to be last one, as keytool
+        is necessary for removing certificate
+        (EXPORTED_TEST_CERT): new target exporting certificate from testing keystore
+        (stamps/netx-dist-tests-import-cert-to-public): new target to import
+        certificate to PUBLIC_KEYSTORE
+        (netx-dist-tests-remove-cert-from-public): new target removing testing
+        certificate from PUBLIC_KEYSTORE
+        (clean-netx-dist-tests): now depends on netx-dist-tests-remove-cert-from-public
+        and is removing EXPORTED_TEST_CERT file
+-04-17  Jiri Vanek <jvanek@redhat.com>
+        Rewritten DeadLockTestTest to stop failing in more then 1/2 of cases
+        All assassinated processes were hanging as zombies, killed forcibly by
+        kill -9 now.
+        * /tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java:
+        (countJavaInstances) now return pids of found javas.
+        (killDiff) new method killing zombie javas forcibly.
+-04-11  Jiri Vanek  <jvanek@redhat.com>
+        * Makefile.am: EMMA_JAVA_ARGS, new variable for adjusting emma runs.
+        Currently set to -Xmx2G.
+        (stamps/run-unit-test-code-coverage.stamp),
+        (stamps/run-reproducers-test-code-coverage.stamp),
+        (run-test-code-coverage): Use EMMA_JAVA_ARGS in theirs emma runs.
+-06-04  Jiri Vanek <jvanek@redhat.com>
+            Thomas Meyer <thomas@m3y3r.de>
+        * makefile.am: (stamps/run-netx-dist-tests.stamp) and
+                       (run-reproducers-test-code-coverage.stamp)
+        now using $(javaws) variable instead of plaintext javaws
+        * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (checkData) new
+        method checking for sanity of cache entries
+        (load) now checks for data sanity after loading, and stores without
+        corrupted items if necessary
+        (Comparator.compare) for sorting lru items. Now redundant checking for
+        sanity removed
+        * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (getCacheFile) don't
+        call lruHandler.store twice for new cache entries
+        (getCacheFileIfExist) removed iteration and cleaning mechanism
+        * netx/net/sourceforge/jnlp/resources/Messages.properties: modified
+        cache messages
+        * tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java
+        Added test for checking corrupted path in entry and all tests adapted for
+        exception thrown only in debug mode
+-04-04  Danesh Dadachanji <ddadacha@redhat.com>
+        Change the name of JarSigner to JarCertVerifier to make it more
+        relevant to the purpose of the file.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        * netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java:
+        Replace all instances, paramaters and references of JarSigner
+        by JarCertVerifier.
+        * netx/net/sourceforge/jnlp/security/CertWarningPane.java
+        * netx/net/sourceforge/jnlp/security/CertsInfoPane.java
+        * netx/net/sourceforge/jnlp/security/MoreInfoPane.java
+        * netx/net/sourceforge/jnlp/security/SecurityDialogs.java:
+        Replaced all paramaters, references and variable names of JarSigner
+        to CertVerifier to match the variable object type.
+        * netx/net/sourceforge/jnlp/security/SecurityDialog.java (getJarSigner):
+        Renamed to getCertVerifier as it returns the certVerfier instance.
+        * netx/net/sourceforge/jnlp/tools/JarSigner.java:
+        Renamed to JarCertVerifier.
+        * netx/net/sourceforge/jnlp/tools/JarCertVerifier.java:
+        The rename of JarSigner.
+-04-05  Jiri Vanek <jvanek@redhat.com>
+        Fixing issue when process was not launched at all and when was killed but
+        left behind living/hanging, fixing mime-types
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        (getContentOfStream) this method overloaded with possibility to specify
+        encoding (I needed to set it to ASCII in one test)
+        (deadlyException) field introduced in ThreadedProcess to record exception
+        caused by impassibility of launching the process. And so process have
+        been null without any sign why.
+        (TinyHttpdImpl) now correctly returns known mime types
+        (ProcessAssasin) can now skip or smoothly (and finally correctly)
+        destroy its process, and all his logging messages were done null-proof
+        (as deadlyException now allows)
+        Asynchronous (ContentReader) have been silenced when complaining about
+        closed streams by Assassin.
+-04-03  Danesh Dadachanji  <ddadacha@redhat.com>
+        Change all vendors in JNLP test suite to IcedTea and homepage href's to
+        a link to IcedTea-Web's wiki page.
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/resources/AccessClassInPackageSignedJAVAXJNLP.jnlp
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/resources/AccessClassInPackageSignedNETSF.jnlp
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/resources/AccessClassInPackageSignedSELF.jnlp
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/resources/AccessClassInPackageSignedSUNSEC.jnlp
+        * tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1.jnlp
+        * tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1_1.jnlp
+        * tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer2.jnlp
+        * tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer2_1.jnlp
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar.jnlp
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar2.jnlp
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar3.jnlp
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar4.jnlp
+        * tests/jnlp_tests/signed/ReadPropertiesBySignedHack/resources/ReadPropertiesBySignedHack.jnlp
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/resources/ReadPropertiesSigned1.jnlp
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/resources/ReadPropertiesSigned2.jnlp
+        * tests/jnlp_tests/signed/SimpletestSigned1/resources/SimpletestSigned1.jnlp
+        * tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackageJAVAXJNLP.jnlp
+        * tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackageNETSF.jnlp
+        * tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackageSELF.jnlp
+        * tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackageSUNSEC.jnlp
+        * tests/jnlp_tests/simple/AddShutdownHook/resources/AddShutdownHook.jnlp
+        * tests/jnlp_tests/simple/AllStackTraces/resources/AllStackTraces.jnlp
+        * tests/jnlp_tests/simple/AppletTest/resources/AppletTest.jnlp
+        * tests/jnlp_tests/simple/CheckServices/resources/CheckServices.jnlp
+        * tests/jnlp_tests/simple/CreateClassLoader/resources/CreateClassLoader.jnlp
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/resources/TitleParser.jnlp
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/resources/TitleVendorParser.jnlp
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/resources/VendorParser.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1main2mainAppDesc.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1main2mainNoAppDesc.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1main2nothingNoAppDesc.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1mainHaveAppDesc.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1mainNoAppDesc.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1noAppDesc.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1noAppDescAtAll.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1nothing2nothingAppDesc.jnlp
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/ManifestedJar-1nothing2nothingNoAppDesc.jnlp
+        * tests/jnlp_tests/simple/ReadEnvironment/resources/ReadEnvironment.jnlp
+        * tests/jnlp_tests/simple/ReadProperties/resources/ReadProperties1.jnlp
+        * tests/jnlp_tests/simple/ReadProperties/resources/ReadProperties2.jnlp
+        * tests/jnlp_tests/simple/RedirectStreams/resources/RedirectStreams.jnlp
+        * tests/jnlp_tests/simple/ReplaceSecurityManager/resources/ReplaceSecurityManager.jnlp
+        * tests/jnlp_tests/simple/SetContextClassLoader/resources/SetContextClassLoader.jnlp
+        * tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere1.jnlp
+        * tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere2.jnlp
+        * tests/jnlp_tests/simple/Spaces can be everywhere/resources/SpacesCanBeEverywhere1.jnlp
+        * tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest.jnlp
+        * tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletest1.jnlp
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestCustomSplash.jnlp
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestMegaSlow.jnlp
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestSlow.jnlp
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestSlowBrokenCustomSplash.jnlp
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestSlowSlowCustomSplash.jnlp
+        * tests/jnlp_tests/simple/simpletest2/resources/simpletest2.jnlp:
+        Replaced the specified vendor with IcedTea and homepage with a link to
+        IcedTea-Web's wiki.
+-04-03  Omair Majid  <omajid@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/pac-funcs.js: Replace incorrect use of
+        getYear() with getFullYear().
+        (inYearMonthDateRange): Add missing conditional case.
+        * tests/netx/pac/pac-funcs-test.js
+        (runTest): New function.
+        (runTests): Call runTest.
+        (incDate): Deal with month/year wrapping around.
+        (decDate): Removed.
+        (testDateRange, testDateRange2, testDateRange3): Handle wrapping of month
+        and days.
+-04-03  Jiri Vanek <jvanek@redhat.com>
+        Tests virtual server thread marked as daemon by default
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        All (ServerLauncher) instances returned by methods were marked as daemon
+        by default. Possibility to change and api were kept.
+-03-30  Danesh Dadachanji  <ddadacha@redhat.com>
+        Certificate start dates are not being checked, they are still verified
+        even if the date has yet not been reached.
+        * netx/net/sourceforge/jnlp/tools/JarSigner.java (verifyJar): If the start
+        date is in the future, set notYetValidCert to true.
+-03-21  Omair Majid  <omajid@redhat.com>
+        * tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java
+        (testIsMatchDoesNotHangOnLargeData): New method.
+-03-21  Lars Herschke  <lhersch@dssgmbh.de>
+        PR898: signed applications with big jnlp-file doesn't start
+        * netx/net/sourceforge/jnlp/JNLPMatcher.java (JNLPMatcher): Handle large
+        files correctly.
+-03-19  Danesh Dadachanji  <ddadacha@redhat.com>
+        Fix failing unit test missing title/vendor tags in the JNLP stream.
+        * tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java
+        (testNestedComments): Added title and vendor tags to malformedJnlp.
+-03-19  Jiri Vanek <jvanek@redhat.com>
+        * tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java:
+         as javaws have now integrated splash, I have changed this test to lunch
+         javaws -Xclearcache with -headless to skip this logo (although it is
+        not fatal fr testrun itself)
+        * tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests.html:
+         this html file is lunched during tests run in browser and stdout of
+         lunched applet is examined. Is lunched with slow resources to test
+         spalshscreen
+        * tests/jnlp_tests/simple/AppletTest/resources/appletViewTest.html: this
+        test html file is dedicated to manual lunch and let user to look how the
+         applet (with slow loading) is  loaded and how looks splashscreen in
+         small mode and in large mode
+        * tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java:
+         test is enriched for lunching the html file with applet in browser and
+         is examining output of this file. Browser must be always terminated as
+         there is no way how to close from inside
+        * tests/jnlp_tests/simple/simpletest1/resources/netxPlugin.png:
+         image to let user observe that user-defined splashscreen is still
+         working even when internal splashscreen is enabled
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestCustomSplash.jnlp:
+         this and all jnlp files below are just for manual lunching and for
+         watching various lunches of splash screen - slow loading of resources
+         and with custom splash
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestMegaSlow.jnlp:
+        slow loading of resource and (XslowX)jnlp also
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestSlow.jnlp:
+         slow loading of resource
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestSlowBrokenCustomSplash.jnlp:
+         slow loading of resource with broken user's splash (our internal will be used)
+        * tests/jnlp_tests/simple/simpletest1/resources/simpletestSlowSlowCustomSplash.jnlp:
+         slow loading of custom splash screen and resource
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+         Main server launcher was modified to support lunching of browser,
+         stdout listteners and for slowing download of resources to provide time
+         for watching splash screen (main) was rewritten to provide free port OR
+         run server in-D specified directory on custom or default port - very
+         useful for debuging reproducers
+         (getIndependentInstance) can now run also on specified port and (or) directory
+         (USED_BROWSER_COMMAND) new constant handling value of -D property to
+        set browser = "used.browser.command";
+         (getBrowserLocation) new method  to provide specified
+        (by used.browser.command -D property) or default browser location (firefox)
+         (ensureServer) test is testing weather XslowXmodifier is working
+         (executeBrowser) set of overloaded functions to lunch browser
+         (TinyHttpdImpl) was enriched for XslowX modifier. When resource starts
+         with this, is returned slowly - splited to 10 parts with 1s delay
+         betwen sending each of them.
+         Although it is throwing BrokenPipe exception, is working fine.
+         (splitArray) new function to split array of byte to n arrays of bytes,
+         which when concated do the same array
+         (splitArrayTestN) set of tests for splitArray
+         (ContentReader) now can also have lsteners for catching outputs n runtime.
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ContentReaderListener.java:
+        Listener for catching chars and lines form processes outputs
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:
+        added (testListeners) to test listeners behaviour
+-03-16  Danesh Dadachanji  <ddadacha@redhat.com>
+        Applications using JNLP files without a title or vendor section
+        still run, despite them being required elements.
+        * netx/net/sourceforge/jnlp/Parser.java:
+        (getInformationDesc): If title or vendor are not found in info,
+        a new ParseException is thrown.
+        * netx/net/sourceforge/jnlp/resources/Messages.properties:
+        Added PNoTitleElement and PNoVendorElement
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/resources/InformationParser.jnlp,
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/resources/TitleParser.jnlp,
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/resources/TitleVendorParser.jnlp,
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/resources/VendorParser.jnlp,
+        * tests/jnlp_tests/simple/InformationTitleVendorParser/testcases/TitleVendorParserTest.java:
+        New test that runs JNLPs in a combination of missing information, title
+        and vendor tags, checking for the appropriate exceptions.
+-03-14  Deepak Bhole <dbhole@redhat.com>
+                        Omair Majid <omajid@redhat.com>
+        PR895: IcedTea-Web searches for missing classes on each loadClass or
+        findClass
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (CodeBaseClassLoader): Added new map to track resources that are not
+        found.
+        (findClass): If resource was not found before, return immediately. If
+        resource was not found for the first time, record it in the new map.
+        (findResouces): Same.
+        (findResource): Same.
+        * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java:
+        Test case for PR895 from Omair Majid.
+-03-14  Omair Majid  <omajid@redhat.com>
+        Print exceptions to terminal when running in gui mode too.
+        * netx/net/sourceforge/jnlp/AbstractLaunchHandler.java: New file.
+        * netx/net/sourceforge/jnlp/DefaultLaunchHandler.java: Extend
+        AbstractLaunchHandler.
+        (DefaultLaunchHandler): New method.
+        (printMessage): Moved to parent class.
+        * netx/net/sourceforge/jnlp/GuiLaunchHandler.java: Extend
+        AbstractLaunchHandler.
+        (GuiLauchHandler): New method.
+        (launchError): Print the error too.
+        (launchWarning,validationError): Call parent's printMessage.
+        * netx/net/sourceforge/jnlp/LaunchException.java: Use standard java
+        exception chaining. This removes compatibility with pre-java 1.3 class
+        libraries.
+        (LaunchException(JNLPFile,Exception,String,String,String,String)): Pass
+        cause to parent so exceptions are chanined properly.
+        (LaunchException(String,Throwable),LaunchException(Throwable)): Call
+        parent's constructor.
+        (printStackTrace(PrintStream),printStackTrace(PrintWriter),getCause):
+        Removed. Use parent's implementation instead.
+        (getCauses): Removed.
+        * netx/net/sourceforge/jnlp/LaunchHandler.java
+        (validationError): Rename argument to clarify meaing.
+        * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+        (initialize): Redirect output of all handlers to System.err.
+        * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
+        (PluginAppletSecurityContext): Likewise.
+        * tests/netx/unit/net/sourceforge/jnlp/DefaultLaunchHandlerTest.java,
+        * tests/netx/unit/net/sourceforge/jnlp/LaunchExceptionTest.java: New
+        file. Contains tests.
+-03-12  Danesh Dadachanji  <ddadacha@redhat.com>
+        Adding test for regression of JNLP API accessibility in constructor
+        methods of applets.
+        * Makefile.am: Added classes.jar to classpath when compiling jnlp_tests.
+        * tests/jnlp_tests/simple/CheckServices/resources/CheckServices.jnlp:
+        * tests/jnlp_tests/simple/CheckServices/srcs/CheckServices.java:
+        * tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java:
+        New test file added. Tests ServiceManager is setup correctly when called
+        from applet constructors.
+-03-12  Danesh Dadachanji  <ddadacha@redhat.com>
+        Update tests that are missing title/vendor tag in their JNLPs.
+        * tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1.jnlp,
+        * tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1_1.jnlp,
+        * tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer2.jnlp,
+        * tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer2_1.jnlp,
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar.jnlp,
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar2.jnlp,
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar3.jnlp,
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar4.jnlp,
+        * tests/jnlp_tests/signed/ReadPropertiesBySignedHack/resources/ReadPropertiesBySignedHack.jnlp,
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/resources/ReadPropertiesSigned1.jnlp,
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/resources/ReadPropertiesSigned2.jnlp,
+        * tests/jnlp_tests/simple/AddShutdownHook/resources/AddShutdownHook.jnlp,
+        * tests/jnlp_tests/simple/AllStackTraces/resources/AllStackTraces.jnlp
+        * tests/jnlp_tests/simple/CreateClassLoader/resources/CreateClassLoader.jnlp,
+        * tests/jnlp_tests/simple/ReadEnvironment/resources/ReadEnvironment.jnlp,
+        * tests/jnlp_tests/simple/ReadProperties/resources/ReadProperties1.jnlp,
+        * tests/jnlp_tests/simple/ReadProperties/resources/ReadProperties2.jnlp,
+        * tests/jnlp_tests/simple/RedirectStreams/resources/RedirectStreams.jnlp,
+        * tests/jnlp_tests/simple/ReplaceSecurityManager/resources/ReplaceSecurityManager.jnlp,
+        * tests/jnlp_tests/simple/SetContextClassLoader/resources/SetContextClassLoader.jnlp,
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template8.jnlp:
+        Added missing title/vendor tags that make them fail with this changeset.
+-03-05  Jiri Vanek <jvanek@redhat.com>
+        Added test for main-class in manifest for jnlp
+        * Makefile.am: (prepare-reproducers.stamp) fixed manifest handling. Till
+        now was manifest copied as any other non java file, and so was rewritten
+        by jar tool
+        * tests/jnlp_tests/simple/ManifestedJar2/srcs: secondary jar file which
+        should have manifest and so should help ManifestedJar1 with testing
+        * tests/jnlp_tests/simple/ManifestedJar2/resources/META-INF/MANIFEST.MF:
+         manifest for  ManifestedJar2.jar
+        * tests/jnlp_tests/simple/ManifestedJar1/srcs: main testing jar
+        * tests/jnlp_tests/simple/ManifestedJar2/resources/META-INF/MANIFEST.MF:
+         manifest for  ManifestedJar1.jar
+        * tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java:
+         testing class for this reproducers
+        * tests/jnlp_tests/simple/ManifestedJar1/resources/: nine reproducers jnlps
+-03-06  Jiri Vanek <jvanek@redhat.com>
+        Improved reflection test:
+        * tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java:
+        This testcase was extended for three more unsigned reflection tries and four signed
+        *tests/jnlp_tests/simple/AccessClassInPackage/srcs/AccessClassInPackage.java:
+        now accepting class to be findByName as argument. Four new jnlp files in
+        signed a four in simple are then passing  those argument
+        *tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackageSUNSEC.jnlp:
+        *tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackageNETSF.jnlp:
+        *tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackageJAVAXJNLP.jnlp:
+        *tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackageSELF.jnlp:
+        *tests/jnlp_tests/simple/AccessClassInPackage/resources/AccessClassInPackage.jnlp:
+        removed
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/srcs/AccessClassInPackageSigned.java
+        signed variation of AccessClassInPackage, tescase is also in AccessClassInPackage
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/resources/AccessClassInPackageSignedSELF.jnlp
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/resources/AccessClassInPackageSignedNETSF.jnlp
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/resources/AccessClassInPackageSignedSUNSEC.jnlp
+        * tests/jnlp_tests/signed/AccessClassInPackageSigned/resources/AccessClassInPackageSignedJAVAXJNLP.jnlp
+-02-29  Deepak Bhole <dbhole@redhat.com>
+        * configure.ac: Bumped version to 1.3pre
+-02-29  Deepak Bhole <dbhole@redhat.com>
+        * netx/net/sourceforge/jnlp/security/CertificateUtils.java
+        (inKeyStores): Only check for certificate equality.
+-02-28  Deepak Bhole <dbhole@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (checkForMain): Also check manifest file of main jar.
+        (getMainClassName): New method. Looks in a jar manifest to see if there is
+        a Main-Class specified.
+-02-28  Deepak Bhole <dbhole@redhat.com>
+        * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+        (_eval): Return 0 id to Java side if eval fails.
+        (_call): Return 0 id to Java side if call fails.
+-02-27  Matthias Klose  <doko@ubuntu.com>
+        * acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the mozilla-plugin
+         pkgconfig module if the libxul module is not available.
+-02-27  Matthias Klose  <doko@ubuntu.com>
+        * acinclude.m4 (IT_FIND_JAVA): Set VERSION_DEFS.
+        * Makefile.am ($(PLUGIN_DIR)/%.o): Pass $(VERSION_DEFS)
+        * IcedTeaNPPlugin.cc (PLUGIN_MIME_DESC): Define in terms
+        of HAVE_JAVA7.
+-02-27  Thomas Meyer <thomas@m3y3r.de>
+                        Deepak Bhole <dbhole@redhat.com>
+        PR820: IcedTea-Web 1.1.3 crashing Firefox when loading Citrix XenApp
+        * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+        (createJavaObjectFromVariant): If variant is a generic object array,
+        create a JSObject on Java side instead of JSObject array.
+        * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+        (newMessageOnBus): Run finalize on main thread.
+        (eval): Create Java object in _eval
+        (call): Create Java object in _call.
+        (setMember): Create Java object in _setMember.
+        (sendMember): Create Java object in _getMember.
+        (sendString): Create Java object in _getString.
+        (_setMember): Process result and create Java object if needed.
+        (_getMember): Same.
+        (_eval): Same.
+        (_call): Same.
+        (_getString): Same.
+-02-22  Danesh Dadachanji  <ddadacha@redhat.com>
+        Add ability to check for jnlp_href use outside of PluginBridge.
+        * netx/net/sourceforge/jnlp/PluginBridge.java
+        (PluginBridge): New boolean useJNLPHref is set if jnlp_href is used.
+        (useJNLPHref): New getter method, returns boolean useJNLPHref.
+-02-10  Danesh Dadachanji  <ddadacha@redhat.com>
+        Fix path to NEW_LINE_IFS for when one builds outside of src directory.
+        * Makefile.am: Use top src directory instead of top build directory
+        for NEW_LINE_IFS
+-02-06  Danesh Dadachanji  <ddadacha@redhat.com>
+        Fixed regression in running webstart applets from JNLP files.
+        * netx/net/sourceforge/jnlp/Launcher.java (createApplet): Added call to
+        set applet variable in the AppletInstance's AppletEnvironment.
+        * netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java
+        (setApplet): New method, set AppletEnvironment's applet variable only once.
+-02-02  Danesh Dadachanji  <ddadacha@redhat.com>
+        * netx/net/sourceforge/jnlp/LaunchException.java: Fix message
+        to handle null description
+-02-01  Danesh Dadachanji  <ddadacha@redhat.com>
+        * netx/net/sourceforge/jnlp/LaunchException.java: Add description
+        parameter to the message the exception stores.
+-02-01 Jiri Vanek<jvanek@redhat.com>
+        Fix for PR844
+        * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (getLRUSortedEntries)
+        instead of error throwing own LRU exception. Also catches more then
+        NumberFormatException
+        (clearLRUSortedEntries) new method - making soft clearing of cache public
+        (clearCache) now return true if cache was cleared, false otherwise
+        (or exception)
+        * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (getCacheFileIfExist)
+        does three tires to load cache. If ifrst fails, then recently_used file
+        is emptied both in memory and on disc. When second attemmpt fails, then
+        LRU cache is forcibly cleared. if clearing fails, then error is thrown.
+        If it pass, then one more try to load entries is allowed. When third
+        attempt fails, then error is  thrown.
+        * /netx/net/sourceforge/jnlp/cache/LruCacheException.java:
+        new file, for purpose of catching this particular exception
+        * netx/net/sourceforge/jnlp/util/PropertiesFile.java: (store) tries to
+        mkdirs to its path. It is better then to fail when no cache directory exists.
+        * tests/jnlp_tests/signed/CacheReproducer: new  reproducr trying severals
+        way of corupted cache on several types of jnlp files. Is signed because
+        of reflection used.
+        * tests/jnlp_tests/signed/SimpletestSigned1: signed hello world to be
+        used in  CacheReproducer tests.
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        timeout for processes doubled, as clear cache methods sometimes took
+        more then original allowed.
+-01-27  Deepak Bhole <dbhole@redhat.com>
+        PR852: Classloader not being flushed after last applet from a site is closed
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Added variable
+        to count usage for a given ClassLoader instance.
+        (getInstance): Decrement use count for a loader after it is merged with
+        another. Increment loader use count before returning.
+        (incrementLoaderUseCount): New method. Increments loader use count.
+        (decrementLoaderUseCount): New method. Decrements loader use count.
+        * java/sun/applet/PluginAppletViewer.java (appletClose): Decrement loader
+        use count when applet is closed.
+-01-25  Jiri Vanek  <jvanek@redhat.com>
+        Added test for -Xnofork option and for applet launching by jnlp
+        * tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new file
+        By specifying new max heap size, should invoke jvm to fork when launched
+        * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java:
+        improved indentation, added debug output that main method was lunched
+        * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java:
+        small refactoring, add lunching  of deadlocktest_1.jnlp with and
+        without -Xnofork, and counting java instances during runtime
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java
+        (ThreadedProcess.run) fixed situation, when process ended, but not all
+        the output was read by its stdout/stderr readers
+        (ContentReader.run) enabled exception printing to stderr.
+        * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by jnlp file
+-01-06  Danesh Dadachanji  <ddadacha@redhat.com>
+        Use the JNLP file's information section for the Name and
+        Publisher labels of access dialogs, if available.
+        * netx/net/sourceforge/jnlp/PluginBridge.java:
+        (PluginBridge): Assigned info variable to JNLP file's information
+        section (if one is used), otherwise to a new, empty ArrayList.
+        (getInformation): Removed method, superclass method
+        should be used instead.
+        * netx/net/sourceforge/jnlp/resources/Messages.properties:
+        Adding SUnverified.
+        * a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java:
+        (addComponents): Append unverified note to the publisher label.
+-01-09  Deepak Bhole <dbhole@redhat.com>
+        PR838: IcedTea plugin crashes with chrome browser when javascript is executed
+        * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (eval): Added a check
+        to ensure that the result pointer is valid before attempting to create an
+        NPVariant from it.
+-01-05  Omair Majid <omajid@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (initializeResources): Only throw exceptions about the main class not
+        being found when the jnlp file can have a main class.
+        (addToCodeBaseLoader): Dont try to process null URLs.
+-12-15  Jiri Vanek  <jvanek@redhat.com>
+        * configure.ac: added search for xsltproc program and setting
+        WITH_XSLTPROC variable
+        * Makefile.am: xsltproc result is no longer ignored, command
+        itself is in conditional block
+-12-22  Thomas Meyer <thomas@m3y3r.de>
+        * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc(sendMember): Use
+        correct response parameter when returning array member vs member itself.
+-12-21  Thomas Meyer <thomas@m3y3r.de>
+        RH586194: Unable to connect to connect with Juniper VPN client
+        * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc(sendMember): Use
+        createJavaObjectFromVariant to create the resulting object on Java side,
+        rather than always creating a JSObject.
+-12-21  Jiri Vanek  <jvanek@redhat.com>
+        * acinclude.m4: added definition of IT_CHECK_XULRUNNER_API_VERSION,
+        which tries to compile small program against new xulrunner api
+        * configure.ac: added call of IT_CHECK_XULRUNNER_API_VERSION
+        * plugin/icedteanp/IcedTeaNPPlugin.cc: (NP_GetMIMEDescription)
+        return type set-up by dependency on defined LEGACY_XULRUNNERAPI.
+         This one is set by IT_CHECK_XULRUNNER_API_VERSION during configure.
+        if defined, then old char* is used. New const char* is used otherwise.
+-12-19  Danesh Dadachanji <ddadacha@redhat.com>
+        Fix for BasicService being used in applet constructors but not
+        having access to ApplicationInstance variable.
+        * netx/net/sourceforge/jnlp/Launcher.java:
+        (createApplet): Moved applet initialization below loader.setApplication,
+        appletInstance is now initialized with applet param as null.
+        * netx/net/sourceforge/jnlp/runtime/AppletInstance.java:
+        (setApplet): New method, allows setting of AppletInstance's applet
+        only once.
+-12-16  Deepak Bhole <dbhole@redhat.com>
+        Patch from Thomas Meyer <thomas@m3y3r.de>
+        * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Fixed function name
+        in comment for sendMember.
+-12-08  Omair Majid  <omajid@redhat.com>
+        * netx/net/sourceforge/jnlp/Launcher.java
+        (launchApplication): Print arguments being passed to the application's
+        main method in debug mode.
+-12-05  Danesh Dadachanji <ddadacha@redhat.com>
+        Update UI for AccessWarningPane
+        * netx/net/sourceforge/jnlp/security/AccessWarningPane.java:
+        Use question.png instead of warning.png for access dialogs.
+-11-28 Jiri Vanek <jvanek@redhat.com>
+        Added code-coverage generation targets
+        * configure.ac: added search for optional emma.jar
+        * makefile.am: added UNIT_CLASS_NAMES and REPRODUCERS_CLASS_NAMES variables
+        to store tests clases for reuse in emmarun. Both also moved to separate target
+        (run-netx-unit-tests): made dependent on reused stamped version
+        (run-netx-dist-tests): made dependent on reused stamped version
+        (stamps/run-netx-dist-tests): stamped rusable version of run-netx-dist-tests
+        (run-unit-test-code-coverage) targets to generate report from unit-tests.
+         Result binary and xml file and html report in tests.build/netx/unit
+        (run-reproducers-test-code-coverage) targets to generate report from
+         reproducers-test. Result binary file, xml and html report in
+         tests.build/netx/jnlp_testsengine
+        (run-test-code-coverage): merges binary results from unit and reproducers
+        (clean-unit-test-code-coverage) conditionaly removes html,xml report
+         and es and ec files from tests.build/netx/unit
+        (clean-reproducers-test-code-coverage) condtionlay removes html and xml
+         report and es file from tests.build/netx/jnlp_testsengine
+        (clean-test-code-coverage) conditionlay removes merged html, xml es and em
+        files from tests.build
+        (clean-netx-tests) now depends also on clean-test-code-coverage
+-11-11  Jiri Vanek  <jvanek@redhat.com>
+        Added reproducer for PR804 and PR8011
+        * tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere1.jnlp:
+        new jnlp file with space in name and with jar in resources which name does not contain
+        spaces
+        * tests/jnlp_tests/simple/Spaces can be everywhere/resources/Spaces can be everywhere2.jnlp:
+        new jnlp file with space in name and with jar in resources which name contains spaces
+        * tests/jnlp_tests/simple/Spaces can be everywhere/resources/SpacesCanBeEverywhere1.jnlp:
+        jnlp file without space in name but with jar in resources which name contains spaces
+        * tests/jnlp_tests/simple/Spaces can be everywhere/srcs/SpacesCanBeEverywhere.java:
+        new file containig simple main method of "Spaces can be everywhere.jar" jar
+        * tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
+        testcase for this reproducer. It is lunching  each of this jnlp once locally from filesystem and
+        once remotely from server. Please note that except it's own jar, this reproducer is also
+        using simpletest1.jar
+-11-11  Jiri Vanek  <jvanek@redhat.com>
+        Fixed reproducers engine to handle spaces in files and in urls
+        * Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp)
+        (stamps/netx-dist-tests-sign-some-reproducers.stamp)
+        (stamps/netx-dist-tests-compile-testcases.stamp):
+        added call to NEW_LINE_IFS to use line breake temporarily as parameter
+        separator while loading files from list and correct quoting
+        * NEW_LINE_IFS: new file, small separate script used in makefile as inline script
+        which backup original IFS variable and then set it to pure new line. It is in
+        separate file because it is reused and I do not know another way how to save a new
+        line variable in makefile. Restore to original vlaue is handled in Makefile
+        *tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:
+        (testResourcesExists) filename is encoded to correct URL before requested from server
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        "-headless" string extracted to variable HEADLES_OPTION
+        (executeProcess) and (ThreadedProcess) enhanced for variable dir to specify working
+        directory. Backward compatibility kept
+        (TinyHttpdImpl) now expects url on requests, so all requests are now decoded by
+        java.net.URLDecoder
+-11-10  Jiri Vanek <jvanek at redhat.com>
+        Added tests which covers corner cases or rhino support function dateRange
+        Enabled testWeekdayRange test
+        * tests/netx/pac/pac-funcs-test.js: (testWeekdayRange) - added mising
+        runTests call
+        (incDate) (decDate) (monthToStr) moved level up from function scope
+        to be shareable
+        (testDateRange2) new method, tests last days of months.
+        (testDateRange3) new method, tests first days of months
+        * netx/net/sourceforge/jnlp/runtime/pac-funcs.js:
+        (dateRange) logic of this method moved to isDateInRange. This one now serve
+        just as api using current date
+        (isDateInRange) logic of dateRange, can calculate ranges against any date
+-10-31  Omair Majid  <omajid@redhat.com>
+        PR808: javaws is unable to start when missing jars are enumerated before
+        main jar
+        * NEWS: Update.
+        * netx/net/sourceforge/jnlp/tools/JarSigner.java (verifyJars): Continue
+        with other jars if the first jar can't be used.
+-10-28  Deepak Bhole <dbhole@redhat.com>
+        RH742515, CVE-2011-3377: IcedTea-Web: second-level domain subdomains and
+        suffix domain SOP bypass
+        * NEWS: Updated
+        * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
+        (checkPermission): Remove special case for SocketPermission.
+-10-27  Deepak Bhole <dbhole@redhat.com>
+        PR778: Jar download and server certificate verification deadlock
+        * ChangeLog: Removed extra whitespace from previous entries
+        * NEWS: Updated
+        * netx/net/sourceforge/jnlp/GuiLaunchHandler.java (launchInitialized):
+        Moved as much code as possible out of the invokeLater block.
+-10-25  Omair Majid  <omajid@redhat.com>
+        PR804: javaws launcher incorrectly handles file names with spaces
+        * NEWS: Update.
+        * launcher/javaws.in: Use bash arrays to store arguments to handle
+        filenames with spaces correctly.
+-10-24  Jiri Vanek <jvanek@redhat.com>
+        Added reproducer for - PR788: Elluminate Live! is not working
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar.jnlp
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar2.jnlp
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar3.jnlp
+        * tests/jnlp_tests/signed/MissingJar/resources/MissingJar4.jnlp
+        four testcases's jnlp files. Differs by order and by used resoure tags
+        * tests/jnlp_tests/signed/MissingJar/srcs/MissingJar.java
+        very simple main jar, just printing message when initialized
+        * tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.java
+        testing file of reproducer, launchiing above four jnlp files, each in individual test
+-10-17  Jiri Vanek <jvanek@redhat.com>
+        PR564: NetX depends on sun.misc.BASE64Encoder
+        * configure.ac: removed IT564 comment, removed check for sun.misc.BASE64Encoder
+        * netx/net/sourceforge/jnlp/security/CertificateUtils.java : sun.misc.BASE64Encoder;
+        replaced (just changed import) by internal implementation from
+        net.sourceforge.jnlp.util.replacements.BASE64Encoder;
+        * netx/net/sourceforge/jnlp/util/replacements/BASE64Encoder.java:
+        * netx/net/sourceforge/jnlp/util/replacements/CharacterEncoder.java:
+        New files, internal implementation of BASE64Encoder,  copied from OpenJDK
+        * tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java
+        New file, to test internal base64encoder implementation
+-10-03  Jiri Vanek <jvanek@redhat.com>
+        * tests/jnlp_tests/signed/ReadPropertiesBySignedHack/resources/ReadPropertiesBySignedHack.jnlp
+        * tests/jnlp_tests/signed/ReadPropertiesBySignedHack/srcs/ReadPropertiesBySignedHack.java
+        * tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/resources/ReadPropertiesSigned1.jnlp
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/resources/ReadPropertiesSigned2.jnlp
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/srcs/ReadPropertiesSigned.java
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java
+        Direcory signed was somehow missing from my commit from 2011-09-22.
+        Now it  have been added with all its original files
+-09-29  Omair Majid  <omajid@redhat.com>
+        PR618: Can't install OpenDJ, JavaWebStart fails with Input stream is null
+        error.
+        * NEWS: Update.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (getResource): Rename to ...
+        (findResource): New method.
+        (findResources): If resource can not be found, search in lazy resources.
+        (findResourcesBySearching): New method.
+-09-28  Omair Majid  <omajid@redhat.com>
+        * netx/net/sourceforge/jnlp/AppletDesc.java (getMainClass): Clarify the
+        return value in javadoc.
+        * netx/net/sourceforge/jnlp/Launcher.java
+        (createApplet, createAppletObject): Do not replace '/' with '.'.
+        * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge): Ensure that
+        the class name is in the dot-separated from.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (checkForMain): Ensure that the name is an exact match.
+-09-28  Deepak Bhole <dbhole@redhat.com>
+        PR794: IcedTea-Web does not work if a Web Start app jar has a Class-Path
+        element in the manifest.
+        * netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
+        (retrieve): Blank out the Class-Path elements in manifest.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (activateJars): Only load Class-Path elements if this is an applet.
+        (addNewJar): Add the right permissions for the cached jar file and verify
+        signatures.
+-09-26  Lars Herschke  <lhersch@dssgmbh.de>
+        * netx/net/sourceforge/jnlp/resources/Messages.properties: Add
+        CVExportPasswordMessage, CVImportPasswordMessage and
+        CVPasswordTitle.
+        * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize):
+        Initialize SSLContext with the user's client certificates.
+        * netx/net/sourceforge/jnlp/security/CertificateUtils.java
+        (addPKCS12ToKeyStore, addPKCS12ToKeyStore, dumpPKCS12): New methods.
+        * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
+        (getPasswords): New method.
+        (ImportButtonListener.actionPerformed): Import client certificates
+        in PKCS12 format.
+        (ExportButtonListener.actionPerformed): Export client certificates
+        in PKCS12 format.
+-09-23  Omair Majid  <omajid@redhat.com>
+        RH738814: Access denied at ssl handshake
+        * netx/net/sourceforge/jnlp/security/SecurityDialogs.java
+        (showCertWarningDialog): Add a javadoc comment.
+        * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java
+        (askUser): Wrap the call to showCertWarningDialog in a doPrivileged
+        block.
+-09-22  Omair Majid  <omajid@redhat.com>
+        PR788: Elluminate Live! is not working
+        * NEWS: Update.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+        (checkForMain): If localFile is null (JAR couldn't be downloaded), try to
+        continue, rather than allowing the exception to cause an abort.
+-09-21  Omair Majid  <omajid@redhat.com>
+        PR766: javaws fails to parse an <argument> node that contains CDATA
+        * netx/net/sourceforge/nanoxml/XMLElement.java
+        (sanitizeInput): Do not remove CDATA sections along with comments.
+-09-20  Omair Majid  <omajid@redhat.com>
+        * tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java
+        (testCdata, testCdataNested, testCDataFirstChild, testCDataSecondChild)
+        (testCommentInElements2, testDoubleDashesInComments): New methods
+        * tests/netx/unit/net/sourceforge/jnlp/application/application0.jnlp,
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template0.jnlp:
+        Change <!CDATA[ to <![CDATA[.
+-09-22  Lars Herschke  <lhersch@dssgmbh.de>
+        PR789: typo in jrunscript.sh
+        * jrunscript.in: Use = instead of ==.
+-09-22  Jiri Vanek <jvanek@redhat.com>
+        * tests/jnlp_tests/signed/ReadPropertiesBySignedHack/resources/ReadPropertiesBySignedHack.jnlp:
+        jnlp file to lunch ReadPropertiesBySignedHack, notice please dependenci
+        on ReadProperties.jar from simple reproducers
+        * tests/jnlp_tests/signed/ReadPropertiesBySignedHack/srcs/ReadPropertiesBySignedHack.java:
+        this reproducers verify, that even reflection-by enabled
+        XtrustAll will not allow to lunch unsigned code
+        * tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java:
+        testcase for this reproducer
+-09-22  Jiri Vanek <jvanek@redhat.com>
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/resources/ReadPropertiesSigned1.jnlp:
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/resources/ReadPropertiesSigned2.jnlp:
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java:
+        * tests/jnlp_tests/signed/ReadPropertiesSigned/srcs/ReadPropertiesSigned.java:
+        those four files are  example of signed reproducer
+        * tests/jnlp_tests/simple/ReadProperties/srcs/ReadProperties.java: now prints out got
+        variable for comparsion with above created signed example
+-09-22  Jiri Vanek <jvanek@redhat.com>
+        Added signed reproducers engine
+        * Makefile.am: added variable KEYSTORE_NAME
+        (stamps/junit-jnlp-dist-dirs): creates stamp and depend on next two targets
+        (junit-jnlp-dist-simple.txt): creates list of simple reproducers, extracted
+         from stamps/junit-jnlp-dist-dirs
+        (junit-jnlp-dist-signed.txt): creates list of signed reproducers
+        (stamps/netx-dist-tests-prepare-reproducers.stamp): now traverse over
+        signed and simple
+        (stamps/netx-dist-tests-sign-some-reproducers.stamp): depends
+        on netx-dist-tests-prepare-reproducers, traverse through signed
+        reproducers and sign them
+        (stamps/netx-dist-tests-compile-testcases.stamp): now traverse over
+        signed and simple
+        (stamps/bootstrap-directory.stamp): creates symlinks/stubs to
+        jarsigner and keytool
+        (clean-netx-dist-tests):remove new stamps, signed and simple list and keysstore
+        * acinclude.m4: declared to proceed IT_FIND_KEYTOOL and IT_FIND_JARSIGNER macro
+        * configure.ac: declared macros to check for keytool and jarsigner
+        * tests/jnlp_tests/README: mentioned signed directory
+-09-22  Jiri Vanek <jvanek@redhat.com>
+        * netx/net/sourceforge/jnlp/runtime/Boot.java: (main): added logic to
+        handle -Xtrustall option
+        * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: declared private static boolean
+        trustAll=false; with public getter and pkg.private  setter
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (checkTrustWithUser): modified,
+        when XtrustAll declared, then user is not asked and certificate is trusted
+        * netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java:  (askUser): modified,
+        when XtrustAll declared, then user is not asked and certificate is trusted
+-09-15  Jiri Vanek <jvanek@redhat.com>
+        * tests/jnlp_tests/: all current reproducers (AccessClassInPackage
+        AddShutdownHook AllStackTraces CreateClassLoader deadlocktest
+        ReadEnvironment ReadProperties RedirectStreams ReplaceSecurityManager
+        SetContextClassLoader simpletest1 simpletest2) junit's asserts are enchanted
+        for reason, so junit assertion exception message is much clearer.
+-09-13  Deepak Bhole <dbhole@redhat.com>
+        PR782: Support building against npapi-sdk as well
+        Patch from MichaÅ GÃ³rny < mgorny at gentoo dot org >
+        * acinclude.m4: Build against npapi-sdk.
+-09-13  Deepak Bhole <dbhole@redhat.com>
+        * ChangeLog: Fixed formatting issues in previous entry.
+-09-01 Jiri Vanek<jvanek@redhat.com>
+        Added functionality to allow icedtea web to be buildable with
+        rhel5 libraries.
+        * configure.ac: added IT_CHECK_GLIB_VERSION check.
+        * acinclude.m4: added IT_CHECK_GLIB_VERSION definition block to test.
+        version of glib installed and add LEGACY_GLIB define macro into
+         variable DEFS if version is <2.16.
+        * plugin/icedteanp/IcedTeaNPPlugin.cc: added replacements for incompatible
+        functions (g_strcmp0 and find_first_item_in_hash_table)if LEGACY_GLIB
+        is defined. Added define sections for use this function instead of glib ones.
+        Duplicated code moved into function getFirstInTableInstance(GHashTble* table).
+        * Makefile.am: ($(PLUGIN_DIR)/%.o): using DEFS setted by configure for compilation
 -08-29  Deepak Bhole <dbhole@redhat.com>
 …
         (checkServerTrusted): Account for a null hostname that the
         overloaded implementation may pass.
+-08-23  Omair Majid  <omajid@redhat.com>
+        * configure.ac: Add check for new non-standard classes
+        sun.net.www.protocol.jar.URLJarFile and
+        sun.net.www.protocol.jar.URLJarFileCallBack.
 -08-23  Omair Majid  <omajid@redhat.com>
 …
         JRE.
+-08-22  Saad Mohammad  <smohammad@redhat.com>
+        * netx/net/sourceforge/jnlp/JNLPFile.java:
+        (parse): After the file has been parsed, it calls
+        checkForSpecialProperties() to check if the resources contain any special
+        properties.
+        (checkForSpecialProperties): Scans through resources and checks if it
+        contains any special properties.
+        (requiresSignedJNLPWarning): Returns a boolean after determining if a signed
+        JNLP warning should be displayed.
+        (setSignedJNLPAsMissing): Informs JNLPFile that a signed JNLP file is
+        missing in the main jar.
+        * netx/net/sourceforge/jnlp/SecurityDesc.java:
+        (getJnlpRIAPermissions): Returns all the names of the basic JNLP system
+        properties accessible by RIAs.
+        * netx/net/sourceforge/jnlp/resources/Messages.properties:
+        Added LSignedJNLPFileDidNotMatch and SJNLPFileIsNotSigned.
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+        (initializeResources): Locates the jar file that contains the main class
+        and verifies if a signed JNLP file is also located in that jar. This also
+        checks 'lazy' jars if the the main class was not found in 'eager' jars.
+        If the main jar was not found, a LaunchException is thrown which terminates
+        the launch of the application.
+        (checkForMain): A method that goes through each jar and checks to see
+        if it has the main class. If the main class is found, it calls
+        verifySignedJNLP() to verify if a valid signed JNLP file is also found in
+        the jar.
+        (verifySignedJNLP): A method that checks if the jar file contains a valid
+        signed JNLP file.
+        (closeStream): Closes a stream.
+        (loadClassExt): Added a try/catch block when addNextResource() is called.
+        (addNextResource): If the main jar has not been found, checkForMain() is
+        called to check if the jar contains the main class, and verifies if a signed
+        JNLP file is also located.
+        * netx/net/sourceforge/jnlp/security/MoreInfoPane.java:
+        (addComponents): Displays the signed JNLP warning message if necessary.
+        * netx/net/sourceforge/jnlp/security/SecurityDialog.java:
+        (SecurityDialog): Stores the value of whether a signed JNLP warning should
+        be displayed.
+        (showMoreInfoDialog): Passes in the associated JNLP file when creating a
+        SecurityDialog object.
+        (requiresSignedJNLPWarning): Returns a boolean after determining if a signed
+        JNLP warning should be displayed.
+-08-17  Danesh Dadachanji <ddadacha@redhat.com>
+        Update UI for SecurityDialog
+        * netx/net/sourceforge/jnlp/resources/question.png: New icon added.
+        * netx/net/sourceforge/jnlp/security/CertWarningPane.java:
+        (addComponents): When certs are verified, question.png is used as the icon
+        and SAlwaysTrustPublisher is automatically selected.
+        * netx/net/sourceforge/jnlp/security/SecurityDialog.java:
+        (initDialog): Changed the title of a CERT_WARNING dialog.
+-08-17  Danesh Dadachanji <ddadacha@redhat.com>
+        AUTHORS: Adding myself and Denis Lila. Removing the extra email from
+        Andrew Hughes.
+-08-11  Danesh Dadachanji <ddadacha@redhat.com>
+        PR742: IcedTea-Web checks certs only upto 1 level deep before declaring
+        them untrusted.
+        * NEWS: Updated.
+        * netx/net/sourceforge/jnlp/tools/JarSigner.java:
+        (checkTrustedCerts): All certs along certPath are now checked for trust.
+-08-09  Deepak Bhole <dbhole@redhat.com>
+        PR771: IcedTea-Web certificate verification code does not use the right
+        API
+        * netx/net/sourceforge/jnlp/security/CertificateUtils.java
+        (inKeyStores): Use Certificate.verify to correctly verify a certificate
+        against a public key in the store.
+-08-09  Saad Mohammad  <smohammad@redhat.com>
+        PR765: JNLP file with all resource jars marked as 'lazy' fails to validate
+        signature and stops the launch of application
+        * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+        (initializeResources): Initializes the first jar file if all resources
+        are marked as lazy jars
+-08-03  Saad Mohammad  <smohammad@redhat.com>
+        * netx/net/sourceforge/jnlp/JNLPMatcher.java:
+          (JNLPMatcher): Removed NullPointerException from being thrown, caught and
+          then thrown again via JNLPMatcherException. This was replaced by throwing
+          a checked exception [JNLPMatcherException] directly.
+          (JNLPMatcher): Removed unused code [getters]
+          (JNLPMatcher): Closed Input/Output streams that were opened.
+          (isMatch): Removed caching of return value
+          (closeInputStream): Added this method to close input streams
+          (closeOutputStream): Added this method to close output streams
+        * netx/net/sourceforge/jnlp/Node.java:
+          Removed getAttributeNames() method from the commented section
 -08-03  Deepak Bhole <dbhole@redhat.com>
 …
         cert hashtable only if the entry is expected to be signed.
+-08-02 Jiri Vanek <jvanek@redhat.com>
+        *Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp):
+        now are compiled files correctly compiled from directory structure.
+        Also not java files are copied with expected directory structure and
+        jarred together with classes.
+-07-26  Jiri Vanek <jvanek@redhat.com>
+        *tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java: String
+         containing "localhost"  have been declared as final constant.
+        (SERVER_NAME) have been  moved instant Server instance so each server can
+         have it name without affecting others
+        (getUrl()) added -  can return URL of server singleton. Implementation of
+         this method is inside server, so each server can return its own useful URL.
+        (saveFile()) is now public.
+        Added identification for ThreadedProcess based on commandlineArgs and its
+         run is now slowed by Thread.sleep
+        (ServerLuncher) inner class is now public (it was bug to not be as we have
+         getIndependentInstance of it method ) and renamed to ServerLauncher
+        Enchanted wrapping of executeProcess
 -07-21  Deepak Bhole <dbhole@redhat.com>
         PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow
         Patch from: Ricardo MartÃn Camarero (Ricky) <rickyepoderi at yahoo dot es>
+        Original patch from: Ricardo MartÃn Camarero <rickyepoderi at yahoo dot es>
         * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
         (readPair): New function.
 …
         than using String.split().
+-07-20  Deepak Bhole <dbhole@redhat.com>
+        * configure.ac: Prepare for 1.1.2
+        * NEWS: Same
+-07-15  Deepak Bhole <dbhole@redhat.com>
+        * configure.ac: Prepare to release 1.1.1
+        * NEWS: Same
+-07-19  Saad Mohammad  <smohammad@redhat.com>
+        * netx/net/sourceforge/jnlp/JNLPMatcher.java:
+          Created this class to compare signed JNLP file with the launching
+          JNLP file. When comparing, it has support for both method of signing
+          of a JNLP file: APPLICATION_TEMPLATE.JNLP and APPLICATION.JNLP.
+        * netx/net/sourceforge/jnlp/JNLPMatcherException.java:
+          Added a custom exception: JNLPMatcherException. Thrown if verifying
+          signed JNLP files fails.
+        * netx/net/sourceforge/jnlp/Node.java:
+          Created a method that retrieves the attribute names of the Node and
+          stores it in private string [] member. The method returns the
+          attribute names.
+        * tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java:
+          This is a test case that tests the functionality of JNLPMatcher.
+          It tests the algorithm with a variety of template and application
+          JNLP files.
+        * tests/netx/unit/net/sourceforge/jnlp/launchApp.jnlp:
+          Launching JNLP file: This is the launching JNLP file used to compare
+          with templates and application JNLP files in JNLPMatcherTest.java
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template0.jnlp:
+          Test Template JNLP file: Contains CDATA.
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template1.jnlp:
+          Test Template JNLP file: An exact duplicate of the launching
+          JNLP file.
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template2.jnlp:
+          Test Template JNLP file: Contains wildchars as attribute/element
+          values.
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template3.jnlp:
+          Test Template JNLP file: Different order of elements/attributes
+          (same value)
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template4.jnlp:
+          Test Template JNLP file: Contains wildchars as values of ALL elements
+          and attribute.
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template5.jnlp:
+          Test Template JNLP file: Contains comments.
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template6.jnlp:
+          Test Template JNLP file: Contains different attribute and element
+          values.
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template7.jnlp:
+          Test Template JNLP file: Contains additional children in element.
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template8.jnlp:
+          Test Template JNLP file: Contains fewer children in element.
+        * tests/netx/unit/net/sourceforge/jnlp/templates/template9.jnlp:
+          Test Template JNLP file: All values are different from the launching
+          JNLP file.
+        * tests/netx/unit/net/sourceforge/jnlp/application/application0.jnlp:
+          Test Application JNLP file: Contains CDATA.
+        * tests/netx/unit/net/sourceforge/jnlp/application/application1.jnlp:
+          Test Application JNLP file: An exact duplicate of the launching
+          JNLP file.
+        * tests/netx/unit/net/sourceforge/jnlp/application/application2.jnlp:
+          Test Application JNLP file: Different order of element/attributes
+          (same value).
+        * tests/netx/unit/net/sourceforge/jnlp/application/application3.jnlp:
+          Test Application JNLP file: Contains comments.
+        * tests/netx/unit/net/sourceforge/jnlp/application/application4.jnlp:
+          Test Application JNLP file: Contains wildchars as attribute/element
+          values.
+        * tests/netx/unit/net/sourceforge/jnlp/application/application5.jnlp:
+          Test Application JNLP file: Contains a different attribute (codebase)
+          value.
+        * tests/netx/unit/net/sourceforge/jnlp/application/application6.jnlp:
+          Test Application JNLP file: Contains additional children in element.
+        * tests/netx/unit/net/sourceforge/jnlp/application/application7.jnlp:
+          Test Application JNLP file: Contains fewer children in element.
+        * tests/netx/unit/net/sourceforge/jnlp/application/application8.jnlp:
+          Test Application JNLP file: All values are different from the
+          launching JNLP file.
+        * Makefile.am:
+          (run-netx-unit-tests): Copies resources(non java files) to test.build
+          before running the unit tests.
+-06-22 Jiri Vanek <jvanek@redhat.com>
+        * tests/report-styles/jreport.xsl: part with classes statistics is now collapsable
+-06-21 Jiri Vanek <jvanek@redhat.com>
+        *tests/jnlp_tests/simple: AccessClassInPackage, ReplaceSecurityManager,
+        AddShutdownHook, ReadEnvironment,  SetContextClassLoader,
+        AllStackTraces,  ReadProperties, CreateClassLoader, RedirectStreams tests
+-06-21 Jiri Vanek <jvanek@redhat.com>
+        *Makefile.am: (run-netx-dist-tests): no depends on copying of styles
+        (clean-netx-dist-tests): depends also on removing of styles
+-06-17 Jiri Vanek <jvanek@redhat.com>
+        * tests/jnlp_tests: directory for reproducers
+        * tests/jnlp_tests/advanced: reproducers which must care about
+         deploying and compiling thmselves
+        * tests/jnlp_tests/simple: reproducers compiled, jared and deployed
+        automatically
+        * tests/jnlp_tests/simple/name/srcs|testcases|resources/: sourcefiles,
+        resources and testaces for simple reproducers
+        * tests/jnlp_tests/simple/deadlocktest: test for tracing not-killable
+        javaws
+        * tests/jnlp_tests/simple/simpletest1: tutorial test
+        * tests/jnlp_tests/simple/simpletest2: tutorial test with exception
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:
+        tests for server basic functionality
+        * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+        implementation of server to produce jnlps and resources. Implementation
+        of helpers to run javaws process.
+        *Makefile.am: new variables pointing to structure above;
+        (junit-jnlp-dist-dirs.txt): prepare destination directory structure
+        (stamps/netx-dist-tests-prepare-reproducers.stamp):compile tescascases of simple reproducers
+        (netx-dist-tests-source-files.txt): lookup for server and helping classes
+        (stamps/netx-dist-tests-compile.stamp): compile server and helping classes
+        (stamps/netx-dist-tests-compile-testcases.stamp): compile, jar and deploy all simple testcases and their resources
+        (run-netx-dist-tests): after make install run junit testsuite upon reproducers on virtual server
+        (clean-netx-tests): added dependence on  clean-netx-dist-tests
+        (clean-netx-dist-tests): deleting  of reproducers
+-06-16 Jiri Vanek <jvanek@redhat.com>
+        * tests/report-styles/index.js: fast navigation functions
+        * tests/report-styles/report.css: styles for transformed result
+        * tests/report-styles/jreport.xsl: template for human-readable
+        xml->html transformation.
+        * Makefile.am: New variable for report-styles directory;
+        ($(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)): goal for copying styles and
+        javascripts; (run-netx-unit-tests): added nonfaling xsltproc
+        transformation of sheet and unit-tests' xml report to index_unit.html;
+        (clean-netx-unit-tests): now depends also on clean_tests_reports;
+        (clean_tests_reports): new goal to remove report styles directory and
+        indexs html files.
 -07-14  Omair Majid  <omajid@redhat.com>
 …
         addComponents): Changed to a layout that will resize itself.
+-06-08  Deepak Bhole <dbhole@redhat.com>
+        * configure.ac: Prepare for 1.1.1
+        * NEWS: Same
+-06-08  Deepak Bhole <dbhole@redhat.com>
+        * configure.ac: Update for release.
+        * NEWS: Update for release.
+-06-08  Deepak Bhole <dbhole@redhat.com>
+        * NEWS: Remove security update notes from NEWS as they are not "New"
+-06-10  Denis Lila  <dlila@redhat.com>
+        * netx/net/sourceforge/jnlp/GuiLaunchHandler.java:
+        (mutex): New mutex for synchronizing splashScreen.
+        (closeSplashScreen): New method to hide and dispose
+        splashScreen.
+        (launchStarting): Call closeSplashScreen instead of doing it
+        inline.
+        (launchInitialized): Sync splashScreen creation.
+        (validationError, launchError): Call closeSplashScreen.
+-06-10  Denis Lila  <dlila@redhat.com>
+        * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java:
+        (frameMutex): New mutex to synchronize accesses to "frame".
+        (getListener): Make almost all of it synchronized on frameMutex.
+        (disposeListener): Sync hider's body around frameMutex and call
+        dispose on the frame so that the awt threads die when they should.
+        (addProgressPanel): Sync "frame" usage.
+-06-08  Saad Mohammad  <smohammad@redhat.com>
+        * AUTHORS: Updated
+        * netx/net/sourceforge/jnlp/services/ServiceUtil.java
+        (checkAccess): Moved the process of checking if the application is a trusted
+        application to a new method called isSigned().
+        * netx/net/sourceforge/jnlp/services/XPersistenceService.java
+        (checkLocation): Allows trusted application to have access to
+        PersistenceService data from different hosts. It uses ServiceUtil.isSigned()
+        to determine if the current application is a trusted application.
+-06-08  Andrew Su  <asu@redhat.com>
+        * NEWS: Updated.
+        * netx/net/sourceforge/jnlp/JNLPFile.java:
+        (JNLPFile): Calls new constructor.
+        (JNLPFile): New constructor to take an option for forcing a codebase.
+        (JNLPFile): Call parse with extra parameter.
+        (parse): Use the given codebase passed in if we did not find one.
+        * netx/net/sourceforge/jnlp/Parser.java:
+        (Parser): Calls new constructor.
+        (Parser): New constructor which takes in a codebase as a last option.
+        * netx/net/sourceforge/jnlp/PluginBridge.java:
+        (PluginBridge): Calls new JNLPFile's constructor with current codebase
+-06-08  Andrew Su  <asu@redhat.com>
+        * netx/net/sourceforge/jnlp/PluginBridge.java:
+        (jars): Changed to use HashSet instead of String[].
+        (PluginBridge): Updated to work with HashSet instead of String[]
+        (getResources): Likewise.
 -06-08  Deepak Bhole <dbhole@redhat.com>
 …
         _createAndRetainJavaObject.
+-05-31  Omair Majid  <omajid@redhat.com>
+        * netx/net/sourceforge/jnlp/JNLPSplashScreen.java: Subclass JDialog, not
+        JFrame.
+-05-30  Andrew Su  <asu@redhat.com>
+        * netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java:
+        (addComponent): Add check to see if specified cache directory is
+        writable.
 -05-30  Andrew Su  <asu@redhat.com>
 …
         (lock): Removed creation of file here.
+-05-17 Jiri Vanek <jvanek@redhat.com>
+        * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports
+        results of junit in xml which "follows junit-output schema". Extended
+        for date, duration and some statististics for future purpose
+        * Makefile.am (run-netx-unit-tests): backuping stdout/stderr of tests
+        * tests/junit-runner/CommandLine.java: registered
+        JunitLikeXmlOutputListener
 -05-10  Andrew Su  <asu@redhat.com>
 …
         (addComponents):Created a new comparator for sorting by file size and
         date.
+-05-09  Jiri Vanek  <jvanek@redhat.com>
+        * tests/junit-runner/CommandLine.java:r added skipping of inner
+        classes and one jnlp file from sources package.
+-05-03  Denis Lila  <dlila@redhat.com>
+        * netx/net/sourceforge/jnlp/NetxPanel.java:
+        Add imports.
+        (uKeyToTG): Change to HashMap.
+        (TGMapMutex): New mutex to synchronize uKeyToTG.
+        (getThreadGroup): Synchronize on TGMapMutex.
+        (NetxPanel): Only create a new thread group if one doesn't already
+        exist for the computed uKey.
 -05-02  Deepak Bhole <dbhole@redhat.com>
 …
         invokeAndWait.
         (appletSystemExit): Exit the VM when called.
+-04-28  Denis Lila  <dlila@redhat.com>
+        * netx/net/sourceforge/jnlp/NetxPanel.java:
+        Remove unused import; add imports.
+        (uKey, uKeyToTG, appContextCreated): New members.
+        (getThreadGroup, createNewAppContext): New methods.
+        (runLoader): Pass uKey to PluginBridge's constructor.
+        (run): Remove. No longer needed.
+        (NetxPanel): Initialize uKey. If it is a new key, make a new thread
+        group for it and save it in the hash map.
+        (createAppletThread): Use getFutureTG instead of creating a thread
+        group on the spot.
+        * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:
+        (createPanel): Initialize and frame the panel in a separate thread.
+        * netx/net/sourceforge/jnlp/Launcher.java:
+        Remove unused import.
+        (createApplet, createApplication, createThreadGroup): Replace
+        AppThreadGroup with ThreadGroup. Remove all calls to setApplication.
+        * netx/net/sourceforge/jnlp/PluginBridge.java:
+        (PluginBridge): Remove the uniqueKey initialization logic. Set
+        uniqueKey to the uKey parameter.
+        * netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java:
+        Remove file.
 -04-28  Omair Majid  <omajid@redhat.com>
 …
         (launcher.build/itweb-settings): Replace with...
         (launcher.build/$(itweb-settings)): New target.
+-04-21  Deepak Bhole <dbhole@redhat.com>
+        * configure.ac: Bumped version to 1.2pre
 -04-21  Deepak Bhole <dbhole@redhat.com>

trunk/icedtea-web/Makefile.am

-              r362
+              r418
 # Source directories
+NETX_DIR = $(abs_top_builddir)/netx.build
+NETX_SRCDIR = $(abs_top_srcdir)/netx
+NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
+NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
+NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
+TESTS_SRCDIR=$(abs_top_srcdir)/tests
+TESTS_DIR=$(abs_top_builddir)/tests.build
+NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
+NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
+JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
+JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
+JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
+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
+export TESTS_SRCDIR=$(abs_top_srcdir)/tests
+export TESTS_DIR=$(abs_top_builddir)/tests.build
+export NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
+export NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/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 PRIVATE_KEYSTORE_NAME=teststore.ks
+export PRIVATE_KEYSTORE_PASS=123456789
+export EXPORTED_TEST_CERT_PREFIX=icedteatests
+export EXPORTED_TEST_CERT_SUFFIX=crt
+export TEST_CERT_ALIAS=icedteaweb
+export PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs
+export PUBLIC_KEYSTORE_PASS=changeit
+export JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
+export UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
+export REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
+export REPRODUCERS_CLASS_WHITELIST = $(abs_top_srcdir)/netx-dist-tests-whitelist
+export EMMA_JAVA_ARGS=-Xmx2G
+export EMMA_MODIFIED_FILES=tests-output.xml ServerAccess-logs.xml stdout.log stderr.log all.log
+export EMMA_BACKUP_SUFFIX=_noEmma
+export EMMA_SUFFIX=_withEmma
+export META_MANIFEST = META-INF/MANIFEST.MF
+export SIGNED_REPRODUCERS=signed
+export SIMPLE_REPRODUCERS=simple
+export CUSTOM_REPRODUCERS=custom
+export ALL_NONCUSTOM_REPRODUCERS=$(SIMPLE_REPRODUCERS) $(SIGNED_REPRODUCERS)
+export ALL_REPRODUCERS=$(ALL_NONCUSTOM_REPRODUCERS) $(CUSTOM_REPRODUCERS)
+# linking variables
+export PLUGIN_LINK_NAME=libjavaplugin.so
+export MOZILLA_LOCAL_PLUGINDIR=${HOME}/.mozilla/plugins
+export MOZILLA_GLOBAL64_PLUGINDIR=/usr/lib64/mozilla/plugins
+export MOZILLA_GLOBAL32_PLUGINDIR=/usr/lib/mozilla/plugins
+export OPERA_GLOBAL64_PLUGINDIR=/usr/lib64/opera/plugins
+export OPERA_GLOBAL32_PLUGINDIR=/usr/lib/opera/plugins
+export BUILT_PLUGIN_LIBRARY=IcedTeaPlugin.so
+export MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
+export MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
+export OPERA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origOG
+export MOZILLA_FAMILY_TEST= "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" -o "$(MIDORI)" != "" -o "$(EPIPHANY)" != ""
+# end of linking variables
 # Build directories
 BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
+export BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
 if WITH_RHINO
 …
 endif
+RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME)
+export RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME):$(BOOT_DIR)/jre/lib/resources.jar
 # Flags
 IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
 IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
 IT_LANGUAGE_SOURCE_VERSION=6
 IT_CLASS_TARGET_VERSION=6
 IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
+export IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
+export IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
+export IT_LANGUAGE_SOURCE_VERSION=6
+export IT_CLASS_TARGET_VERSION=6
+export IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
+#
 …
 #  - we want full privileges
+#
 LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
 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)"
+export PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
 # Fake update version to work with the Deployment Toolkit script used by Oracle
 # http://download.oracle.com/javase/tutorial/deployment/deploymentInDepth/depltoolkit_index.html
 JDK_UPDATE_VERSION=50
+export JDK_UPDATE_VERSION=50
 # Sources list
 PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
 NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \
+export PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
+export NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \
         net.sourceforge.jnlp.cache net.sourceforge.jnlp.config \
         net.sourceforge.jnlp.controlpanel net.sourceforge.jnlp.event \
 …
 # Conditional defintions
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
 LIVECONNECT_DIR = netscape sun/applet
 PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
 PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
 LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
 ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/IcedTeaPlugin.so stamps/liveconnect-dist.stamp
 PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
+export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
+export LIVECONNECT_DIR = netscape sun/applet
+export PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
+export PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
+export LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
+export ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) stamps/liveconnect-dist.stamp
+export PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
 endif
 …
 if WITH_RHINO
   RHINO_TESTS=check-pac-functions
+  RHINO_TESTS=stamps/check-pac-functions.stamp
 else
   RHINO_TESTS=
 …
 if WITH_JUNIT
   JUNIT_TESTS=run-netx-unit-tests
+  JUNIT_TESTS=stamps/run-netx-unit-tests.stamp
 else
   JUNIT_TESTS=
 …
 PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
 EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
+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
+# reproducers `D`shortcuts
+export DTEST_SERVER=-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR)
+export DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws)
+export DBROWSERS=-Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA):$(MIDORI):$(EPIPHANY)
+export REPRODUCERS_DPARAMETERS= $(DTEST_SERVER) $(DJAVAWS_BUILD) $(DBROWSERS) $(BROWSER_TESTS_MODIFICATION)
+# end of `D`shortcuts
+#exported autoconf copies
+export EXPORTED_JAVAC=$(BOOT_DIR)/bin/javac
+#end of exported autoconf copies
 # binary names
 …
 check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
 clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \
  clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests
+clean-local: clean-netx clean-plugin clean-liveconnect clean-extra  \
+ clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests clean-bootstrap-directory
         if [ -e stamps ] ; then \
           rmdir stamps ; \
 …
 .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
  clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs \
  clean-tests check-local clean-launchers check-pac-functions run-netx-unit-tests clean-netx-tests \
+ clean-tests check-local clean-launchers stamps/check-pac-functions.stamp stamps/run-netx-unit-tests.stamp clean-netx-tests \
  clean-junit-runner clean-netx-unit-tests
 …
         ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir)
 if ENABLE_PLUGIN
         ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(libdir)
+        ${INSTALL_PROGRAM} $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir)
         ${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
 endif
 …
 uninstall-local:
         rm -f $(DESTDIR)$(libdir)/IcedTeaPlugin.so
+        rm -f $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
         rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
         rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
 …
         cd $(PLUGIN_DIR) && \
         $(CXX) $(CXXFLAGS) \
+           $(DEFS) $(VERSION_DEFS) \
           -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
           -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
 …
           -fPIC -o $@ -c $<
 $(PLUGIN_DIR)/IcedTeaPlugin.so: $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
+$(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
         cd $(PLUGIN_DIR) && \
         $(CXX) $(CXXFLAGS) \
 …
 clean-IcedTeaPlugin:
         rm -f $(PLUGIN_DIR)/*.o
         rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
+        rm -f $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY)
         if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
           if [ -e $(abs_top_builddir)/plugin/icedteanp ] ; then \
 …
         fi
 check-pac-functions: stamps/bootstrap-directory.stamp
+stamps/check-pac-functions.stamp: stamps/bootstrap-directory.stamp
         ./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
+          $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js)
+          $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) ; \
+        mkdir -p stamps && \
+        touch $@
 junit-runner-source-files.txt:
         find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@
 $(JUNIT_RUNNER_JAR): junit-runner-source-files.txt
+$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt stamps/netx-dist-tests-compile.stamp
         mkdir -p $(JUNIT_RUNNER_DIR) && \
         $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
           -d $(JUNIT_RUNNER_DIR) \
           -classpath $(JUNIT_JAR) \
+          -classpath $(JUNIT_JAR):$(JNLP_TESTS_ENGINE_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)
+        touch $@
+junit-jnlp-dist-custom.txt:
+        cd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
+        find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
+junit-jnlp-dist-simple.txt:
+        cd $(JNLP_TESTS_SRCDIR)/simple/ ; \
+        find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
+stamps/junit-jnlp-dist-signed.stamp:
+        types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          pushd $(JNLP_TESTS_SRCDIR)/$$which/ ; \
+          find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
+          popd ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs
+        types=($(ALL_NONCUSTOM_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          for dir in "$${simpleReproducers[@]}" ; do \
+            echo "processing: $$dir" ; \
+            mkdir -p "$(JNLP_TESTS_DIR)/$$dir" ; \
+            if [ -e "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ]; then \
+              d=`pwd` ; \
+              cd "$(JNLP_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 ; \
+              if [ -n "$$notSrcFiles" ] ; then \
+                cp -R --parents $$notSrcFiles "$(JNLP_TESTS_DIR)/$$dir/" ; \
+              fi ; \
+              cd "$(JNLP_TESTS_DIR)/$$dir/" ; \
+              if [ -f $(META_MANIFEST) ]; \
+              then \
+                $(BOOT_DIR)/bin/jar cfm "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $(META_MANIFEST) * ; \
+              else \
+                $(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
+              fi; \
+              cd "$$d" ; \
+            fi; \
+          done ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+stamps/netx-dist-tests-sign-some-reproducers.stamp: stamps/netx-dist-tests-prepare-reproducers.stamp
+        keystore=$(abs_top_builddir)/$(PRIVATE_KEYSTORE_NAME); \
+        types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          tcaw=$(TEST_CERT_ALIAS)_$$which ; \
+          $(BOOT_DIR)/bin/keytool -genkey -alias $$tcaw -keystore $$keystore -keypass $(PRIVATE_KEYSTORE_PASS) -storepass $(PRIVATE_KEYSTORE_PASS) -dname "cn=$$tcaw, ou=$$tcaw, o=$$tcaw, c=$$tcaw" ; \
+            . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          signedReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+            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 ; \
+          done ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+stamps/change-dots-to-paths.stamp: stamps/netx-dist-tests-sign-some-reproducers.stamp
+        pushd  $(JNLP_TESTS_SERVER_DEPLOYDIR); \
+        types=($(ALL_NONCUSTOM_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          for dir in "$${simpleReproducers[@]}" ; do \
+            if test "$${dir:0:1}" = "." ; then \
+              echo "reproducer $$dir starts with dot. It is forbidden" ; \
+              exit 5; \
+            fi; \
+            if test "$${dir:(-1)}" = "." ; then \
+              echo "reproducer $$dir ends with dot. It is forbidden" ; \
+              exit 5; \
+            fi; \
+            q=`expr index "$$dir" .`; \
+            r=$$? ; \
+            if [ $$r = 0  ]; then \
+              slashed_dir="./$${dir//.//}" ; \
+              path="`dirname $$slashed_dir`" ; \
+              file="`basename $$slashed_dir`.jar" ; \
+              echo "copying $$dir.jar to $$path as $$file" ; \
+              mkdir --parents $$path ; \
+              cp $$dir".jar" "$$path"/"$$file" ; \
+            fi ; \
+          done ; \
+        done ; \
+        popd ; \
+        mkdir -p stamps && \
+        touch $@
+#this always tries to remove  previous testcert
+#the code is copypasted from netx-dist-tests-remove-cert-from-public, because
+#with depending to not stamped target we always have to rerun reproducers targets
+stamps/exported-test-certs.stamp: stamps/change-dots-to-paths.stamp
+        -types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          $(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) ; \
+        done ;
+        mkdir -p stamps && \
+        touch $@
+stamps/netx-dist-tests-import-cert-to-public: stamps/exported-test-certs.stamp
+        types=($(SIGNED_REPRODUCERS)) ; \
+        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) ;\
+        done ;
+        mkdir -p stamps && \
+        touch $@
+netx-dist-tests-remove-cert-from-public:
+        -types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          $(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);
+        $(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 && \
+        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);
+        $(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 && \
+        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
+        types=($(ALL_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          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/"* ; \
+          done ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+stamps/netx-dist-tests-copy-resources.stamp: stamps/junit-jnlp-dist-dirs
+        types=($(ALL_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          for dir in "$${simpleReproducers[@]}" ; do \
+            cp -R "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/"*  $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
+          done ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+$(REPRODUCERS_CLASS_NAMES): $(REPRODUCERS_CLASS_WHITELIST)
+        whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
+        cd $(JNLP_TESTS_ENGINE_TESTS_DIR) ; \
+        class_names= ; \
+        for test in `find -type f` ; do \
+          class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
+          class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
+          INLCUDE="NO" ; \
+          for x in $$whiteListed ; do \
+            q=`expr match "$$class_name" "$$x"`; \
+            r=$$? ; \
+            if [ $$r = 0  ]; then \
+              echo "$$class_name will be included in reproducers testcases because of $$x pattern in $(REPRODUCERS_CLASS_WHITELIST). Matching was  $$q"; \
+              INLCUDE="YES" ; \
+            fi; \
+          done; \
+          if [ "$$INLCUDE" = "YES"  ]; then \
+            class_names="$$class_names $$class_name" ; \
+          else \
+            echo "$$class_name had no match in $(REPRODUCERS_CLASS_WHITELIST). Excluding"; \
+          fi; \
+        done ; \
+        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)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp
+        cd $(JNLP_TESTS_ENGINE_DIR) ; \
+        class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
+        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(JNLP_TESTS_ENGINE_TESTS_DIR) \
+          $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
+         -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
+if WITH_XSLTPROC
+        $(XSLTPROC)  $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(JNLP_TESTS_ENGINE_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_reproducers.html
+        $(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
+endif
+        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\
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES)
+        . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+        customReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-custom.txt `); \
+        IFS="$$IFS_BACKUP" ; \
+        for dir in "$${customReproducers[@]}" ; do \
+          pushd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/$$dir/srcs; \
+          $(MAKE) prepare-reproducer ; \
+          popd ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+clean-custom-reproducers: junit-jnlp-dist-custom.txt
+        . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+        customReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-custom.txt `); \
+        IFS="$$IFS_BACKUP" ; \
+        for dir in "$${customReproducers[@]}" ; do \
+          pushd $(JNLP_TESTS_SRCDIR)/custom/$$dir/srcs; \
+          $(MAKE) clean-reproducer ; \
+          popd ; \
+        done ; \
+        rm -f stamps/process-custom-reproducers.stamp
+#for global-links you must be root, for opera there do not exists user-links
+#although this targets will indeed create symbolic links to enable
+#icedtea-web plugin inside browser it is intended for testing purposes
+if ENABLE_PLUGIN
+stamps/user-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp \
+ launcher.build/$(javaws) stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
+        if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
+          if [ -e $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ] ; then \
+            mv -f $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME)  $(MOZILLA_LOCAL_BACKUP_FILE) ; \
+            echo "$(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) backed up as $(MOZILLA_LOCAL_BACKUP_FILE)" ; \
+          else \
+            echo "$(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) doesn't exists, nothing to be backed up to $(MOZILLA_LOCAL_BACKUP_FILE)" ; \
+          fi ; \
+          pushd $(MOZILLA_LOCAL_PLUGINDIR) ; \
+          ln -s $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) $(PLUGIN_LINK_NAME) ; \
+          echo "$(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) linked as  $$PWD/$(PLUGIN_LINK_NAME)" ; \
+          popd ; \
+        fi ; \
+        touch $@
+restore-user-links:
+        if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
+          if [ -e $(MOZILLA_LOCAL_BACKUP_FILE) ] ; then \
+            mv -f  $(MOZILLA_LOCAL_BACKUP_FILE)  $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ; \
+            echo "$(MOZILLA_LOCAL_BACKUP_FILE) restored as $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME)" ; \
+          else \
+            rm -f $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ; \
+            echo "$(MOZILLA_LOCAL_BACKUP_FILE) do not exists, nothing to be restored. $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) removed" ; \
+          fi ; \
+        fi ;
+        if [ -e stamps/user-links.stamp ] ; then \
+          rm -f stamps/user-links.stamp ; \
+        fi
+stamps/global-links.stamp: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/$(javaws) \
+ stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
+        if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
+            dir="$(MOZILLA_GLOBAL32_PLUGINDIR)"  ; \
+            arch=`arch`  ; \
+            if [ "$$arch" = "x86_64" ]  ; then \
+              dir="$(MOZILLA_GLOBAL64_PLUGINDIR)"  ; \
+            fi ; \
+            if [ -e "$$dir"/$(PLUGIN_LINK_NAME) ] ; then \
+              mv -f "$$dir"/$(PLUGIN_LINK_NAME)  $(MOZILLA_GLOBAL_BACKUP_FILE) ; \
+              echo "$$dir/$(PLUGIN_LINK_NAME) backed up as  $(MOZILLA_GLOBAL_BACKUP_FILE)" ; \
+            else \
+              echo "$$dir/$(PLUGIN_LINK_NAME) do not exists, nothing to be backed up to $(MOZILLA_GLOBAL_BACKUP_FILE)" ; \
+            fi ; \
+            pushd "$$dir"  ; \
+            ln -s $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) $(PLUGIN_LINK_NAME)  ; \
+            echo "$(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) linked as  $$PWD/$(PLUGIN_LINK_NAME)" ; \
+            popd  ; \
+        fi ;
+        if [ "$(OPERA)" != "" ]  ; then \
+            dir="$(OPERA_GLOBAL32_PLUGINDIR)"  ; \
+            arch=`arch`  ; \
+            if [ "$$arch" = "x86_64" ] ; then \
+              dir="$(OPERA_GLOBAL64_PLUGINDIR)" ; \
+            fi ; \
+            if [ -e "$$dir"/$(PLUGIN_LINK_NAME) ] ; then \
+              mv -f "$$dir"/$(PLUGIN_LINK_NAME)  $(OPERA_GLOBAL_BACKUP_FILE) ; \
+              echo "$$dir/$(PLUGIN_LINK_NAME) backed up as  $(OPERA_GLOBAL_BACKUP_FILE) "; \
+            else \
+              echo "$$dir/$(PLUGIN_LINK_NAME) do not exists, nothing to be backed up to $(OPERA_GLOBAL_BACKUP_FILE) "; \
+            fi ; \
+            pushd "$$dir"  ; \
+            ln -s $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) $(PLUGIN_LINK_NAME)  ; \
+            echo "$(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) linked as  $$PWD/$(PLUGIN_LINK_NAME)" ; \
+            popd  ; \
+        fi   ; \
+        touch $@
+restore-global-links:
+        if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
+            dir="$(MOZILLA_GLOBAL32_PLUGINDIR)"  ; \
+            arch=`arch`  ; \
+            if [ "$$arch" = "x86_64" ]  ; then \
+              dir="$(MOZILLA_GLOBAL64_PLUGINDIR)"  ; \
+            fi ; \
+            if [ -e $(MOZILLA_GLOBAL_BACKUP_FILE) ] ; then \
+              mv -f $(MOZILLA_GLOBAL_BACKUP_FILE) "$$dir"/$(PLUGIN_LINK_NAME) ; \
+              echo "$(MOZILLA_GLOBAL_BACKUP_FILE) restored as $$dir/$(PLUGIN_LINK_NAME)" ; \
+            else \
+              rm -f "$$dir"/$(PLUGIN_LINK_NAME) ; \
+              echo "$(MOZILLA_GLOBAL_BACKUP_FILE) do not exists, nothing to be restored. $$dir/$(PLUGIN_LINK_NAME) removed" ; \
+            fi ; \
+        fi ;
+        if [ "$(OPERA)" != "" ]  ; then \
+            dir="$(OPERA_GLOBAL32_PLUGINDIR)"  ; \
+            arch=`arch`  ; \
+            if [ "$$arch" = "x86_64" ] ; then \
+              dir="$(OPERA_GLOBAL64_PLUGINDIR)" ; \
+            fi ; \
+            if [ -e $(OPERA_GLOBAL_BACKUP_FILE) ] ; then \
+              mv -f $(OPERA_GLOBAL_BACKUP_FILE) "$$dir"/$(PLUGIN_LINK_NAME) ; \
+              echo "$(OPERA_GLOBAL_BACKUP_FILE)  restored as $$dir/$(PLUGIN_LINK_NAME)" ; \
+            else \
+              rm -f "$$dir"/$(PLUGIN_LINK_NAME) ; \
+              echo "$(OPERA_GLOBAL_BACKUP_FILE) do not exist, nothing to be restored. $$dir/$(PLUGIN_LINK_NAME) removed" ; \
+            fi ; \
+        fi   ;
+        if [ -e stamps/global-links.stamp ] ; then \
+          rm -f stamps/global-links.stamp ; \
+        fi
+endif
 netx-unit-tests-source-files.txt:
         find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort > $@
 stamps/netx-unit-tests-compile.stamp: stamps/netx.stamp \
  netx-unit-tests-source-files.txt
+ netx-unit-tests-source-files.txt stamps/netx-dist-tests-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 \
+         -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
          @netx-unit-tests-source-files.txt && \
         mkdir -p stamps && \
         touch $@
+run-netx-unit-tests: stamps/netx-unit-tests-compile.stamp \
+ $(JUNIT_RUNNER_JAR)
+        cp {$(NETX_UNIT_TEST_SRCDIR),$(NETX_UNIT_TEST_DIR)}/net/sourceforge/jnlp/basic.jnlp
+$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
+        mkdir $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)
+        cp $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/*.css $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)/
+        cp $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/*.js $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)/
+$(UNIT_CLASS_NAMES):
         cd $(NETX_UNIT_TEST_DIR) ; \
         class_names= ; \
 …
           class_names="$$class_names $$class_name" ; \
         done ; \
+        echo $$class_names ; \
+        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \
+          $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
+clean-netx-tests: clean-netx-unit-tests clean-junit-runner
+        echo $$class_names > $(UNIT_CLASS_NAMES);
+stamps/run-netx-unit-tests.stamp: stamps/netx-unit-tests-compile.stamp $(JUNIT_RUNNER_JAR)  \
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES)
+        filename=" " ; \
+        cd $(NETX_UNIT_TEST_SRCDIR) ; \
+        for file in `find . -type f \! -iname "*.java"`; do\
+                filename=`echo $$file `; \
+                cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
+        done ; \
+        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
+if WITH_XSLTPROC
+        $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(NETX_UNIT_TEST_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_unit.html
+        $(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
+endif
+        mkdir -p stamps && \
+        touch $@
+#warning,  during this target tests.build/netx/unit/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
+#you can add -ix "-*Test*" -ix "-*test*"  to ignore all test cases from statistics
+stamps/run-unit-test-code-coverage.stamp: stamps/netx-unit-tests-compile.stamp $(JUNIT_RUNNER_JAR)  \
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES)
+if WITH_EMMA
+        cd $(NETX_UNIT_TEST_DIR) ; \
+        for file in $(EMMA_MODIFIED_FILES) ; do \
+          mv $(NETX_UNIT_TEST_DIR)/$$file  $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
+        done ;\
+        class_names=`cat $(UNIT_CLASS_NAMES)` ; \
+        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emmarun \
+         -Dreport.html.out.encoding=UTF-8 \
+         -raw \
+         -sp $(NETX_SRCDIR) \
+         -sp $(NETX_UNIT_TEST_SRCDIR) \
+         -sp $(JUNIT_RUNNER_SRCDIR) \
+         -r html \
+         -r xml \
+         -cp $(NETX_DIR)/lib/classes.jar \
+         -cp $(JUNIT_JAR) \
+         -cp $(JUNIT_RUNNER_JAR) \
+         -cp $(BOOT_DIR)/jre/lib/rt.jar \
+         -cp $(BOOT_DIR)/jre/lib/jsse.jar \
+         -cp $(BOOT_DIR)/jre/lib/resources.jar \
+         -cp $(RHINO_RUNTIME) \
+         -cp $(JNLP_TESTS_ENGINE_DIR) \
+         -cp . \
+         -ix "-org.junit.*" \
+         -ix "-junit.*" \
+         CommandLine $$class_names ;  \
+        for file in $(EMMA_MODIFIED_FILES) ; do \
+          mv $(NETX_UNIT_TEST_DIR)/$$file  $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
+          mv $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)"  $(NETX_UNIT_TEST_DIR)/$$file ; \
+        done ;
+else
+        echo "Sorry, coverage report cant be run without emma installed. Try install emma or specify with-emma value" ;
+        exit 5
+endif
+        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
+stamps/run-reproducers-test-code-coverage.stamp: stamps/run-netx-dist-tests.stamp $(REPRODUCERS_CLASS_NAMES)
+if WITH_EMMA
+        cd $(TESTS_DIR) ; \
+        for file in $(EMMA_MODIFIED_FILES) ; do \
+          mv $(JNLP_TESTS_ENGINE_DIR)/$$file $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
+        done ;\
+        echo "backuping javaws and netx.jar in $(DESTDIR)" ; \
+        netx_backup=$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx_backup.jar ; \
+        javaws_backup=$(DESTDIR)$(bindir)/javaws_backup ; \
+        mv $(DESTDIR)$(bindir)/javaws $$javaws_backup ;  \
+        mv $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar $$netx_backup ; \
+        nw_bootclasspath="$(LAUNCHER_BOOTCLASSPATH):$(EMMA_JAR):$$netx_backup" ; \
+        instructed_dir=$(TESTS_DIR)/instr ; \
+        echo "instrumenting netx.jar from $$netx_backup through $$instructed_dir" ; \
+        $(BOOT_DIR)/bin/java -cp  $(EMMA_JAR) emma instr -d $$instructed_dir -ip $$netx_backup ; \
+        pushd $$instructed_dir ; \
+        $(BOOT_DIR)/bin/jar -cf $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar * ; \
+        popd ; \
+        rm -rf $$instructed_dir ; \
+        echo "patching $(javaws)" ; \
+        cat $$javaws_backup | sed "s,$(LAUNCHER_BOOTCLASSPATH),$$nw_bootclasspath," > $(DESTDIR)$(bindir)/$(javaws) ; \
+        chmod 777 $(DESTDIR)$(bindir)/$(javaws) ; \
+        testcases_srcs=( ) ; \
+        k=0 ; \
+        types=($(ALL_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          for dir in "$${simpleReproducers[@]}" ; do \
+            testcases_srcs[k]="-sp" ; \
+            k=$$((k+1)) ; \
+            testcases_srcs[k]="$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
+            k=$$((k+1)) ; \
+            done ; \
+          done ; \
+        cd $(JNLP_TESTS_ENGINE_DIR) ; \
+        class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
+        $(BOOT_DIR)/bin/java  \
+         $(EMMA_JAVA_ARGS) \
+          $(REPRODUCERS_DPARAMETERS) \
+         -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) emmarun  \
+           -raw \
+           -cp $(NETX_DIR)/lib/classes.jar \
+           -cp $(JUNIT_JAR) \
+           -cp $(JUNIT_RUNNER_JAR) \
+           -cp $(BOOT_DIR)/jre/lib/rt.jar \
+           -cp $(BOOT_DIR)/jre/lib/jsse.jar \
+           -cp $(BOOT_DIR)/jre/lib/resources.jar \
+           -cp $(RHINO_RUNTIME) \
+           -cp . \
+           -cp $(JNLP_TESTS_ENGINE_TESTS_DIR) \
+           -ix "-org.junit.*" \
+           -ix "-junit.*" \
+           CommandLine $$class_names ; \
+        mv $(JNLP_TESTS_ENGINE_DIR)/coverage.ec $(JNLP_TESTS_ENGINE_DIR)/coverageX.ec ; \
+        mv $(JNLP_TESTS_ENGINE_DIR)/coverage.es $(JNLP_TESTS_ENGINE_DIR)/coverageX.es ; \
+        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) emma merge \
+          -in $(TESTS_DIR)/coverage.em \
+          -in $(JNLP_TESTS_ENGINE_DIR)/coverageX.ec \
+          -in $(JNLP_TESTS_ENGINE_DIR)/coverageX.es ; \
+        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR)  -Demma.report.html.out.encoding=UTF-8 emma report \
+          -Dreport.html.out.encoding=UTF-8 \
+          -in $(JNLP_TESTS_ENGINE_DIR)/coverage.es  \
+          -sp $(NETX_SRCDIR) \
+          -sp $(NETX_UNIT_TEST_SRCDIR) \
+          -sp $(JUNIT_RUNNER_SRCDIR) \
+          -sp $(JNLP_TESTS_ENGINE_SRCDIR) \
+          -sp $(JNLP_TESTS_ENGINE_TESTS_SRCDIR) \
+          -r html \
+          -r xml \
+          "$${testcases_srcs[@]}" ; \
+        echo "restoring javaws and netx.jar in $(DESTDIR)" ; \
+        rm -f $(DESTDIR)$(bindir)/$(javaws) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar ; \
+        rm -f $(DESTDIR)$(bindir)/$(javaws);  \
+        mv $$javaws_backup $(DESTDIR)$(bindir)/$(javaws);  \
+        mv $$netx_backup $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar ; \
+        for file in $(EMMA_MODIFIED_FILES) ; do \
+          mv $(JNLP_TESTS_ENGINE_DIR)/$$file  $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
+          mv $(JNLP_TESTS_ENGINE_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)"  $(JNLP_TESTS_ENGINE_DIR)/$$file ; \
+        done ;\
+        rm $(JNLP_TESTS_ENGINE_DIR)/coverage.txt ;
+else
+        echo "Sorry, coverage report cant be run without emma installed. Try install emma or specify with-emma value" ;
+        exit 5
+endif
+        touch $@
+run-test-code-coverage: run-unit-test-code-coverage run-reproducers-test-code-coverage
+if WITH_EMMA
+        cd $(TESTS_DIR) ; \
+        k=0 ; \
+        types=($(ALL_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          for dir in "$${simpleReproducers[@]}" ; do \
+            testcases_srcs[k]="-sp" ; \
+            k=$$((k+1)) ; \
+            testcases_srcs[k]="$(JNLP_TESTS_SRCDIR)/$$which/$$dir/testcases/" ; \
+            k=$$((k+1)) ; \
+          done ; \
+        done ; \
+        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR) emma merge \
+         -in $(NETX_UNIT_TEST_DIR)/coverage.es \
+         -in $(JNLP_TESTS_ENGINE_DIR)/coverage.es ; \
+        $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -cp $(EMMA_JAR)  -Demma.report.html.out.encoding=UTF-8 emma report \
+         -Dreport.html.out.encoding=UTF-8 \
+         -in $(TESTS_DIR)/coverage.es \
+         -in $(TESTS_DIR)/coverage.em \
+         -sp $(NETX_SRCDIR) \
+         -sp $(NETX_UNIT_TEST_SRCDIR) \
+         -sp $(JUNIT_RUNNER_SRCDIR) \
+         -sp $(JNLP_TESTS_ENGINE_SRCDIR) \
+         -sp $(JNLP_TESTS_ENGINE_TESTS_SRCDIR) \
+         "$${testcases_srcs[@]}" \
+         -r html \
+         -r xml ;
+else
+        echo "Sorry, coverage report cant be run without emma installed. Try install emma or specify with-emma value" ;
+        exit 5
+endif
+clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests clean-test-code-coverage
         if [ -e $(TESTS_DIR)/netx ]; then \
           rmdir $(TESTS_DIR)/netx ; \
 …
         rm -f $(JUNIT_RUNNER_JAR)
 clean-netx-unit-tests:
+clean-netx-unit-tests: clean_tests_reports
         rm -f netx-unit-tests-source-files.txt
         rm -rf $(NETX_UNIT_TEST_DIR)
+        rm -f $(UNIT_CLASS_NAMES)
+        rm -f stamps/check-pac-functions.stamp
+        rm -f stamps/run-netx-unit-tests.stamp
         rm -f stamps/netx-unit-tests-compile.stamp
+clean_tests_reports:
+        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 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/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/netx-dist-tests-sign-some-reproducers.stamp
+        rm -f stamps/change-dots-to-paths.stamp
+        rm -f junit-jnlp-dist-simple.txt
+        rm -f junit-jnlp-dist-custom.txt
+        rm -f netx-dist-tests-tests-source-files.txt
+        types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          rm -f junit-jnlp-dist-$$which.txt ; \
+          rm -f $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ; \
+        done ;
+        rm -f stamps/exported-test-certs.stamp
+        rm -f stamps/junit-jnlp-dist-signed.stamp
+        rm -f $(REPRODUCERS_CLASS_NAMES)
+        rm -f $(abs_top_builddir)/$(PRIVATE_KEYSTORE_NAME)
+        rm -f stamps/run-netx-dist-tests.stamp
+clean-unit-test-code-coverage:
+        if [ -e stamps/run-unit-test-code-coverage.stamp ]; then \
+          rm -rf $(NETX_UNIT_TEST_DIR)/coverage ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverage.xml ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverageX.es ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverageX.ec ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverage.es ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/tests-output_withEmma.xml ; \
+          rm -f stamps/run-unit-test-code-coverage.stamp ; \
+        fi
+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 -f stamps/run-reproducers-test-code-coverage.stamp ; \
+        fi
+clean-test-code-coverage: clean-unit-test-code-coverage clean-reproducers-test-code-coverage
+        if [ -e $(TESTS_DIR)/coverage.xml ]; then \
+          rm -rf $(TESTS_DIR)/coverage  ; \
+          rm -f $(TESTS_DIR)/coverage.xml  ; \
+          rm -f $(TESTS_DIR)/coverage.es  ; \
+          rm -f $(TESTS_DIR)/coverage.em ; \
+        fi
 # plugin tests
 …
         ln -sf $(abs_top_builddir)/javac $(BOOT_DIR)/bin/javac
         ln -sf $(JAVADOC) $(BOOT_DIR)/bin/javadoc
+        if [ -e "$(KEYTOOL)" ] ; then \
+          ln -sf $(KEYTOOL) $(BOOT_DIR)/bin/keytool ;\
+        else \
+          echo "#! /bin/sh" > $(BOOT_DIR)/bin/keytool ;\
+          echo "echo \"keytool not exist on your system, signed part of reproducers test will fail\"" >> $(BOOT_DIR)/bin/keytool ;\
+          chmod 777 $(BOOT_DIR)/bin/keytool ;\
+        fi
+        if [ -e "$(JARSIGNER)" ] ; then \
+          ln -sf $(JARSIGNER) $(BOOT_DIR)/bin/jarsigner ;\
+        else \
+          echo "#! /bin/sh" > $(BOOT_DIR)/bin/jarsigner ;\
+          echo "echo \"jarsigner not exist on your system, signed part of reproducers test will fail\"" >> $(BOOT_DIR)/bin/jarsigner ;\
+          chmod 777 $(BOOT_DIR)/bin/jarsigner ;\
+        fi
         mkdir -p $(BOOT_DIR)/jre/lib && \
         ln -s $(SYSTEM_JRE_DIR)/lib/rt.jar $(BOOT_DIR)/jre/lib && \
 …
         else \
           ln -s rt.jar $(BOOT_DIR)/jre/lib/jsse.jar ; \
+        fi
+        if [ -e $(SYSTEM_JRE_DIR)/lib/resources.jar ] ; then \
+          ln -s $(SYSTEM_JRE_DIR)/lib/resources.jar $(BOOT_DIR)/jre/lib ; \
+        else \
+          ln -s rt.jar $(BOOT_DIR)/jre/lib/resources.jar ; \
         fi
         ln -sf $(SYSTEM_JRE_DIR)/lib/$(JRE_ARCH_DIR) \
 …
 plugin-tests: stamps/plugin-tests.stamp
+check-pac-functions: stamps/check-pac-functions.stamp
+run-netx-unit-tests: stamps/run-netx-unit-tests.stamp
+links: stamps/global-links.stamp
+user-links: stamps/user-links.stamp
+run-netx-dist-tests: stamps/run-netx-dist-tests.stamp
+run-unit-test-code-coverage: stamps/run-unit-test-code-coverage.stamp
+run-reproducers-test-code-coverage: stamps/run-reproducers-test-code-coverage.stamp

trunk/icedtea-web/Makefile.in

-              r362
+              r418
 # Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 # 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 # Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 top_distdir = $(distdir)
 am__remove_distdir = \
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 …
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BROWSER_TESTS_MODIFICATION = @BROWSER_TESTS_MODIFICATION@
 BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHROME = @CHROME@
+CHROMIUM = @CHROMIUM@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 …
 ECJ = @ECJ@
 ECJ_JAR = @ECJ_JAR@
+EMMA_AVAILABLE = @EMMA_AVAILABLE@
+EMMA_JAR = @EMMA_JAR@
+EPIPHANY = @EPIPHANY@
 EXEEXT = @EXEEXT@
+FIREFOX = @FIREFOX@
 FULL_VERSION = @FULL_VERSION@
 GCJ = @GCJ@
+GLIB2_V_216_CFLAGS = @GLIB2_V_216_CFLAGS@
+GLIB2_V_216_LIBS = @GLIB2_V_216_LIBS@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 …
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JAR = @JAR@
+JARSIGNER = @JARSIGNER@
 JAR_ACCEPTS_STDIN_LIST = @JAR_ACCEPTS_STDIN_LIST@
 JAR_KNOWS_ATFILE = @JAR_KNOWS_ATFILE@
 …
 JUNIT_AVAILABLE = @JUNIT_AVAILABLE@
 JUNIT_JAR = @JUNIT_JAR@
+KEYTOOL = @KEYTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 …
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MIDORI = @MIDORI@
 MKDIR_P = @MKDIR_P@
 MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
 …
 MOZILLA_VERSION_COLLAPSED = @MOZILLA_VERSION_COLLAPSED@
 OBJEXT = @OBJEXT@
+OPERA = @OPERA@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 …
 USING_ECJ = @USING_ECJ@
 VERSION = @VERSION@
+VERSION_DEFS = @VERSION_DEFS@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
+XSLTPROC = @XSLTPROC@
 ZIP = @ZIP@
 abs_builddir = @abs_builddir@
 …
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-NETX_DIR = $(abs_top_builddir)/netx.build
-NETX_SRCDIR = $(abs_top_srcdir)/netx
-NETX_RESOURCE_DIR = $(NETX_SRCDIR)/net/sourceforge/jnlp/resources
-NETX_EXTRA_DIR = $(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
-NETX_EXTRA_DIST_DIR = $(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
-TESTS_SRCDIR = $(abs_top_srcdir)/tests
-TESTS_DIR = $(abs_top_builddir)/tests.build
-NETX_UNIT_TEST_SRCDIR = $(TESTS_SRCDIR)/netx/unit
-NETX_UNIT_TEST_DIR = $(TESTS_DIR)/netx/unit
-JUNIT_RUNNER_DIR = $(TESTS_DIR)/junit-runner
-JUNIT_RUNNER_SRCDIR = $(TESTS_SRCDIR)/junit-runner
-JUNIT_RUNNER_JAR = $(abs_top_builddir)/junit-runner.jar
-# Build directories
-BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
 @WITH_RHINO_FALSE@RHINO_RUNTIME =
 @WITH_RHINO_TRUE@RHINO_RUNTIME = :$(RHINO_JAR)
-RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME)
-# Flags
-IT_CFLAGS = $(CFLAGS) $(ARCHFLAG)
-IT_JAVAC_SETTINGS = -g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
-IT_LANGUAGE_SOURCE_VERSION = 6
-IT_CLASS_TARGET_VERSION = 6
-IT_JAVACFLAGS = $(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
+#
-# We need the jars in bootclasspath for a couple of reasons
-#  - we use classes (in the sun.applet package) loaded by the bootclassloader
-#    using another classloader to load classes from the same package causes an
-#    IllegalAccessException
-#  - we want full privileges
+#
-LAUNCHER_BOOTCLASSPATH = "-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
-PLUGIN_BOOTCLASSPATH = '"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
-# Fake update version to work with the Deployment Toolkit script used by Oracle
-# http://download.oracle.com/javase/tutorial/deployment/deploymentInDepth/depltoolkit_index.html
-JDK_UPDATE_VERSION = 50
-# Sources list
-PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
-NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \
-        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
-@ENABLE_PLUGIN_TRUE@ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
-@ENABLE_PLUGIN_TRUE@LIVECONNECT_DIR = netscape sun/applet
-@ENABLE_PLUGIN_TRUE@PLUGIN_DIR = $(abs_top_builddir)/plugin/icedteanp
-@ENABLE_PLUGIN_TRUE@PLUGIN_SRCDIR = $(abs_top_srcdir)/plugin/icedteanp
-@ENABLE_PLUGIN_TRUE@LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
-@ENABLE_PLUGIN_TRUE@ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/IcedTeaPlugin.so stamps/liveconnect-dist.stamp
-@ENABLE_PLUGIN_TRUE@PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
 @CP_SUPPORTS_REFLINK_TRUE@REFLINK = --reflink=auto
 @SRC_DIR_HARDLINKABLE_FALSE@SRC_DIR_LINK = $(REFLINK)
 …
 @ENABLE_DOCS_TRUE@@JAVADOC_SUPPORTS_J_OPTIONS_TRUE@JAVADOC_MEM_OPTS = -J-Xmx1024m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m
 @WITH_RHINO_FALSE@RHINO_TESTS =
 @WITH_RHINO_TRUE@RHINO_TESTS = check-pac-functions
+@WITH_RHINO_TRUE@RHINO_TESTS = stamps/check-pac-functions.stamp
 @WITH_JUNIT_FALSE@JUNIT_TESTS =
+@WITH_JUNIT_TRUE@JUNIT_TESTS = run-netx-unit-tests
+PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
+EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
+ itweb-settings.desktop.in $(top_srcdir)/tests
+@WITH_JUNIT_TRUE@JUNIT_TESTS = stamps/run-netx-unit-tests.stamp
+#end of exported autoconf copies
 # binary names
 …
 .SUFFIXES:
 am--refresh:
+am--refresh: Makefile
         @:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 …
 dist-bzip2: distdir
+        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+        $(am__remove_distdir)
+dist-lzip: distdir
+        tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
         $(am__remove_distdir)
 …
 dist-xz: distdir
         tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+        tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
         $(am__remove_distdir)
 …
         *.tar.lzma*) \
           lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+        *.tar.lz*) \
+          lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
         *.tar.xz*) \
           xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 …
           && $(am__cd) $(distdir)/_build \
           && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
             $(DISTCHECK_CONFIGURE_FLAGS) \
           && $(MAKE) $(AM_MAKEFLAGS) \
 …
           sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
+        @$(am__cd) '$(distuninstallcheck_dir)' \
+        && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+        @test -n '$(distuninstallcheck_dir)' || { \
+          echo 'ERROR: trying to run $@ with an empty' \
+               '$$(distuninstallcheck_dir)' >&2; \
+          exit 1; \
+        }; \
+        $(am__cd) '$(distuninstallcheck_dir)' || { \
+          echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+          exit 1; \
+        }; \
+        test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
            || { echo "ERROR: files left after uninstall:" ; \
                 if test -n "$(DESTDIR)"; then \
 …
 installcheck: installcheck-am
 install-strip:
+        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+          `test -z '$(STRIP)' || \
+            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+        if test -z '$(STRIP)'; then \
+          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+              install; \
+        else \
+          $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+            install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+            "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+        fi
 mostlyclean-generic:
 …
 .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-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 \
+        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 \
 …
+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
+export TESTS_SRCDIR=$(abs_top_srcdir)/tests
+export TESTS_DIR=$(abs_top_builddir)/tests.build
+export NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
+export NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/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 PRIVATE_KEYSTORE_NAME=teststore.ks
+export PRIVATE_KEYSTORE_PASS=123456789
+export EXPORTED_TEST_CERT_PREFIX=icedteatests
+export EXPORTED_TEST_CERT_SUFFIX=crt
+export TEST_CERT_ALIAS=icedteaweb
+export PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs
+export PUBLIC_KEYSTORE_PASS=changeit
+export JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
+export UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
+export REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
+export REPRODUCERS_CLASS_WHITELIST = $(abs_top_srcdir)/netx-dist-tests-whitelist
+export EMMA_JAVA_ARGS=-Xmx2G
+export EMMA_MODIFIED_FILES=tests-output.xml ServerAccess-logs.xml stdout.log stderr.log all.log
+export EMMA_BACKUP_SUFFIX=_noEmma
+export EMMA_SUFFIX=_withEmma
+export META_MANIFEST = META-INF/MANIFEST.MF
+export SIGNED_REPRODUCERS=signed
+export SIMPLE_REPRODUCERS=simple
+export CUSTOM_REPRODUCERS=custom
+export ALL_NONCUSTOM_REPRODUCERS=$(SIMPLE_REPRODUCERS) $(SIGNED_REPRODUCERS)
+export ALL_REPRODUCERS=$(ALL_NONCUSTOM_REPRODUCERS) $(CUSTOM_REPRODUCERS)
+# linking variables
+export PLUGIN_LINK_NAME=libjavaplugin.so
+export MOZILLA_LOCAL_PLUGINDIR=${HOME}/.mozilla/plugins
+export MOZILLA_GLOBAL64_PLUGINDIR=/usr/lib64/mozilla/plugins
+export MOZILLA_GLOBAL32_PLUGINDIR=/usr/lib/mozilla/plugins
+export OPERA_GLOBAL64_PLUGINDIR=/usr/lib64/opera/plugins
+export OPERA_GLOBAL32_PLUGINDIR=/usr/lib/opera/plugins
+export BUILT_PLUGIN_LIBRARY=IcedTeaPlugin.so
+export MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
+export MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
+export OPERA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origOG
+export MOZILLA_FAMILY_TEST= "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" -o "$(MIDORI)" != "" -o "$(EPIPHANY)" != ""
+# end of linking variables
+# Build directories
+export BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
+export RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar:$(BOOT_DIR)/jre/lib/jsse.jar$(RHINO_RUNTIME):$(BOOT_DIR)/jre/lib/resources.jar
+# Flags
+export IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
+export IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
+export IT_LANGUAGE_SOURCE_VERSION=6
+export IT_CLASS_TARGET_VERSION=6
+export IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
+#
+# We need the jars in bootclasspath for a couple of reasons
+#  - we use classes (in the sun.applet package) loaded by the bootclassloader
+#    using another classloader to load classes from the same package causes an
+#    IllegalAccessException
+#  - 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)"'
+# Fake update version to work with the Deployment Toolkit script used by Oracle
+# http://download.oracle.com/javase/tutorial/deployment/deploymentInDepth/depltoolkit_index.html
+export JDK_UPDATE_VERSION=50
+# Sources list
+export PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
+export NETX_PKGS = javax.jnlp net.sourceforge.nanoxml net.sourceforge.jnlp \
+        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
+@ENABLE_PLUGIN_TRUE@export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
+@ENABLE_PLUGIN_TRUE@export LIVECONNECT_DIR = netscape sun/applet
+@ENABLE_PLUGIN_TRUE@export PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
+@ENABLE_PLUGIN_TRUE@export PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
+@ENABLE_PLUGIN_TRUE@export LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
+@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
+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
+# reproducers `D`shortcuts
+export DTEST_SERVER=-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR)
+export DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws)
+export DBROWSERS=-Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA):$(MIDORI):$(EPIPHANY)
+export REPRODUCERS_DPARAMETERS= $(DTEST_SERVER) $(DJAVAWS_BUILD) $(DBROWSERS) $(BROWSER_TESTS_MODIFICATION)
+# end of `D`shortcuts
+#exported autoconf copies
+export EXPORTED_JAVAC=$(BOOT_DIR)/bin/javac
 # Top-Level Targets
 # =================
 …
 check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
 clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \
  clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests
+clean-local: clean-netx clean-plugin clean-liveconnect clean-extra  \
+ clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests clean-bootstrap-directory
         if [ -e stamps ] ; then \
           rmdir stamps ; \
 …
 .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
  clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs \
  clean-tests check-local clean-launchers check-pac-functions run-netx-unit-tests clean-netx-tests \
+ clean-tests check-local clean-launchers stamps/check-pac-functions.stamp stamps/run-netx-unit-tests.stamp clean-netx-tests \
  clean-junit-runner clean-netx-unit-tests
 install-exec-local:
         ${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir)
 @ENABLE_PLUGIN_TRUE@    ${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(libdir)
+@ENABLE_PLUGIN_TRUE@    ${INSTALL_PROGRAM} $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir)
 @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
 …
 uninstall-local:
         rm -f $(DESTDIR)$(libdir)/IcedTeaPlugin.so
+        rm -f $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
         rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
         rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
 …
 @ENABLE_PLUGIN_TRUE@    cd $(PLUGIN_DIR) && \
 @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@      -fPIC -o $@ -c $<
 @ENABLE_PLUGIN_TRUE@$(PLUGIN_DIR)/IcedTeaPlugin.so: $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
+@ENABLE_PLUGIN_TRUE@$(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
 @ENABLE_PLUGIN_TRUE@    cd $(PLUGIN_DIR) && \
 @ENABLE_PLUGIN_TRUE@    $(CXX) $(CXXFLAGS) \
 …
 @ENABLE_PLUGIN_TRUE@clean-IcedTeaPlugin:
 @ENABLE_PLUGIN_TRUE@    rm -f $(PLUGIN_DIR)/*.o
 @ENABLE_PLUGIN_TRUE@    rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
+@ENABLE_PLUGIN_TRUE@    rm -f $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY)
 @ENABLE_PLUGIN_TRUE@    if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
 @ENABLE_PLUGIN_TRUE@      if [ -e $(abs_top_builddir)/plugin/icedteanp ] ; then \
 …
         fi
 check-pac-functions: stamps/bootstrap-directory.stamp
+stamps/check-pac-functions.stamp: stamps/bootstrap-directory.stamp
         ./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
+          $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js)
+          $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js) ; \
+        mkdir -p stamps && \
+        touch $@
 junit-runner-source-files.txt:
         find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@
 $(JUNIT_RUNNER_JAR): junit-runner-source-files.txt
+$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt stamps/netx-dist-tests-compile.stamp
         mkdir -p $(JUNIT_RUNNER_DIR) && \
         $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
           -d $(JUNIT_RUNNER_DIR) \
           -classpath $(JUNIT_JAR) \
+          -classpath $(JUNIT_JAR):$(JNLP_TESTS_ENGINE_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)
+        touch $@
+junit-jnlp-dist-custom.txt:
+        cd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
+        find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
+junit-jnlp-dist-simple.txt:
+        cd $(JNLP_TESTS_SRCDIR)/simple/ ; \
+        find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
+stamps/junit-jnlp-dist-signed.stamp:
+        types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          pushd $(JNLP_TESTS_SRCDIR)/$$which/ ; \
+          find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
+          popd ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs
+        types=($(ALL_NONCUSTOM_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          for dir in "$${simpleReproducers[@]}" ; do \
+            echo "processing: $$dir" ; \
+            mkdir -p "$(JNLP_TESTS_DIR)/$$dir" ; \
+            if [ -e "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/srcs/" ]; then \
+              d=`pwd` ; \
+              cd "$(JNLP_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 ; \
+              if [ -n "$$notSrcFiles" ] ; then \
+                cp -R --parents $$notSrcFiles "$(JNLP_TESTS_DIR)/$$dir/" ; \
+              fi ; \
+              cd "$(JNLP_TESTS_DIR)/$$dir/" ; \
+              if [ -f $(META_MANIFEST) ]; \
+              then \
+                $(BOOT_DIR)/bin/jar cfm "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $(META_MANIFEST) * ; \
+              else \
+                $(BOOT_DIR)/bin/jar cf "$(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" * ; \
+              fi; \
+              cd "$$d" ; \
+            fi; \
+          done ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+stamps/netx-dist-tests-sign-some-reproducers.stamp: stamps/netx-dist-tests-prepare-reproducers.stamp
+        keystore=$(abs_top_builddir)/$(PRIVATE_KEYSTORE_NAME); \
+        types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          tcaw=$(TEST_CERT_ALIAS)_$$which ; \
+          $(BOOT_DIR)/bin/keytool -genkey -alias $$tcaw -keystore $$keystore -keypass $(PRIVATE_KEYSTORE_PASS) -storepass $(PRIVATE_KEYSTORE_PASS) -dname "cn=$$tcaw, ou=$$tcaw, o=$$tcaw, c=$$tcaw" ; \
+            . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          signedReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+            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 ; \
+          done ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+stamps/change-dots-to-paths.stamp: stamps/netx-dist-tests-sign-some-reproducers.stamp
+        pushd  $(JNLP_TESTS_SERVER_DEPLOYDIR); \
+        types=($(ALL_NONCUSTOM_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          for dir in "$${simpleReproducers[@]}" ; do \
+            if test "$${dir:0:1}" = "." ; then \
+              echo "reproducer $$dir starts with dot. It is forbidden" ; \
+              exit 5; \
+            fi; \
+            if test "$${dir:(-1)}" = "." ; then \
+              echo "reproducer $$dir ends with dot. It is forbidden" ; \
+              exit 5; \
+            fi; \
+            q=`expr index "$$dir" .`; \
+            r=$$? ; \
+            if [ $$r = 0  ]; then \
+              slashed_dir="./$${dir//.//}" ; \
+              path="`dirname $$slashed_dir`" ; \
+              file="`basename $$slashed_dir`.jar" ; \
+              echo "copying $$dir.jar to $$path as $$file" ; \
+              mkdir --parents $$path ; \
+              cp $$dir".jar" "$$path"/"$$file" ; \
+            fi ; \
+          done ; \
+        done ; \
+        popd ; \
+        mkdir -p stamps && \
+        touch $@
+#this always tries to remove  previous testcert
+#the code is copypasted from netx-dist-tests-remove-cert-from-public, because
+#with depending to not stamped target we always have to rerun reproducers targets
+stamps/exported-test-certs.stamp: stamps/change-dots-to-paths.stamp
+        -types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          $(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) ; \
+        done ;
+        mkdir -p stamps && \
+        touch $@
+stamps/netx-dist-tests-import-cert-to-public: stamps/exported-test-certs.stamp
+        types=($(SIGNED_REPRODUCERS)) ; \
+        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) ;\
+        done ;
+        mkdir -p stamps && \
+        touch $@
+netx-dist-tests-remove-cert-from-public:
+        -types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          $(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);
+        $(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 && \
+        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);
+        $(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 && \
+        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
+        types=($(ALL_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          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/"* ; \
+          done ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+stamps/netx-dist-tests-copy-resources.stamp: stamps/junit-jnlp-dist-dirs
+        types=($(ALL_REPRODUCERS)); \
+        for which in "$${types[@]}" ; do \
+          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+          IFS="$$IFS_BACKUP" ; \
+          for dir in "$${simpleReproducers[@]}" ; do \
+            cp -R "$(JNLP_TESTS_SRCDIR)/$$which/$$dir/resources/"*  $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
+          done ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+$(REPRODUCERS_CLASS_NAMES): $(REPRODUCERS_CLASS_WHITELIST)
+        whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
+        cd $(JNLP_TESTS_ENGINE_TESTS_DIR) ; \
+        class_names= ; \
+        for test in `find -type f` ; do \
+          class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
+          class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
+          INLCUDE="NO" ; \
+          for x in $$whiteListed ; do \
+            q=`expr match "$$class_name" "$$x"`; \
+            r=$$? ; \
+            if [ $$r = 0  ]; then \
+              echo "$$class_name will be included in reproducers testcases because of $$x pattern in $(REPRODUCERS_CLASS_WHITELIST). Matching was  $$q"; \
+              INLCUDE="YES" ; \
+            fi; \
+          done; \
+          if [ "$$INLCUDE" = "YES"  ]; then \
+            class_names="$$class_names $$class_name" ; \
+          else \
+            echo "$$class_name had no match in $(REPRODUCERS_CLASS_WHITELIST). Excluding"; \
+          fi; \
+        done ; \
+        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)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES) stamps/process-custom-reproducers.stamp
+        cd $(JNLP_TESTS_ENGINE_DIR) ; \
+        class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
+        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(JNLP_TESTS_ENGINE_TESTS_DIR) \
+          $(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
+        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\
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(REPRODUCERS_CLASS_NAMES)
+        . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+        customReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-custom.txt `); \
+        IFS="$$IFS_BACKUP" ; \
+        for dir in "$${customReproducers[@]}" ; do \
+          pushd $(JNLP_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/$$dir/srcs; \
+          $(MAKE) prepare-reproducer ; \
+          popd ; \
+        done ; \
+        mkdir -p stamps && \
+        touch $@
+clean-custom-reproducers: junit-jnlp-dist-custom.txt
+        . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+        customReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-custom.txt `); \
+        IFS="$$IFS_BACKUP" ; \
+        for dir in "$${customReproducers[@]}" ; do \
+          pushd $(JNLP_TESTS_SRCDIR)/custom/$$dir/srcs; \
+          $(MAKE) clean-reproducer ; \
+          popd ; \
+        done ; \
+        rm -f stamps/process-custom-reproducers.stamp
+#for global-links you must be root, for opera there do not exists user-links
+#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@ launcher.build/$(javaws) stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
+@ENABLE_PLUGIN_TRUE@    if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
+@ENABLE_PLUGIN_TRUE@      if [ -e $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ] ; then \
+@ENABLE_PLUGIN_TRUE@        mv -f $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME)  $(MOZILLA_LOCAL_BACKUP_FILE) ; \
+@ENABLE_PLUGIN_TRUE@        echo "$(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) backed up as $(MOZILLA_LOCAL_BACKUP_FILE)" ; \
+@ENABLE_PLUGIN_TRUE@      else \
+@ENABLE_PLUGIN_TRUE@        echo "$(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) doesn't exists, nothing to be backed up to $(MOZILLA_LOCAL_BACKUP_FILE)" ; \
+@ENABLE_PLUGIN_TRUE@      fi ; \
+@ENABLE_PLUGIN_TRUE@      pushd $(MOZILLA_LOCAL_PLUGINDIR) ; \
+@ENABLE_PLUGIN_TRUE@      ln -s $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) $(PLUGIN_LINK_NAME) ; \
+@ENABLE_PLUGIN_TRUE@      echo "$(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) linked as  $$PWD/$(PLUGIN_LINK_NAME)" ; \
+@ENABLE_PLUGIN_TRUE@      popd ; \
+@ENABLE_PLUGIN_TRUE@    fi ; \
+@ENABLE_PLUGIN_TRUE@    touch $@
+@ENABLE_PLUGIN_TRUE@restore-user-links:
+@ENABLE_PLUGIN_TRUE@    if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
+@ENABLE_PLUGIN_TRUE@      if [ -e $(MOZILLA_LOCAL_BACKUP_FILE) ] ; then \
+@ENABLE_PLUGIN_TRUE@        mv -f  $(MOZILLA_LOCAL_BACKUP_FILE)  $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ; \
+@ENABLE_PLUGIN_TRUE@        echo "$(MOZILLA_LOCAL_BACKUP_FILE) restored as $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME)" ; \
+@ENABLE_PLUGIN_TRUE@      else \
+@ENABLE_PLUGIN_TRUE@        rm -f $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) ; \
+@ENABLE_PLUGIN_TRUE@        echo "$(MOZILLA_LOCAL_BACKUP_FILE) do not exists, nothing to be restored. $(MOZILLA_LOCAL_PLUGINDIR)/$(PLUGIN_LINK_NAME) removed" ; \
+@ENABLE_PLUGIN_TRUE@      fi ; \
+@ENABLE_PLUGIN_TRUE@    fi ;
+@ENABLE_PLUGIN_TRUE@    if [ -e stamps/user-links.stamp ] ; then \
+@ENABLE_PLUGIN_TRUE@      rm -f stamps/user-links.stamp ; \
+@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/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
+@ENABLE_PLUGIN_TRUE@    if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
+@ENABLE_PLUGIN_TRUE@        dir="$(MOZILLA_GLOBAL32_PLUGINDIR)"  ; \
+@ENABLE_PLUGIN_TRUE@        arch=`arch`  ; \
+@ENABLE_PLUGIN_TRUE@        if [ "$$arch" = "x86_64" ]  ; then \
+@ENABLE_PLUGIN_TRUE@          dir="$(MOZILLA_GLOBAL64_PLUGINDIR)"  ; \
+@ENABLE_PLUGIN_TRUE@        fi ; \
+@ENABLE_PLUGIN_TRUE@        if [ -e "$$dir"/$(PLUGIN_LINK_NAME) ] ; then \
+@ENABLE_PLUGIN_TRUE@          mv -f "$$dir"/$(PLUGIN_LINK_NAME)  $(MOZILLA_GLOBAL_BACKUP_FILE) ; \
+@ENABLE_PLUGIN_TRUE@          echo "$$dir/$(PLUGIN_LINK_NAME) backed up as  $(MOZILLA_GLOBAL_BACKUP_FILE)" ; \
+@ENABLE_PLUGIN_TRUE@        else \
+@ENABLE_PLUGIN_TRUE@          echo "$$dir/$(PLUGIN_LINK_NAME) do not exists, nothing to be backed up to $(MOZILLA_GLOBAL_BACKUP_FILE)" ; \
+@ENABLE_PLUGIN_TRUE@        fi ; \
+@ENABLE_PLUGIN_TRUE@        pushd "$$dir"  ; \
+@ENABLE_PLUGIN_TRUE@        ln -s $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) $(PLUGIN_LINK_NAME)  ; \
+@ENABLE_PLUGIN_TRUE@        echo "$(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) linked as  $$PWD/$(PLUGIN_LINK_NAME)" ; \
+@ENABLE_PLUGIN_TRUE@        popd  ; \
+@ENABLE_PLUGIN_TRUE@    fi ;
+@ENABLE_PLUGIN_TRUE@    if [ "$(OPERA)" != "" ]  ; then \
+@ENABLE_PLUGIN_TRUE@        dir="$(OPERA_GLOBAL32_PLUGINDIR)"  ; \
+@ENABLE_PLUGIN_TRUE@        arch=`arch`  ; \
+@ENABLE_PLUGIN_TRUE@        if [ "$$arch" = "x86_64" ] ; then \
+@ENABLE_PLUGIN_TRUE@          dir="$(OPERA_GLOBAL64_PLUGINDIR)" ; \
+@ENABLE_PLUGIN_TRUE@        fi ; \
+@ENABLE_PLUGIN_TRUE@        if [ -e "$$dir"/$(PLUGIN_LINK_NAME) ] ; then \
+@ENABLE_PLUGIN_TRUE@          mv -f "$$dir"/$(PLUGIN_LINK_NAME)  $(OPERA_GLOBAL_BACKUP_FILE) ; \
+@ENABLE_PLUGIN_TRUE@          echo "$$dir/$(PLUGIN_LINK_NAME) backed up as  $(OPERA_GLOBAL_BACKUP_FILE) "; \
+@ENABLE_PLUGIN_TRUE@        else \
+@ENABLE_PLUGIN_TRUE@          echo "$$dir/$(PLUGIN_LINK_NAME) do not exists, nothing to be backed up to $(OPERA_GLOBAL_BACKUP_FILE) "; \
+@ENABLE_PLUGIN_TRUE@        fi ; \
+@ENABLE_PLUGIN_TRUE@        pushd "$$dir"  ; \
+@ENABLE_PLUGIN_TRUE@        ln -s $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) $(PLUGIN_LINK_NAME)  ; \
+@ENABLE_PLUGIN_TRUE@        echo "$(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY) linked as  $$PWD/$(PLUGIN_LINK_NAME)" ; \
+@ENABLE_PLUGIN_TRUE@        popd  ; \
+@ENABLE_PLUGIN_TRUE@    fi   ; \
+@ENABLE_PLUGIN_TRUE@    touch $@
+@ENABLE_PLUGIN_TRUE@restore-global-links:
+@ENABLE_PLUGIN_TRUE@    if [ $(MOZILLA_FAMILY_TEST) ]  ; then  \
+@ENABLE_PLUGIN_TRUE@        dir="$(MOZILLA_GLOBAL32_PLUGINDIR)"  ; \
+@ENABLE_PLUGIN_TRUE@        arch=`arch`  ; \
+@ENABLE_PLUGIN_TRUE@        if [ "$$arch" = "x86_64" ]  ; then \
+@ENABLE_PLUGIN_TRUE@          dir="$(MOZILLA_GLOBAL64_PLUGINDIR)"  ; \
+@ENABLE_PLUGIN_TRUE@        fi ; \
+@ENABLE_PLUGIN_TRUE@        if [ -e $(MOZILLA_GLOBAL_BACKUP_FILE) ] ; then \
+@ENABLE_PLUGIN_TRUE@          mv -f $(MOZILLA_GLOBAL_BACKUP_FILE) "$$dir"/$(PLUGIN_LINK_NAME) ; \
+@ENABLE_PLUGIN_TRUE@          echo "$(MOZILLA_GLOBAL_BACKUP_FILE) restored as $$dir/$(PLUGIN_LINK_NAME)" ; \
+@ENABLE_PLUGIN_TRUE@        else \
+@ENABLE_PLUGIN_TRUE@          rm -f "$$dir"/$(PLUGIN_LINK_NAME) ; \
+@ENABLE_PLUGIN_TRUE@          echo "$(MOZILLA_GLOBAL_BACKUP_FILE) do not exists, nothing to be restored. $$dir/$(PLUGIN_LINK_NAME) removed" ; \
+@ENABLE_PLUGIN_TRUE@        fi ; \
+@ENABLE_PLUGIN_TRUE@    fi ;
+@ENABLE_PLUGIN_TRUE@    if [ "$(OPERA)" != "" ]  ; then \
+@ENABLE_PLUGIN_TRUE@        dir="$(OPERA_GLOBAL32_PLUGINDIR)"  ; \
+@ENABLE_PLUGIN_TRUE@        arch=`arch`  ; \
+@ENABLE_PLUGIN_TRUE@        if [ "$$arch" = "x86_64" ] ; then \
+@ENABLE_PLUGIN_TRUE@          dir="$(OPERA_GLOBAL64_PLUGINDIR)" ; \
+@ENABLE_PLUGIN_TRUE@        fi ; \
+@ENABLE_PLUGIN_TRUE@        if [ -e $(OPERA_GLOBAL_BACKUP_FILE) ] ; then \
+@ENABLE_PLUGIN_TRUE@          mv -f $(OPERA_GLOBAL_BACKUP_FILE) "$$dir"/$(PLUGIN_LINK_NAME) ; \
+@ENABLE_PLUGIN_TRUE@          echo "$(OPERA_GLOBAL_BACKUP_FILE)  restored as $$dir/$(PLUGIN_LINK_NAME)" ; \
+@ENABLE_PLUGIN_TRUE@        else \
+@ENABLE_PLUGIN_TRUE@          rm -f "$$dir"/$(PLUGIN_LINK_NAME) ; \
+@ENABLE_PLUGIN_TRUE@          echo "$(OPERA_GLOBAL_BACKUP_FILE) do not exist, nothing to be restored. $$dir/$(PLUGIN_LINK_NAME) removed" ; \
+@ENABLE_PLUGIN_TRUE@        fi ; \
+@ENABLE_PLUGIN_TRUE@    fi   ;
+@ENABLE_PLUGIN_TRUE@    if [ -e stamps/global-links.stamp ] ; then \
+@ENABLE_PLUGIN_TRUE@      rm -f stamps/global-links.stamp ; \
+@ENABLE_PLUGIN_TRUE@    fi
 netx-unit-tests-source-files.txt:
         find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort > $@
 stamps/netx-unit-tests-compile.stamp: stamps/netx.stamp \
  netx-unit-tests-source-files.txt
+ netx-unit-tests-source-files.txt stamps/netx-dist-tests-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 \
+         -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
          @netx-unit-tests-source-files.txt && \
         mkdir -p stamps && \
         touch $@
+run-netx-unit-tests: stamps/netx-unit-tests-compile.stamp \
+ $(JUNIT_RUNNER_JAR)
+        cp {$(NETX_UNIT_TEST_SRCDIR),$(NETX_UNIT_TEST_DIR)}/net/sourceforge/jnlp/basic.jnlp
+$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME):
+        mkdir $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)
+        cp $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/*.css $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)/
+        cp $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/*.js $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)/
+$(UNIT_CLASS_NAMES):
         cd $(NETX_UNIT_TEST_DIR) ; \
         class_names= ; \
 …
           class_names="$$class_names $$class_name" ; \
         done ; \
+        echo $$class_names ; \
+        CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \
+          $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
+clean-netx-tests: clean-netx-unit-tests clean-junit-runner
+        echo $$class_names > $(UNIT_CLASS_NAMES);
+stamps/run-netx-unit-tests.stamp: stamps/netx-unit-tests-compile.stamp $(JUNIT_RUNNER_JAR)  \
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES)
+        filename=" " ; \
+        cd $(NETX_UNIT_TEST_SRCDIR) ; \
+        for file in `find . -type f \! -iname "*.java"`; do\
+                filename=`echo $$file `; \
+                cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \
+        done ; \
+        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
+        mkdir -p stamps && \
+        touch $@
+#warning,  during this target tests.build/netx/unit/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
+#you can add -ix "-*Test*" -ix "-*test*"  to ignore all test cases from statistics
+stamps/run-unit-test-code-coverage.stamp: stamps/netx-unit-tests-compile.stamp $(JUNIT_RUNNER_JAR)  \
+ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)  $(UNIT_CLASS_NAMES)
+@WITH_EMMA_TRUE@        cd $(NETX_UNIT_TEST_DIR) ; \
+@WITH_EMMA_TRUE@        for file in $(EMMA_MODIFIED_FILES) ; do \
+@WITH_EMMA_TRUE@          mv $(NETX_UNIT_TEST_DIR)/$$file  $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
+@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@         -Dreport.html.out.encoding=UTF-8 \
+@WITH_EMMA_TRUE@         -raw \
+@WITH_EMMA_TRUE@         -sp $(NETX_SRCDIR) \
+@WITH_EMMA_TRUE@         -sp $(NETX_UNIT_TEST_SRCDIR) \
+@WITH_EMMA_TRUE@         -sp $(JUNIT_RUNNER_SRCDIR) \
+@WITH_EMMA_TRUE@         -r html \
+@WITH_EMMA_TRUE@         -r xml \
+@WITH_EMMA_TRUE@         -cp $(NETX_DIR)/lib/classes.jar \
+@WITH_EMMA_TRUE@         -cp $(JUNIT_JAR) \
+@WITH_EMMA_TRUE@         -cp $(JUNIT_RUNNER_JAR) \
+@WITH_EMMA_TRUE@         -cp $(BOOT_DIR)/jre/lib/rt.jar \
+@WITH_EMMA_TRUE@         -cp $(BOOT_DIR)/jre/lib/jsse.jar \
+@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 . \
+@WITH_EMMA_TRUE@         -ix "-org.junit.*" \
+@WITH_EMMA_TRUE@         -ix "-junit.*" \
+@WITH_EMMA_TRUE@         CommandLine $$class_names ;  \
+@WITH_EMMA_TRUE@        for file in $(EMMA_MODIFIED_FILES) ; do \
+@WITH_EMMA_TRUE@          mv $(NETX_UNIT_TEST_DIR)/$$file  $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
+@WITH_EMMA_TRUE@          mv $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)"  $(NETX_UNIT_TEST_DIR)/$$file ; \
+@WITH_EMMA_TRUE@        done ;
+@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 $@
+#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
+stamps/run-reproducers-test-code-coverage.stamp: stamps/run-netx-dist-tests.stamp $(REPRODUCERS_CLASS_NAMES)
+@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@        done ;\
+@WITH_EMMA_TRUE@        echo "backuping javaws and netx.jar in $(DESTDIR)" ; \
+@WITH_EMMA_TRUE@        netx_backup=$(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx_backup.jar ; \
+@WITH_EMMA_TRUE@        javaws_backup=$(DESTDIR)$(bindir)/javaws_backup ; \
+@WITH_EMMA_TRUE@        mv $(DESTDIR)$(bindir)/javaws $$javaws_backup ;  \
+@WITH_EMMA_TRUE@        mv $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar $$netx_backup ; \
+@WITH_EMMA_TRUE@        nw_bootclasspath="$(LAUNCHER_BOOTCLASSPATH):$(EMMA_JAR):$$netx_backup" ; \
+@WITH_EMMA_TRUE@        instructed_dir=$(TESTS_DIR)/instr ; \
+@WITH_EMMA_TRUE@        echo "instrumenting netx.jar from $$netx_backup through $$instructed_dir" ; \
+@WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/java -cp  $(EMMA_JAR) emma instr -d $$instructed_dir -ip $$netx_backup ; \
+@WITH_EMMA_TRUE@        pushd $$instructed_dir ; \
+@WITH_EMMA_TRUE@        $(BOOT_DIR)/bin/jar -cf $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar * ; \
+@WITH_EMMA_TRUE@        popd ; \
+@WITH_EMMA_TRUE@        rm -rf $$instructed_dir ; \
+@WITH_EMMA_TRUE@        echo "patching $(javaws)" ; \
+@WITH_EMMA_TRUE@        cat $$javaws_backup | sed "s,$(LAUNCHER_BOOTCLASSPATH),$$nw_bootclasspath," > $(DESTDIR)$(bindir)/$(javaws) ; \
+@WITH_EMMA_TRUE@        chmod 777 $(DESTDIR)$(bindir)/$(javaws) ; \
+@WITH_EMMA_TRUE@        testcases_srcs=( ) ; \
+@WITH_EMMA_TRUE@        k=0 ; \
+@WITH_EMMA_TRUE@        types=($(ALL_REPRODUCERS)); \
+@WITH_EMMA_TRUE@        for which in "$${types[@]}" ; do \
+@WITH_EMMA_TRUE@          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+@WITH_EMMA_TRUE@          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+@WITH_EMMA_TRUE@          IFS="$$IFS_BACKUP" ; \
+@WITH_EMMA_TRUE@          for dir in "$${simpleReproducers[@]}" ; do \
+@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@            k=$$((k+1)) ; \
+@WITH_EMMA_TRUE@            done ; \
+@WITH_EMMA_TRUE@          done ; \
+@WITH_EMMA_TRUE@        cd $(JNLP_TESTS_ENGINE_DIR) ; \
+@WITH_EMMA_TRUE@        class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
+@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@           -raw \
+@WITH_EMMA_TRUE@           -cp $(NETX_DIR)/lib/classes.jar \
+@WITH_EMMA_TRUE@           -cp $(JUNIT_JAR) \
+@WITH_EMMA_TRUE@           -cp $(JUNIT_RUNNER_JAR) \
+@WITH_EMMA_TRUE@           -cp $(BOOT_DIR)/jre/lib/rt.jar \
+@WITH_EMMA_TRUE@           -cp $(BOOT_DIR)/jre/lib/jsse.jar \
+@WITH_EMMA_TRUE@           -cp $(BOOT_DIR)/jre/lib/resources.jar \
+@WITH_EMMA_TRUE@           -cp $(RHINO_RUNTIME) \
+@WITH_EMMA_TRUE@           -cp . \
+@WITH_EMMA_TRUE@           -cp $(JNLP_TESTS_ENGINE_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@        $(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@        $(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@          -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@          -r html \
+@WITH_EMMA_TRUE@          -r xml \
+@WITH_EMMA_TRUE@          "$${testcases_srcs[@]}" ; \
+@WITH_EMMA_TRUE@        echo "restoring javaws and netx.jar in $(DESTDIR)" ; \
+@WITH_EMMA_TRUE@        rm -f $(DESTDIR)$(bindir)/$(javaws) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar ; \
+@WITH_EMMA_TRUE@        rm -f $(DESTDIR)$(bindir)/$(javaws);  \
+@WITH_EMMA_TRUE@        mv $$javaws_backup $(DESTDIR)$(bindir)/$(javaws);  \
+@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@        done ;\
+@WITH_EMMA_TRUE@        rm $(JNLP_TESTS_ENGINE_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
+@WITH_EMMA_TRUE@        cd $(TESTS_DIR) ; \
+@WITH_EMMA_TRUE@        k=0 ; \
+@WITH_EMMA_TRUE@        types=($(ALL_REPRODUCERS)); \
+@WITH_EMMA_TRUE@        for which in "$${types[@]}" ; do \
+@WITH_EMMA_TRUE@          . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+@WITH_EMMA_TRUE@          simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+@WITH_EMMA_TRUE@          IFS="$$IFS_BACKUP" ; \
+@WITH_EMMA_TRUE@          for dir in "$${simpleReproducers[@]}" ; do \
+@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@            k=$$((k+1)) ; \
+@WITH_EMMA_TRUE@          done ; \
+@WITH_EMMA_TRUE@        done ; \
+@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@        $(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 $(TESTS_DIR)/coverage.es \
+@WITH_EMMA_TRUE@         -in $(TESTS_DIR)/coverage.em \
+@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@         "$${testcases_srcs[@]}" \
+@WITH_EMMA_TRUE@         -r html \
+@WITH_EMMA_TRUE@         -r xml ;
+@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
+clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests clean-test-code-coverage
         if [ -e $(TESTS_DIR)/netx ]; then \
           rmdir $(TESTS_DIR)/netx ; \
 …
         rm -f $(JUNIT_RUNNER_JAR)
 clean-netx-unit-tests:
+clean-netx-unit-tests: clean_tests_reports
         rm -f netx-unit-tests-source-files.txt
         rm -rf $(NETX_UNIT_TEST_DIR)
+        rm -f $(UNIT_CLASS_NAMES)
+        rm -f stamps/check-pac-functions.stamp
+        rm -f stamps/run-netx-unit-tests.stamp
         rm -f stamps/netx-unit-tests-compile.stamp
+clean_tests_reports:
+        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 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/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/netx-dist-tests-sign-some-reproducers.stamp
+        rm -f stamps/change-dots-to-paths.stamp
+        rm -f junit-jnlp-dist-simple.txt
+        rm -f junit-jnlp-dist-custom.txt
+        rm -f netx-dist-tests-tests-source-files.txt
+        types=($(SIGNED_REPRODUCERS)) ; \
+        for which in "$${types[@]}" ; do \
+          rm -f junit-jnlp-dist-$$which.txt ; \
+          rm -f $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ; \
+        done ;
+        rm -f stamps/exported-test-certs.stamp
+        rm -f stamps/junit-jnlp-dist-signed.stamp
+        rm -f $(REPRODUCERS_CLASS_NAMES)
+        rm -f $(abs_top_builddir)/$(PRIVATE_KEYSTORE_NAME)
+        rm -f stamps/run-netx-dist-tests.stamp
+clean-unit-test-code-coverage:
+        if [ -e stamps/run-unit-test-code-coverage.stamp ]; then \
+          rm -rf $(NETX_UNIT_TEST_DIR)/coverage ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverage.xml ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverageX.es ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverageX.ec ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/coverage.es ; \
+          rm -f $(NETX_UNIT_TEST_DIR)/tests-output_withEmma.xml ; \
+          rm -f stamps/run-unit-test-code-coverage.stamp ; \
+        fi
+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 -f stamps/run-reproducers-test-code-coverage.stamp ; \
+        fi
+clean-test-code-coverage: clean-unit-test-code-coverage clean-reproducers-test-code-coverage
+        if [ -e $(TESTS_DIR)/coverage.xml ]; then \
+          rm -rf $(TESTS_DIR)/coverage  ; \
+          rm -f $(TESTS_DIR)/coverage.xml  ; \
+          rm -f $(TESTS_DIR)/coverage.es  ; \
+          rm -f $(TESTS_DIR)/coverage.em ; \
+        fi
 # plugin tests
 …
         ln -sf $(abs_top_builddir)/javac $(BOOT_DIR)/bin/javac
         ln -sf $(JAVADOC) $(BOOT_DIR)/bin/javadoc
+        if [ -e "$(KEYTOOL)" ] ; then \
+          ln -sf $(KEYTOOL) $(BOOT_DIR)/bin/keytool ;\
+        else \
+          echo "#! /bin/sh" > $(BOOT_DIR)/bin/keytool ;\
+          echo "echo \"keytool not exist on your system, signed part of reproducers test will fail\"" >> $(BOOT_DIR)/bin/keytool ;\
+          chmod 777 $(BOOT_DIR)/bin/keytool ;\
+        fi
+        if [ -e "$(JARSIGNER)" ] ; then \
+          ln -sf $(JARSIGNER) $(BOOT_DIR)/bin/jarsigner ;\
+        else \
+          echo "#! /bin/sh" > $(BOOT_DIR)/bin/jarsigner ;\
+          echo "echo \"jarsigner not exist on your system, signed part of reproducers test will fail\"" >> $(BOOT_DIR)/bin/jarsigner ;\
+          chmod 777 $(BOOT_DIR)/bin/jarsigner ;\
+        fi
         mkdir -p $(BOOT_DIR)/jre/lib && \
         ln -s $(SYSTEM_JRE_DIR)/lib/rt.jar $(BOOT_DIR)/jre/lib && \
 …
         else \
           ln -s rt.jar $(BOOT_DIR)/jre/lib/jsse.jar ; \
+        fi
+        if [ -e $(SYSTEM_JRE_DIR)/lib/resources.jar ] ; then \
+          ln -s $(SYSTEM_JRE_DIR)/lib/resources.jar $(BOOT_DIR)/jre/lib ; \
+        else \
+          ln -s rt.jar $(BOOT_DIR)/jre/lib/resources.jar ; \
         fi
         ln -sf $(SYSTEM_JRE_DIR)/lib/$(JRE_ARCH_DIR) \
 …
 plugin-tests: stamps/plugin-tests.stamp
+check-pac-functions: stamps/check-pac-functions.stamp
+run-netx-unit-tests: stamps/run-netx-unit-tests.stamp
+links: stamps/global-links.stamp
+user-links: stamps/user-links.stamp
+run-netx-dist-tests: stamps/run-netx-dist-tests.stamp
+run-unit-test-code-coverage: stamps/run-unit-test-code-coverage.stamp
+run-reproducers-test-code-coverage: stamps/run-reproducers-test-code-coverage.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.

trunk/icedtea-web/NEWS

-              r348
+              r418
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release 1.1.2 (2011-08-31):
+New in release 1.3 (2012-09-04):
+* Security updates
+  - CVE-2012-3422, RH840592: Potential read from an uninitialized memory location
+  - CVE-2012-3423, RH841345: Incorrect handling of not 0-terminated strings
+* NetX
+  - PR898: signed applications with big jnlp-file doesn't start (webstart affect like "frozen")
+  - PR811: javaws is not handling urls with spaces (and other characters needing encoding) correctly
+* Plugin
+  - PR820: IcedTea-Web 1.1.3 crashing Firefox when loading Citrix XenApp
+  - PR863: Error passing strings to applet methods in Chromium
+  - PR895: IcedTea-Web searches for missing classes on each loadClass or findClass
+  - PR861: Allow loading from non codebase hosts. Allow code to connect to hosting server
+  - PR518: NPString.utf8characters not guaranteed to be nul-terminated
+  - PR722: META-INF/ unsigned entries should be ignored in signing
+  - PR855: AppletStub getDocumentBase() doesn't return full URL
+  - PR1011: Folders treated as jar files in archive tag
+  - PR1106: Buffer overflow in plugin table
+  - PR975: Plugin should not include classpaths specified in jar manifests when using jnlp_href
+  - PR588: Cookies not written from cookie jar to browser cookies
+* Common
+  - PR918: java applet windows uses a low resulution black/white icon
+  - RH838417: Disambiguate signed applet security prompt from certificate warning
+  - RH838559: Disambiguate signed applet security prompt from certificate warning
+  - RH720836: project can be compiled against GTK+ 2 or 3 librarie
+  - PR955: regression: SweetHome3D fails to run
+New in release 1.2 (2011-XX-XX):
+* Security updates:
+        - RH718164, CVE-2011-2513: Home directory path disclosure to untrusted applications
+        - RH718170, CVE-2011-2514: Java Web Start security warning dialog manipulation
+        - RH742515, CVE-2011-3377: IcedTea-Web: second-level domain subdomains and suffix domain SOP bypass
+* NetX
+  - PR618: Can't install OpenDJ, JavaWebStart fails with Input stream is null error
+  - PR765: JNLP file with all resource jars marked as 'lazy' fails to validate signature and stops the launch of application
+  - PR788: Elluminate Live! is not working
+  - PR804: javaws launcher incorrectly handles file names with spaces
 * Plugin
   - PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow
+  - PR782: Support building against npapi-sdk as well
+  - PR838: IcedTea plugin crashes with chrome browser when javascript is executed
+  - PR852: Classloader not being flushed after last applet from a site is closed
+  - RH586194: Unable to connect to connect with Juniper VPN client
   - RH718693: MindTerm SSH Applet doesn't work
 Common
   - PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up
+  - PR771: IcedTea-Web certificate verification code does not use the right API
+  - PR742: IcedTea-Web checks certs only upto 1 level deep before declaring them untrusted.
   - PR769: IcedTea-Web does not work with some ssl sites with OpenJDK7
+  - PR778: Jar download and server certificate verification deadlock
+  - PR789: typo in jrunscript.sh
+  - PR794: IcedTea-Web does not work if a Web Start app jar has a Class-Path element in the manifest
+  - PR808: javaws is unable to start, when missing jars are enumerated before main jar
   - RH734081: Javaws cannot use proxy settings from Firefox
+  - RH738814: Access denied at ssl handshake
+  - Support for authenticating using client certificates
+New in release 1.1.1 (2011-07-20):
+* Security updates:
+        - RH718164, CVE-2011-2513: Home directory path disclosure to untrusted applications
+        - RH718170, CVE-2011-2514: Java Web Start security warning dialog manipulation
+New in release 1.1 (2011-06-08):
+New in release 1.1 (2011-XX-XX):
+* Security updates
+  - S6983554, CVE-2010-4450: Launcher incorrect processing of empty library path entries
+  - RH677332, CVE-2011-0706: IcedTea multiple signers privilege escalation
 * New Features
   - IcedTea-Web now installs to a FHS-compliant location
 …
   - The user's default browser (determined from xdg-open or $BROWSER) is used
   - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled)
+  - PR464: plugin can now load parameters from jnlp files.
   - PR658: now jnlp.packEnabled works with applets.
   - PR726: closing javaws -about no longer throws exceptions.

trunk/icedtea-web/acinclude.m4

-              r348
+              r418
 ])
+dnl ITW_GTK_CHECK_VERSION([gtk version])
+AC_DEFUN([ITW_GTK_CHECK_VERSION],
+[
+  AC_MSG_CHECKING([for GTK$1 version])
+  GTK_VER=`$PKG_CONFIG --modversion gtk+-$1.0`
+  AC_MSG_RESULT([$GTK_VER])
+])
+dnl ITW_GTK_CHECK([gtk version])
+AC_DEFUN([ITW_GTK_CHECK],
+[
+  case "$1" in
+    default)
+      PKG_CHECK_MODULES(GTK, gtk+-3.0,
+        [ITW_GTK_CHECK_VERSION([3])],
+        [PKG_CHECK_MODULES(GTK, gtk+-2.0,
+           [ITW_GTK_CHECK_VERSION([2])],
+           [AC_MSG_ERROR([GTK $1 not found])]
+        )]
+      )
+      ;;
+    *)
+      PKG_CHECK_MODULES(GTK, gtk+-$1.0,
+        [ITW_GTK_CHECK_VERSION([$1])],
+        [AC_MSG_ERROR([GTK $1 not found])]
+      )
+      ;;
+  esac
+])
 AC_DEFUN_ONCE([IT_CHECK_PLUGIN_DEPENDENCIES],
+[
 …
 AC_REQUIRE([IT_CHECK_PLUGIN])
 if test "x${enable_plugin}" = "xyes" ; then
+  PKG_CHECK_MODULES(GTK, gtk+-2.0)
+  AC_ARG_WITH([gtk],
+    [AS_HELP_STRING([--with-gtk=[2|3|default]],
+    [the GTK+ version to use (default: 3)])],
+    [case "$with_gtk" in
+|3|default) ;;
+       *) AC_MSG_ERROR([invalid GTK version specified]) ;;
+     esac],
+    [with_gtk=default])
+  ITW_GTK_CHECK([$with_gtk])
   PKG_CHECK_MODULES(GLIB, glib-2.0)
   AC_SUBST(GLIB_CFLAGS)
 …
   AC_SUBST(GTK_LIBS)
+  PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
+  PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [
+    AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
+      # XXX: use NPAPI versions instead
+      xulrunner_cv_collapsed_version=20000000
+    ])
+  ], [
+    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
+  ])
   AC_SUBST(MOZILLA_CFLAGS)
   AC_SUBST(MOZILLA_LIBS)
 …
     then
       xulrunner_cv_collapsed_version=`pkg-config --modversion libxul | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'`
+    elif pkg-config --modversion mozilla-plugin >/dev/null 2>&1
+    then
+      xulrunner_cv_collapsed_version=`pkg-config --modversion mozilla-plugin | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'`
     else
       AC_MSG_FAILURE([cannot determine xulrunner version])
 …
 AM_CONDITIONAL(HAS_PKGVERSION, test "x${PKGVERSION}" != "xnone")
 AC_SUBST(PKGVERSION)
+])
+AC_DEFUN_ONCE([IT_CHECK_GLIB_VERSION],[
+   PKG_CHECK_MODULES([GLIB2_V_216],[glib-2.0 >= 2.16],[],[AC_DEFINE([LEGACY_GLIB])])
+ ])
+AC_DEFUN_ONCE([IT_CHECK_XULRUNNER_API_VERSION],
+[
+  AC_MSG_CHECKING([for legacy xulrunner api])
+  AC_LANG_PUSH(C++)
+  CXXFLAGS_BACKUP=$CXXFLAGS
+  CXXFLAGS=$CXXFLAGS" "$MOZILLA_CFLAGS
+  AC_TRY_COMPILE([
+    #include <npfunctions.h>
+    const  char* NP_GetMIMEDescription ()
+    {return (char*) "yap!";}
+  ],[],[
+    AC_MSG_RESULT(no)
+  ],[
+    AC_MSG_RESULT(yes)
+    AC_DEFINE([LEGACY_XULRUNNERAPI])
+  ])
+  CXXFLAGS=$CXXFLAGS_BACKUP
+  AC_LANG_POP(C++)
 ])
 …
   AC_MSG_RESULT(${JAVA})
   AC_SUBST(JAVA)
+  JAVA_VERSION=`$JAVA -version 2>&1 | sed -n '1s/@<:@^"@:>@*"\(.*\)"$/\1/p'`
+  case "${JAVA_VERSION}" in
+.7*) VERSION_DEFS='-DHAVE_JAVA7';;
+  esac
+  AC_SUBST(VERSION_DEFS)
+])
+AC_DEFUN_ONCE([IT_FIND_KEYTOOL],
+[
+  AC_REQUIRE([IT_CHECK_FOR_JDK])
+  AC_MSG_CHECKING([for keytool])
+  AC_ARG_WITH([keytool],
+              [AS_HELP_STRING(--with-keytool,specify location of keytool for signed part of run-netx-dist)],
+  [
+    if test "${withval}" = "yes" ; then
+      KEYTOOL=${SYSTEM_JDK_DIR}/bin/keytool
+    else
+      KEYTOOL="${withval}"
+    fi
+  ],
+  [
+    KEYTOOL=${SYSTEM_JDK_DIR}/bin/keytool
+  ])
+  if ! test -f "${KEYTOOL}"; then
+    AC_PATH_PROG(KEYTOOL, keytool)
+  fi
+  if ! test -f "${KEYTOOL}"; then
+    KEYTOOL=""
+  fi
+  if test -z "${KEYTOOL}" ; then
+     AC_MSG_WARN("keytool not found so signed part of run-netx-dist will fail")
+  fi
+  AC_MSG_RESULT(${KEYTOOL})
+  AC_SUBST(KEYTOOL)
+])
+AC_DEFUN_ONCE([IT_FIND_JARSIGNER],
+[
+  AC_REQUIRE([IT_CHECK_FOR_JDK])
+  AC_MSG_CHECKING([for jarsigner])
+  AC_ARG_WITH([jarsigner],
+              [AS_HELP_STRING(--with-jarsigner,specify location of jarsigner for signed part od run-netx-dist)],
+  [
+    if test "${withval}" = "yes" ; then
+      JARSIGNER=${SYSTEM_JDK_DIR}/bin/jarsigner
+    else
+      JARSIGNER="${withval}"
+    fi
+  ],
+  [
+    JARSIGNER=${SYSTEM_JDK_DIR}/bin/jarsigner
+  ])
+  if ! test -f "${JARSIGNER}"; then
+    AC_PATH_PROG(JARSIGNER, jarsigner,"")
+  fi
+  if ! test -f "${JARSIGNER}"; then
+    JARSIGNER=""
+  fi
+  if test -z "${JARSIGNER}"; then
+     AC_MSG_WARN("jarsigner not found so signed part of run-netx-dist will fail")
+  fi
+  AC_MSG_RESULT(${JARSIGNER})
+  AC_SUBST(JARSIGNER)
 ])
 …
   AC_SUBST([FULL_VERSION])
 ])
+dnl Allows you to configure (enable/disable/set path to) the browser
+dnl REQUIRED Parameters:
+dnl [browser name, variable to store path, default command to run browser (if not provided, assume it's the same as the browser name]
+AC_DEFUN([IT_FIND_BROWSER],
+[
+  AC_ARG_WITH([$1],
+              [AS_HELP_STRING(--with-$1,specify the location of $1)],
+  [
+   if test "${withval}" = "no" || test "${withval}" = "yes" || test "${withval}" = "" ; then
+    $2=""
+   elif test -f "${withval}" ; then
+    $2="${withval}"
+   else
+    AC_MSG_CHECKING([for $1])
+    AC_MSG_RESULT([not found])
+    AC_MSG_FAILURE([invalid location specified to $1: ${withval}])
+   fi
+  ],
+  [
+   withval="yes"
+  ])
+  if test -f "${$2}"; then
+   AC_MSG_CHECKING([for $1])
+   AC_MSG_RESULT([${$2}])
+  elif test "${withval}" != "no"; then
+   if test $# -gt 2; then
+    AC_PATH_TOOL([$2], [$3], [], [])
+   else
+    AC_PATH_TOOL([$2], [$1], [], [])
+   fi
+  else
+   AC_MSG_CHECKING([for $1])
+   AC_MSG_RESULT([no])
+  fi
+])
+AC_DEFUN_ONCE([IT_SET_GLOBAL_BROWSERTESTS_BEHAVIOUR],
+[
+  AC_MSG_CHECKING([how browser test will be run])
+  AC_ARG_WITH([browser-tests],
+             [AS_HELP_STRING([--with-browser-tests],
+                              [yes - as defined (default), no - all browser tests will be skipped, one - all "mutiple browsers" test will behave as "one" test, all - all browser tests will be run for all set browsers])],
+             [
+               BROWSER_SWITCH=${withval}
+             ],
+             [
+               BROWSER_SWITCH="yes"
+             ])
+  D_PARAM_PART="-Dmodified.browsers.run"
+  case "$BROWSER_SWITCH" in
+    "yes" )
+        BROWSER_TESTS_MODIFICATION="" ;;
+    "no" )
+        BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=ignore" ;;
+    "one" )
+        BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=one" ;;
+    "all" )
+        BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=all" ;;
+    *)
+        AC_MSG_ERROR([unknown valkue of with-browser-tests ($BROWSER_SWITCH), so not use (yes) or set yes|no|one|all])
+  esac
+  AC_MSG_RESULT(${BROWSER_SWITCH})
+  AC_SUBST(BROWSER_TESTS_MODIFICATION)
+])

trunk/icedtea-web/aclocal.m4

-              r348
+              r418
 # generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 …
 ])# PKG_CHECK_MODULES
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # AM_AUTOMAKE_VERSION(VERSION)
 …
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
 m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 …
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 [AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 …
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 …
 fi])])
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 # Free Software Foundation, Inc.
+#
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # serial 10
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 12
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 …
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
 …
       fi
       ;;
     msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
 …
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 …
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # AM_PROG_INSTALL_SH
 …
 ])
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # AM_PROG_MKDIR_P
 …
 # Helper functions for option handling.                     -*- Autoconf -*-
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 4
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 5
 # _AM_MANGLE_OPTION(NAME)
 …
 # _AM_SET_OPTION(NAME)
 # ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 …
 # _AM_SET_OPTIONS(OPTIONS)
 # ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 …
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # AM_RUN_LOG(COMMAND)
 …
 AC_MSG_RESULT(yes)])
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 1
 # AM_PROG_INSTALL_STRIP
 …
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 # Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+#
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # serial 2
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+# serial 3
 # _AM_SUBST_NOTMAKE(VARIABLE)
 …
 # AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 …
 # Check how to create a tarball.                            -*- Autoconf -*-
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+#
 # This file is free software; the Free Software Foundation
 …
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
      [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])

trunk/icedtea-web/config.guess

-              r348
+              r418
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 timestamp='2009-11-20'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+timestamp='2012-01-01'
 # This file is free software; you can redistribute it and/or modify it
 …
 Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 …
     *:NetBSD:*:*)
         # NetBSD (nbsd) targets should (where applicable) match one or
         # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+        # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
         # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
         # switched to ELF, *-*-netbsd* would select the old
 …
                 ;;
             *)
                 os=netbsd
+                os=netbsd
                 ;;
         esac
 …
                 ;;
         *5.*)
                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
                 ;;
         esac
 …
         # 1.2 uses "1.2" for uname -r.
         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        exit ;;
+        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+        exitcode=$?
+        trap '' 0
+        exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
 …
         exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
+        echo powerpc-ibm-os400
         exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 …
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
         exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
         exit ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
         exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
         exit ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
         exit ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
     m68k:machten:*:*)
         echo m68k-apple-machten${UNAME_RELEASE}
 …
         exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
         if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
         then
 …
             echo i586-dg-dgux${UNAME_RELEASE}
         fi
         exit ;;
+        exit ;;
     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
         echo m88k-dolphin-sysv3
 …
         fi
         exit ;;
     *:AIX:*:[456])
+    *:AIX:*:[4567])
         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 …
                 if [ -x /usr/bin/getconf ]; then
                     sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
 ) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 ) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 )                      # CPU_PA_RISC2_0
                         case "${sc_kernel_bits}" in
 ) HP_ARCH="hppa2.0n" ;;
 ) HP_ARCH="hppa2.0w" ;;
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+) HP_ARCH="hppa2.0n" ;;
+) HP_ARCH="hppa2.0w" ;;
                           '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
+                        esac ;;
+                    esac
                 fi
                 if [ "${HP_ARCH}" = "" ]; then
                     eval $set_cc_for_build
                     sed 's/^              //' << EOF >$dummy.c
               #define _HPUX_SOURCE
               #include <stdlib.h>
               #include <unistd.h>
               int main ()
+              {
               #if defined(_SC_KERNEL_BITS)
                   long bits = sysconf(_SC_KERNEL_BITS);
               #endif
                   long cpu  = sysconf (_SC_CPU_VERSION);
                   switch (cpu)
+                {
                 case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
                 case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
                 case CPU_PA_RISC2_0:
               #if defined(_SC_KERNEL_BITS)
                     switch (bits)
+                        {
                         case 64: puts ("hppa2.0w"); break;
                         case 32: puts ("hppa2.0n"); break;
                         default: puts ("hppa2.0"); break;
                         } break;
               #else  /* !defined(_SC_KERNEL_BITS) */
                     puts ("hppa2.0"); break;
               #endif
                 default: puts ("hppa1.0"); break;
+                }
                   exit (0);
+              }
+                    sed 's/^            //' << EOF >$dummy.c
+                #define _HPUX_SOURCE
+                #include <stdlib.h>
+                #include <unistd.h>
+                int main ()
+                {
+                #if defined(_SC_KERNEL_BITS)
+                    long bits = sysconf(_SC_KERNEL_BITS);
+                #endif
+                    long cpu  = sysconf (_SC_CPU_VERSION);
+                    switch (cpu)
+                        {
+                        case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+                        case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+                        case CPU_PA_RISC2_0:
+                #if defined(_SC_KERNEL_BITS)
+                            switch (bits)
+                                {
+                                case 64: puts ("hppa2.0w"); break;
+                                case 32: puts ("hppa2.0n"); break;
+                                default: puts ("hppa2.0"); break;
+                                } break;
+                #else  /* !defined(_SC_KERNEL_BITS) */
+                            puts ("hppa2.0"); break;
+                #endif
+                        default: puts ("hppa1.0"); break;
+                        }
+                    exit (0);
+                }
 EOF
                     (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 …
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
         echo c1-convex-bsd
         exit ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
         if getsysinfo -f scalar_acc
 …
         else echo c2-convex-bsd
         fi
         exit ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
         echo c34-convex-bsd
         exit ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
         echo c38-convex-bsd
         exit ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
         echo c4-convex-bsd
         exit ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
         echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 …
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit ;;
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
 :UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 …
         exit ;;
     *:FreeBSD:*:*)
+        case ${UNAME_MACHINE} in
+            pc98)
+                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+        case ${UNAME_PROCESSOR} in
             amd64)
                 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
             *)
                 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+                echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
         esac
         exit ;;
 …
         echo ${UNAME_MACHINE}-pc-mingw32
         exit ;;
+    i*:MSYS*:*)
+        echo ${UNAME_MACHINE}-pc-msys
+        exit ;;
     i*:windows32*:*)
         # uname -m includes "-pc" on this system.
         echo ${UNAME_MACHINE}-mingw32
+        # uname -m includes "-pc" on this system.
+        echo ${UNAME_MACHINE}-mingw32
         exit ;;
     i*:PW*:*)
 …
         exit ;;
     *:Interix*:*)
         case ${UNAME_MACHINE} in
+        case ${UNAME_MACHINE} in
             x86)
                 echo i586-pc-interix${UNAME_RELEASE}
 …
           EV67)  UNAME_MACHINE=alphaev67 ;;
           EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
+        esac
         objdump --private-headers /bin/sh | grep -q ld.so.1
         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 …
             echo ${UNAME_MACHINE}-unknown-linux-gnu
         else
+            echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+                | grep -q __ARM_PCS_VFP
+            then
+                echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+            else
+                echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+            fi
         fi
         exit ;;
 …
         exit ;;
     cris:Linux:*:*)
         echo cris-axis-linux-gnu
+        echo ${UNAME_MACHINE}-axis-linux-gnu
         exit ;;
     crisv32:Linux:*:*)
         echo crisv32-axis-linux-gnu
+        echo ${UNAME_MACHINE}-axis-linux-gnu
         exit ;;
     frv:Linux:*:*)
+        echo frv-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    hexagon:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
     i*86:Linux:*:*)
 …
         ;;
     or32:Linux:*:*)
         echo or32-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
     padre:Linux:*:*)
 …
         exit ;;
     sh64*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
     sh*:Linux:*:*)
 …
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
+    tile*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
     vax:Linux:*:*)
         echo ${UNAME_MACHINE}-dec-linux-gnu
         exit ;;
     x86_64:Linux:*:*)
         echo x86_64-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
     xtensa*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
     i*86:DYNIX/ptx:4*:*)
 …
         exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
         # I am not positive that other SVR4 systems won't match this,
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
         # I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
         exit ;;
 …
         exit ;;
     i*86:*:5:[678]*)
         # UnixWare 7.x, OpenUNIX and OpenServer 6.
+        # UnixWare 7.x, OpenUNIX and OpenServer 6.
         case `/bin/uname -X | grep "^Machine"` in
             *486*)           UNAME_MACHINE=i486 ;;
 …
     pc:*:*:*)
         # Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i586.
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i586.
         # Note: whatever this is, it MUST be the same as what config.sub
         # prints for the "djgpp" host, or else GDB configury will decide that
         # this is a cross-build.
         echo i586-pc-msdosdjgpp
         exit ;;
+        exit ;;
     Intel:Mach:3*:*)
         echo i386-pc-mach3
 …
           && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 [34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
         OS_REL='.3'
 …
         fi
         exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
         exit ;;
+    PENTIUM:*:4.0*:*)   # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                        # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
         # From Gerald Hewes <hewes@openmarket.com>.
 …
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
         if [ -d /usr/nec ]; then
                 echo mips-nec-sysv${UNAME_RELEASE}
+                echo mips-nec-sysv${UNAME_RELEASE}
         else
                 echo mips-unknown-sysv${UNAME_RELEASE}
         fi
         exit ;;
+                echo mips-unknown-sysv${UNAME_RELEASE}
+        fi
+        exit ;;
     BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
         echo powerpc-be-beos
 …
         echo i386-pc-qnx
         exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+        echo neo-tandem-nsk${UNAME_RELEASE}
+        exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
         echo nse-tandem-nsk${UNAME_RELEASE}
 …
         exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux${UNAME_RELEASE}
         exit ;;
     *:DragonFly:*:*)
 …
         exit ;;
     *:*VMS:*:*)
         UNAME_MACHINE=`(uname -p) 2>/dev/null`
+        UNAME_MACHINE=`(uname -p) 2>/dev/null`
         case "${UNAME_MACHINE}" in
             A*) echo alpha-dec-vms ; exit ;;
 …
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
           "4"
+        "4"
 #else
           ""
 #endif
          ); exit (0);
+        ""
+#endif
+        ); exit (0);
 #endif
 #endif

trunk/icedtea-web/config.sub

-              r348
+              r418
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 timestamp='2009-11-20'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
+timestamp='2012-01-01'
 # This file is (in principle) common to ALL GNU software.
 …
 GNU config.sub ($timestamp)
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 …
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
 …
                 basic_machine=$1
                 ;;
         -bluegene*)
                 os=-cnk
+        -bluegene*)
+                os=-cnk
                 ;;
         -sim | -cisco | -oki | -wec | -winbond)
 …
                 basic_machine=$1
                 ;;
         -chorusrdb)
                 os=-chorusrdb
+        -chorusrdb)
+                os=-chorusrdb
                 basic_machine=$1
                 ;;
+                ;;
         -hiux*)
                 os=-hiuxwe2
 …
         | am33_2.0 \
         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
         | bfin \
         | c4x | clipper \
         | d10v | d30v | dlx | dsp16xx \
+        | epiphany \
         | fido | fr30 | frv \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+        | hexagon \
         | i370 | i860 | i960 | ia64 \
         | ip2k | iq2000 \
+        | le32 | le64 \
         | lm32 \
         | m32c | m32r | m32rle | m68000 | m68k | m88k \
 …
         | mt \
         | msp430 \
+        | nds32 | nds32le | nds32be \
         | nios | nios2 \
         | ns16k | ns32k \
+        | open8 \
         | or32 \
         | pdp10 | pdp11 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+        | powerpc | powerpc64 | powerpc64le | powerpcle \
         | pyramid \
         | rx \
+        | rl78 | rx \
         | score \
         | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 …
         | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
         | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
         | spu | strongarm \
         | tahoe | thumb | tic4x | tic80 | tron \
+        | spu \
+        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
         | ubicom32 \
         | v850 | v850e \
+        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
         | we32k \
         | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+        | x86 | xc16x | xstormy16 | xtensa \
         | z8k | z80)
                 basic_machine=$basic_machine-unknown
                 ;;
+        c54x)
+                basic_machine=tic54x-unknown
+                ;;
+        c55x)
+                basic_machine=tic55x-unknown
+                ;;
+        c6x)
+                basic_machine=tic6x-unknown
+                ;;
         m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-                # Motorola 68HC11/12.
                 basic_machine=$basic_machine-unknown
                 os=-none
 …
         ms1)
                 basic_machine=mt-unknown
+                ;;
+        strongarm | thumb | xscale)
+                basic_machine=arm-unknown
+                ;;
+        xscaleeb)
+                basic_machine=armeb-unknown
+                ;;
+        xscaleel)
+                basic_machine=armel-unknown
                 ;;
 …
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
         | avr-* | avr32-* \
+        | be32-* | be64-* \
         | bfin-* | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* \
         | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
 …
         | h8300-* | h8500-* \
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+        | hexagon-* \
         | i*86-* | i860-* | i960-* | ia64-* \
         | ip2k-* | iq2000-* \
+        | le32-* | le64-* \
         | lm32-* \
         | m32c-* | m32r-* | m32rle-* \
 …
         | mt-* \
         | msp430-* \
+        | nds32-* | nds32le-* | nds32be-* \
         | nios-* | nios2-* \
         | none-* | np1-* | ns16k-* | ns32k-* \
+        | open8-* \
         | orion-* \
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
         | pyramid-* \
         | romp-* | rs6000-* | rx-* \
+        | rl78-* | romp-* | rs6000-* | rx-* \
         | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
         | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+        | tahoe-* | thumb-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+        | tahoe-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tile*-* \
         | tron-* \
         | ubicom32-* \
+        | v850-* | v850e-* | vax-* \
+        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+        | vax-* \
         | we32k-* \
         | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* \
         | xstormy16-* | xtensa*-* \
         | ymp-* \
 …
                 os=-udi
                 ;;
         abacus)
+        abacus)
                 basic_machine=abacus-unknown
                 ;;
 …
                 os=-cnk
                 ;;
+        c54x-*)
+                basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c55x-*)
+                basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
+        c6x-*)
+                basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         c90)
                 basic_machine=c90-cray
                 os=-unicos
                 ;;
         cegcc)
+        cegcc)
                 basic_machine=arm-unknown
                 os=-cegcc
 …
                 os=-unicosmp
                 ;;
         cr16)
+        cr16 | cr16-*)
                 basic_machine=cr16-unknown
                 os=-elf
 …
                 basic_machine=i370-ibm
                 ;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
         i*86v32)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 …
                 os=-sysv
                 ;;
         microblaze)
+        microblaze)
                 basic_machine=microblaze-xilinx
                 ;;
 …
                 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
+        msys)
+                basic_machine=i386-pc
+                os=-msys
+                ;;
         mvs)
                 basic_machine=i370-ibm
                 os=-mvs
+                ;;
+        nacl)
+                basic_machine=le32-unknown
+                os=-nacl
                 ;;
         ncr3000)
 …
                 basic_machine=np1-gould
                 ;;
+        neo-tandem)
+                basic_machine=neo-tandem
+                ;;
+        nse-tandem)
+                basic_machine=nse-tandem
+                ;;
         nsr-tandem)
                 basic_machine=nsr-tandem
 …
         power)  basic_machine=power-ibm
                 ;;
+        ppc)    basic_machine=powerpc-unknown
+                ;;
+        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+        ppc | ppcbe)    basic_machine=powerpc-unknown
+                ;;
+        ppc-* | ppcbe-*)
+                basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                 ;;
         ppcle | powerpclittle | ppc-le | powerpc-little)
 …
                 os=-sysv4
                 ;;
+        strongarm-* | thumb-*)
+                basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         sun2)
                 basic_machine=m68000-sun
 …
                 os=-unicos
                 ;;
-        tic54x | c54x*)
-                basic_machine=tic54x-unknown
-                os=-coff
-                ;;
-        tic55x | c55x*)
-                basic_machine=tic55x-unknown
-                os=-coff
-                ;;
-        tic6x | c6x*)
-                basic_machine=tic6x-unknown
-                os=-coff
-                ;;
         tile*)
                 basic_machine=tile-unknown
+                basic_machine=$basic_machine-unknown
                 os=-linux-gnu
                 ;;
 …
         xps | xps100)
                 basic_machine=xps100-honeywell
+                ;;
+        xscale-* | xscalee[bl]-*)
+                basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
                 ;;
         ymp)
 …
 then
 case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
         # -solaris* is a basic system type, with this one exception.
         -auroraux)
                 os=-auroraux
+        -auroraux)
+                os=-auroraux
                 ;;
         -solaris1 | -solaris1.*)
 …
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
               | -chorusos* | -chorusrdb* | -cegcc* \
+              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+              | -mingw32* | -linux-gnu* | -linux-android* \
+              | -linux-newlib* | -linux-uclibc* \
               | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 …
                 os=-openedition
                 ;;
         -os400*)
+        -os400*)
                 os=-os400
                 ;;
 …
                 os=-sysv4
                 ;;
         -tpf*)
+        -tpf*)
                 os=-tpf
                 ;;
 …
         -dicos*)
                 os=-dicos
+                ;;
+        -nacl*)
                 ;;
         -none)
 …
 case $basic_machine in
         score-*)
+        score-*)
                 os=-elf
                 ;;
         spu-*)
+        spu-*)
                 os=-elf
                 ;;
 …
                 os=-aout
                 ;;
+        c4x-* | tic4x-*)
+                os=-coff
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
+        tic54x-*)
+                os=-coff
+                ;;
+        tic55x-*)
+                os=-coff
+                ;;
+        tic6x-*)
+                os=-coff
                 ;;
         # This must come before the *-dec entry.
 …
         m68000-sun)
                 os=-sunos3
-                # This also exists in the configure program, but was not the
-                # default.
-                # os=-sunos4
                 ;;
         m68*-cisco)
                 os=-aout
                 ;;
         mep-*)
+        mep-*)
                 os=-elf
                 ;;
 …
                 os=-aix
                 ;;
         *-knuth)
+        *-knuth)
                 os=-mmixware
                 ;;

trunk/icedtea-web/configure

-              r348
+              r418
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for icedtea-web 1.1.2.
+# Generated by GNU Autoconf 2.68 for icedtea-web 1.3.
+#
 # Report bugs to <distro-pkg-dev@openjdk.java.net>.
 …
 PACKAGE_NAME='icedtea-web'
 PACKAGE_TARNAME='icedtea-web'
 PACKAGE_VERSION='1.1.2'
 PACKAGE_STRING='icedtea-web 1.1.2'
+PACKAGE_VERSION='1.3'
+PACKAGE_STRING='icedtea-web 1.3'
 PACKAGE_BUGREPORT='distro-pkg-dev@openjdk.java.net'
 PACKAGE_URL='http://icedtea.classpath.org/wiki/IcedTea-Web'
 …
 LTLIBOBJS
 LIBOBJS
+EMMA_AVAILABLE
+EMMA_JAR
+WITH_EMMA_FALSE
+WITH_EMMA_TRUE
 JUNIT_AVAILABLE
 JUNIT_JAR
 …
 WITH_RHINO_FALSE
 WITH_RHINO_TRUE
+WITH_XSLTPROC_FALSE
+WITH_XSLTPROC_TRUE
+BROWSER_TESTS_MODIFICATION
+EPIPHANY
+MIDORI
+OPERA
+CHROMIUM
+CHROME
+FIREFOX
+XSLTPROC
+GLIB2_V_216_LIBS
+GLIB2_V_216_CFLAGS
+VERSION_DEFS
 JAVA
 SYSTEM_JRE_DIR
 …
 ICEDTEA_REVISION
 HG
+JARSIGNER
+KEYTOOL
 JAVADOC_SUPPORTS_J_OPTIONS_FALSE
 JAVADOC_SUPPORTS_J_OPTIONS_TRUE
 …
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 …
 with_ecj_jar
 with_javadoc
+with_keytool
+with_jarsigner
 with_pkgversion
 enable_plugin
+with_gtk
 with_jre_home
 with_java
+with_firefox
+with_chrome
+with_chromium
+with_opera
+with_midori
+with_epiphany
+with_browser_tests
 with_rhino
 with_junit
+with_emma
+'
       ac_precious_vars='build_alias
 …
 MOZILLA_LIBS
 X11_CFLAGS
+X11_LIBS'
+X11_LIBS
+GLIB2_V_216_CFLAGS
+GLIB2_V_216_LIBS'
 …
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
 \`configure' configures icedtea-web 1.1.2 to adapt to many kinds of systems.
+\`configure' configures icedtea-web 1.3 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
 …
 if test -n "$ac_init_help"; then
   case $ac_init_help in
      short | recursive ) echo "Configuration of icedtea-web 1.1.2:";;
+     short | recursive ) echo "Configuration of icedtea-web 1.3:";;
    esac
   cat <<\_ACEOF
 …
   --with-javadoc          specify location of Java documentation tool
                           (javadoc)
+  --with-keytool          specify location of keytool for signed part of
+                          run-netx-dist
+  --with-jarsigner        specify location of jarsigner for signed part od
+                          run-netx-dist
   --with-pkgversion=PKG   Use PKG in the version string in addition to
                           "IcedTea"
+  --with-gtk=2|3|default  the GTK+ version to use (default: 3)
   --with-jre-home         jre home directory (default is the JRE under the
                           JDK)
   --with-java             specify location of the 1.5 java vm
+  --with-firefox          specify the location of firefox
+  --with-chrome           specify the location of chrome
+  --with-chromium         specify the location of chromium
+  --with-opera            specify the location of opera
+  --with-midori           specify the location of midori
+  --with-epiphany         specify the location of epiphany
+  --with-browser-tests    yes - as defined (default), no - all browser tests
+                          will be skipped, one - all "mutiple browsers" test
+                          will behave as "one" test, all - all browser tests
+                          will be run for all set browsers
   --with-rhino            specify location of the rhino jar
   --with-junit            specify location of the junit jar
+  --with-emma             specify location of the emma jar
 Some influential environment variables:
 …
   X11_CFLAGS  C compiler flags for X11, overriding pkg-config
   X11_LIBS    linker flags for X11, overriding pkg-config
+  GLIB2_V_216_CFLAGS
+              C compiler flags for GLIB2_V_216, overriding pkg-config
+  GLIB2_V_216_LIBS
+              linker flags for GLIB2_V_216, overriding pkg-config
 Use these variables to override the choices made by `configure' or to help
 …
 if $ac_init_version; then
   cat <<\_ACEOF
 icedtea-web configure 1.1.2
+icedtea-web configure 1.3
 generated by GNU Autoconf 2.68
 …
 running configure, to aid debugging if configure makes a mistake.
 It was created by icedtea-web $as_me 1.1.2, which was
+It was created by icedtea-web $as_me 1.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 …
 # Define the identity of the package.
  PACKAGE='icedtea-web'
  VERSION='1.1.2'
+ VERSION='1.3'
 …
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.
 AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 …
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
 …
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
 …
       fi
       ;;
     msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
 …
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
 …
       fi
       ;;
     msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
 …
   mkdir pkg
   cat << \EOF > $CLASS
 /* [#]line 5834 "configure" */
+/* [#]line 5890 "configure" */
 package pkg;
 …
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keytool" >&5
+$as_echo_n "checking for keytool... " >&6; }
+# Check whether --with-keytool was given.
+if test "${with_keytool+set}" = set; then :
+  withval=$with_keytool;
+    if test "${withval}" = "yes" ; then
+      KEYTOOL=${SYSTEM_JDK_DIR}/bin/keytool
+    else
+      KEYTOOL="${withval}"
+    fi
+else
+    KEYTOOL=${SYSTEM_JDK_DIR}/bin/keytool
+fi
+  if ! test -f "${KEYTOOL}"; then
+    # Extract the first word of "keytool", so it can be a program name with args.
+set dummy keytool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_KEYTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $KEYTOOL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_KEYTOOL="$KEYTOOL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_KEYTOOL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+KEYTOOL=$ac_cv_path_KEYTOOL
+if test -n "$KEYTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYTOOL" >&5
+$as_echo "$KEYTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  fi
+  if ! test -f "${KEYTOOL}"; then
+    KEYTOOL=""
+  fi
+  if test -z "${KEYTOOL}" ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"keytool not found so signed part of run-netx-dist will fail\"" >&5
+$as_echo "$as_me: WARNING: \"keytool not found so signed part of run-netx-dist will fail\"" >&2;}
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KEYTOOL}" >&5
+$as_echo "${KEYTOOL}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jarsigner" >&5
+$as_echo_n "checking for jarsigner... " >&6; }
+# Check whether --with-jarsigner was given.
+if test "${with_jarsigner+set}" = set; then :
+  withval=$with_jarsigner;
+    if test "${withval}" = "yes" ; then
+      JARSIGNER=${SYSTEM_JDK_DIR}/bin/jarsigner
+    else
+      JARSIGNER="${withval}"
+    fi
+else
+    JARSIGNER=${SYSTEM_JDK_DIR}/bin/jarsigner
+fi
+  if ! test -f "${JARSIGNER}"; then
+    # Extract the first word of "jarsigner", so it can be a program name with args.
+set dummy jarsigner; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_JARSIGNER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $JARSIGNER in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_JARSIGNER="$JARSIGNER" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_JARSIGNER="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  test -z "$ac_cv_path_JARSIGNER" && ac_cv_path_JARSIGNER=""""
+  ;;
+esac
+fi
+JARSIGNER=$ac_cv_path_JARSIGNER
+if test -n "$JARSIGNER"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JARSIGNER" >&5
+$as_echo "$JARSIGNER" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  fi
+  if ! test -f "${JARSIGNER}"; then
+    JARSIGNER=""
+  fi
+  if test -z "${JARSIGNER}"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"jarsigner not found so signed part of run-netx-dist will fail\"" >&5
+$as_echo "$as_me: WARNING: \"jarsigner not found so signed part of run-netx-dist will fail\"" >&2;}
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${JARSIGNER}" >&5
+$as_echo "${JARSIGNER}" >&6; }
 ac_config_files="$ac_config_files javac"
 …
 if test "x${enable_plugin}" = "xyes" ; then
+# Check whether --with-gtk was given.
+if test "${with_gtk+set}" = set; then :
+  withval=$with_gtk; case "$with_gtk" in
+|3|default) ;;
+       *) as_fn_error $? "invalid GTK version specified" "$LINENO" 5 ;;
+     esac
+else
+  with_gtk=default
+fi
+  case "$with_gtk" in
+    default)
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0" 2>&1`
+        else
+                GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$GTK_PKG_ERRORS" >&5
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
 …
         echo "$GTK_PKG_ERRORS" >&5
+        as_fn_error $? "Package requirements (gtk+-2.0) were not met:
+$GTK_PKG_ERRORS
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+        as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5
 elif test $pkg_failed = untried; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+Alternatively, you may set the environment variables GTK_CFLAGS
+and GTK_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+        as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5
 else
 …
 $as_echo "yes" >&6; }
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2 version" >&5
+$as_echo_n "checking for GTK2 version... " >&6; }
+  GTK_VER=`$PKG_CONFIG --modversion gtk+-2.0`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VER" >&5
+$as_echo "$GTK_VER" >&6; }
+fi
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1`
+        else
+                GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$GTK_PKG_ERRORS" >&5
+        as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5
+else
+        GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+        GTK_LIBS=$pkg_cv_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2 version" >&5
+$as_echo_n "checking for GTK2 version... " >&6; }
+  GTK_VER=`$PKG_CONFIG --modversion gtk+-2.0`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VER" >&5
+$as_echo "$GTK_VER" >&6; }
+fi
+else
+        GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+        GTK_LIBS=$pkg_cv_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3 version" >&5
+$as_echo_n "checking for GTK3 version... " >&6; }
+  GTK_VER=`$PKG_CONFIG --modversion gtk+-3.0`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VER" >&5
+$as_echo "$GTK_VER" >&6; }
+fi
+      ;;
+    *)
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$with_gtk.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-$with_gtk.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-$with_gtk.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$with_gtk.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-$with_gtk.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-$with_gtk.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-$with_gtk.0" 2>&1`
+        else
+                GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-$with_gtk.0" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$GTK_PKG_ERRORS" >&5
+        as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        as_fn_error $? "GTK $with_gtk not found" "$LINENO" 5
+else
+        GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+        GTK_LIBS=$pkg_cv_GTK_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK$with_gtk version" >&5
+$as_echo_n "checking for GTK$with_gtk version... " >&6; }
+  GTK_VER=`$PKG_CONFIG --modversion gtk+-$with_gtk.0`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VER" >&5
+$as_echo "$GTK_VER" >&6; }
+fi
+      ;;
+  esac
 pkg_failed=no
 …
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"npapi-sdk\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "npapi-sdk") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "npapi-sdk" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$MOZILLA_LIBS"; then
+    pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"npapi-sdk\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "npapi-sdk") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "npapi-sdk" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "npapi-sdk" 2>&1`
+        else
+                MOZILLA_PKG_ERRORS=`$PKG_CONFIG --print-errors "npapi-sdk" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$MOZILLA_PKG_ERRORS" >&5
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOZILLA" >&5
+$as_echo_n "checking for MOZILLA... " >&6; }
+if test -n "$MOZILLA_CFLAGS"; then
+    pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\""; } >&5
   ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
 …
 fi
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOZILLA" >&5
+$as_echo_n "checking for MOZILLA... " >&6; }
+if test -n "$MOZILLA_CFLAGS"; then
+    pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$MOZILLA_LIBS"; then
+    pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mozilla-plugin" 2>&1`
+        else
+                MOZILLA_PKG_ERRORS=`$PKG_CONFIG --print-errors "mozilla-plugin" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$MOZILLA_PKG_ERRORS" >&5
+        as_fn_error $? "Package requirements (mozilla-plugin) were not met:
+$MOZILLA_PKG_ERRORS
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+Alternatively, you may set the environment variables MOZILLA_CFLAGS
+and MOZILLA_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+Alternatively, you may set the environment variables MOZILLA_CFLAGS
+and MOZILLA_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+        MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
+        MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+else
+        MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
+        MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xulrunner version" >&5
+$as_echo_n "checking for xulrunner version... " >&6; }
+if ${xulrunner_cv_collapsed_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # XXX: use NPAPI versions instead
+      xulrunner_cv_collapsed_version=20000000
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xulrunner_cv_collapsed_version" >&5
+$as_echo "$xulrunner_cv_collapsed_version" >&6; }
+fi
 …
     then
       xulrunner_cv_collapsed_version=`pkg-config --modversion libxul | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'`
+    elif pkg-config --modversion mozilla-plugin >/dev/null 2>&1
+    then
+      xulrunner_cv_collapsed_version=`pkg-config --modversion mozilla-plugin | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'`
     else
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 …
 $as_echo "${JAVA}" >&6; }
+  JAVA_VERSION=`$JAVA -version 2>&1 | sed -n '1s/[^"]*"\(.*\)"$/\1/p'`
+  case "${JAVA_VERSION}" in
+.7*) VERSION_DEFS='-DHAVE_JAVA7';;
+  esac
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 6804 "configure" */
+/* [#]line 7424 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 6854 "configure" */
+/* [#]line 7474 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 6904 "configure" */
+/* [#]line 7524 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 6954 "configure" */
+/* [#]line 7574 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7004 "configure" */
+/* [#]line 7624 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7054 "configure" */
+/* [#]line 7674 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7104 "configure" */
+/* [#]line 7724 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7154 "configure" */
+/* [#]line 7774 "configure" */
 package sun.applet;
 …
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if sun.misc.BASE64Encoder is available" >&5
 $as_echo_n "checking if sun.misc.BASE64Encoder is available... " >&6; }
 if ${it_cv_SUN_MISC_BASE64ENCODER+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sun.misc.HexDumpEncoder is available" >&5
+$as_echo_n "checking if sun.misc.HexDumpEncoder is available... " >&6; }
+if ${it_cv_SUN_MISC_HEXDUMPENCODER+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 …
 cd tmp.$$
 cat << \EOF > $CLASS
+/* [#]line 7204 "configure" */
+package sun.applet;
+import sun.misc.BASE64Encoder;
+public class Test
+{
+  public static void main(String[] args)
+    throws Exception
+  {
+    System.out.println(Class.forName("sun.misc.BASE64Encoder"));
+  }
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&5 2>&1; then
+  if $JAVA -classpath . $BYTECODE >&5 2>&1; then
+      it_cv_SUN_MISC_BASE64ENCODER=yes;
+  else
+      it_cv_SUN_MISC_BASE64ENCODER=no;
+  fi
+else
+  it_cv_SUN_MISC_BASE64ENCODER=no;
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $it_cv_SUN_MISC_BASE64ENCODER" >&5
+$as_echo "$it_cv_SUN_MISC_BASE64ENCODER" >&6; }
+rm -f $CLASS *.class
+cd ..
+# should be rmdir but has to be rm -rf due to sun.applet usage
+rm -rf tmp.$$
+if test x"${it_cv_SUN_MISC_BASE64ENCODER}" = "xno"; then
+   as_fn_error $? "sun.misc.BASE64Encoder not found." "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sun.misc.HexDumpEncoder is available" >&5
+$as_echo_n "checking if sun.misc.HexDumpEncoder is available... " >&6; }
+if ${it_cv_SUN_MISC_HEXDUMPENCODER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+CLASS=sun/applet/Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir -p tmp.$$/$(dirname $CLASS)
+cd tmp.$$
+cat << \EOF > $CLASS
+/* [#]line 7254 "configure" */
+/* [#]line 7824 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7304 "configure" */
+/* [#]line 7874 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7354 "configure" */
+/* [#]line 7924 "configure" */
 package sun.applet;
 …
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if sun.awt.X11.XEmbeddedFrame is available" >&5
 $as_echo_n "checking if sun.awt.X11.XEmbeddedFrame is available... " >&6; }
 if ${it_cv_SUN_AWT_X11_XEMBEDDEDFRAME+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sun.net.www.protocol.jar.URLJarFile is available" >&5
+$as_echo_n "checking if sun.net.www.protocol.jar.URLJarFile is available... " >&6; }
+if ${it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 …
 cd tmp.$$
 cat << \EOF > $CLASS
+/* [#]line 7404 "configure" */
+/* [#]line 7974 "configure" */
+package sun.applet;
+import sun.net.www.protocol.jar.URLJarFile;
+public class Test
+{
+  public static void main(String[] args)
+    throws Exception
+  {
+    System.out.println(Class.forName("sun.net.www.protocol.jar.URLJarFile"));
+  }
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&5 2>&1; then
+  if $JAVA -classpath . $BYTECODE >&5 2>&1; then
+      it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE=yes;
+  else
+      it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE=no;
+  fi
+else
+  it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE=no;
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE" >&5
+$as_echo "$it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE" >&6; }
+rm -f $CLASS *.class
+cd ..
+# should be rmdir but has to be rm -rf due to sun.applet usage
+rm -rf tmp.$$
+if test x"${it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE}" = "xno"; then
+   as_fn_error $? "sun.net.www.protocol.jar.URLJarFile not found." "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sun.net.www.protocol.jar.URLJarFileCallBack is available" >&5
+$as_echo_n "checking if sun.net.www.protocol.jar.URLJarFileCallBack is available... " >&6; }
+if ${it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+CLASS=sun/applet/Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir -p tmp.$$/$(dirname $CLASS)
+cd tmp.$$
+cat << \EOF > $CLASS
+/* [#]line 8024 "configure" */
+package sun.applet;
+import sun.net.www.protocol.jar.URLJarFileCallBack;
+public class Test
+{
+  public static void main(String[] args)
+    throws Exception
+  {
+    System.out.println(Class.forName("sun.net.www.protocol.jar.URLJarFileCallBack"));
+  }
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS -nowarn $CLASS >&5 2>&1; then
+  if $JAVA -classpath . $BYTECODE >&5 2>&1; then
+      it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK=yes;
+  else
+      it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK=no;
+  fi
+else
+  it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK=no;
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK" >&5
+$as_echo "$it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK" >&6; }
+rm -f $CLASS *.class
+cd ..
+# should be rmdir but has to be rm -rf due to sun.applet usage
+rm -rf tmp.$$
+if test x"${it_cv_SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK}" = "xno"; then
+   as_fn_error $? "sun.net.www.protocol.jar.URLJarFileCallBack not found." "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sun.awt.X11.XEmbeddedFrame is available" >&5
+$as_echo_n "checking if sun.awt.X11.XEmbeddedFrame is available... " >&6; }
+if ${it_cv_SUN_AWT_X11_XEMBEDDEDFRAME+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+CLASS=sun/applet/Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir -p tmp.$$/$(dirname $CLASS)
+cd tmp.$$
+cat << \EOF > $CLASS
+/* [#]line 8074 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7454 "configure" */
+/* [#]line 8124 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7504 "configure" */
+/* [#]line 8174 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7554 "configure" */
+/* [#]line 8224 "configure" */
 package sun.applet;
 …
 cd tmp.$$
 cat << \EOF > $CLASS
 /* [#]line 7604 "configure" */
+/* [#]line 8274 "configure" */
 import java.lang.reflect.Modifier;
 …
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB2_V_216" >&5
+$as_echo_n "checking for GLIB2_V_216... " >&6; }
+if test -n "$GLIB2_V_216_CFLAGS"; then
+    pkg_cv_GLIB2_V_216_CFLAGS="$GLIB2_V_216_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB2_V_216_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLIB2_V_216_LIBS"; then
+    pkg_cv_GLIB2_V_216_LIBS="$GLIB2_V_216_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB2_V_216_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test $pkg_failed = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+                GLIB2_V_216_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.16" 2>&1`
+        else
+                GLIB2_V_216_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.16" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+        echo "$GLIB2_V_216_PKG_ERRORS" >&5
+        $as_echo "#define LEGACY_GLIB 1" >>confdefs.h
+elif test $pkg_failed = untried; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        $as_echo "#define LEGACY_GLIB 1" >>confdefs.h
+else
+        GLIB2_V_216_CFLAGS=$pkg_cv_GLIB2_V_216_CFLAGS
+        GLIB2_V_216_LIBS=$pkg_cv_GLIB2_V_216_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for legacy xulrunner api" >&5
+$as_echo_n "checking for legacy xulrunner api... " >&6; }
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+  CXXFLAGS_BACKUP=$CXXFLAGS
+  CXXFLAGS=$CXXFLAGS" "$MOZILLA_CFLAGS
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+    #include <npfunctions.h>
+    const  char* NP_GetMIMEDescription ()
+    {return (char*) "yap!";}
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    $as_echo "#define LEGACY_XULRUNNERAPI 1" >>confdefs.h
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CXXFLAGS=$CXXFLAGS_BACKUP
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+#
 # Find optional depedencies
+#
+for ac_prog in xsltproc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_XSLTPROC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$XSLTPROC"; then
+  ac_cv_prog_XSLTPROC="$XSLTPROC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_XSLTPROC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+fi
+fi
+XSLTPROC=$ac_cv_prog_XSLTPROC
+if test -n "$XSLTPROC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  test -n "$XSLTPROC" && break
+done
+# browser to be linked/tested
+# Example: IT_FIND_BROWSER([browser-name],[variable-to-store-path],[default-run-command-if-different-from-the-browser-name])
+# Check whether --with-firefox was given.
+if test "${with_firefox+set}" = set; then :
+  withval=$with_firefox;
+   if test "${withval}" = "no" || test "${withval}" = "yes" || test "${withval}" = "" ; then
+    FIREFOX=""
+   elif test -f "${withval}" ; then
+    FIREFOX="${withval}"
+   else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for firefox" >&5
+$as_echo_n "checking for firefox... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "invalid location specified to firefox: ${withval}
+See \`config.log' for more details" "$LINENO" 5; }
+   fi
+else
+   withval="yes"
+fi
+  if test -f "${FIREFOX}"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for firefox" >&5
+$as_echo_n "checking for firefox... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FIREFOX}" >&5
+$as_echo "${FIREFOX}" >&6; }
+  elif test "${withval}" != "no"; then
+   if test 2 -gt 2; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}", so it can be a program name with args.
+set dummy ${ac_tool_prefix}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FIREFOX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $FIREFOX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FIREFOX="$FIREFOX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_FIREFOX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+FIREFOX=$ac_cv_path_FIREFOX
+if test -n "$FIREFOX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIREFOX" >&5
+$as_echo "$FIREFOX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_FIREFOX"; then
+  ac_pt_FIREFOX=$FIREFOX
+  # Extract the first word of "", so it can be a program name with args.
+set dummy ; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_FIREFOX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_FIREFOX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_FIREFOX="$ac_pt_FIREFOX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_FIREFOX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_FIREFOX=$ac_cv_path_ac_pt_FIREFOX
+if test -n "$ac_pt_FIREFOX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_FIREFOX" >&5
+$as_echo "$ac_pt_FIREFOX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_FIREFOX" = x; then
+    FIREFOX=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FIREFOX=$ac_pt_FIREFOX
+  fi
+else
+  FIREFOX="$ac_cv_path_FIREFOX"
+fi
+   else
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}firefox", so it can be a program name with args.
+set dummy ${ac_tool_prefix}firefox; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FIREFOX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $FIREFOX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FIREFOX="$FIREFOX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_FIREFOX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+FIREFOX=$ac_cv_path_FIREFOX
+if test -n "$FIREFOX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIREFOX" >&5
+$as_echo "$FIREFOX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_FIREFOX"; then
+  ac_pt_FIREFOX=$FIREFOX
+  # Extract the first word of "firefox", so it can be a program name with args.
+set dummy firefox; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_FIREFOX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_FIREFOX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_FIREFOX="$ac_pt_FIREFOX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_FIREFOX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_FIREFOX=$ac_cv_path_ac_pt_FIREFOX
+if test -n "$ac_pt_FIREFOX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_FIREFOX" >&5
+$as_echo "$ac_pt_FIREFOX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_FIREFOX" = x; then
+    FIREFOX=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    FIREFOX=$ac_pt_FIREFOX
+  fi
+else
+  FIREFOX="$ac_cv_path_FIREFOX"
+fi
+   fi
+  else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for firefox" >&5
+$as_echo_n "checking for firefox... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+# Check whether --with-chrome was given.
+if test "${with_chrome+set}" = set; then :
+  withval=$with_chrome;
+   if test "${withval}" = "no" || test "${withval}" = "yes" || test "${withval}" = "" ; then
+    CHROME=""
+   elif test -f "${withval}" ; then
+    CHROME="${withval}"
+   else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chrome" >&5
+$as_echo_n "checking for chrome... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "invalid location specified to chrome: ${withval}
+See \`config.log' for more details" "$LINENO" 5; }
+   fi
+else
+   withval="yes"
+fi
+  if test -f "${CHROME}"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chrome" >&5
+$as_echo_n "checking for chrome... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CHROME}" >&5
+$as_echo "${CHROME}" >&6; }
+  elif test "${withval}" != "no"; then
+   if test 3 -gt 2; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}google-chrome", so it can be a program name with args.
+set dummy ${ac_tool_prefix}google-chrome; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CHROME+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CHROME in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CHROME="$CHROME" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_CHROME="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+CHROME=$ac_cv_path_CHROME
+if test -n "$CHROME"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHROME" >&5
+$as_echo "$CHROME" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_CHROME"; then
+  ac_pt_CHROME=$CHROME
+  # Extract the first word of "google-chrome", so it can be a program name with args.
+set dummy google-chrome; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_CHROME+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_CHROME in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CHROME="$ac_pt_CHROME" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_CHROME="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_CHROME=$ac_cv_path_ac_pt_CHROME
+if test -n "$ac_pt_CHROME"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CHROME" >&5
+$as_echo "$ac_pt_CHROME" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_CHROME" = x; then
+    CHROME=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CHROME=$ac_pt_CHROME
+  fi
+else
+  CHROME="$ac_cv_path_CHROME"
+fi
+   else
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}chrome", so it can be a program name with args.
+set dummy ${ac_tool_prefix}chrome; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CHROME+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CHROME in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CHROME="$CHROME" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_CHROME="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+CHROME=$ac_cv_path_CHROME
+if test -n "$CHROME"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHROME" >&5
+$as_echo "$CHROME" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_CHROME"; then
+  ac_pt_CHROME=$CHROME
+  # Extract the first word of "chrome", so it can be a program name with args.
+set dummy chrome; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_CHROME+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_CHROME in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CHROME="$ac_pt_CHROME" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_CHROME="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_CHROME=$ac_cv_path_ac_pt_CHROME
+if test -n "$ac_pt_CHROME"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CHROME" >&5
+$as_echo "$ac_pt_CHROME" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_CHROME" = x; then
+    CHROME=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CHROME=$ac_pt_CHROME
+  fi
+else
+  CHROME="$ac_cv_path_CHROME"
+fi
+   fi
+  else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chrome" >&5
+$as_echo_n "checking for chrome... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+# Check whether --with-chromium was given.
+if test "${with_chromium+set}" = set; then :
+  withval=$with_chromium;
+   if test "${withval}" = "no" || test "${withval}" = "yes" || test "${withval}" = "" ; then
+    CHROMIUM=""
+   elif test -f "${withval}" ; then
+    CHROMIUM="${withval}"
+   else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chromium" >&5
+$as_echo_n "checking for chromium... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "invalid location specified to chromium: ${withval}
+See \`config.log' for more details" "$LINENO" 5; }
+   fi
+else
+   withval="yes"
+fi
+  if test -f "${CHROMIUM}"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chromium" >&5
+$as_echo_n "checking for chromium... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CHROMIUM}" >&5
+$as_echo "${CHROMIUM}" >&6; }
+  elif test "${withval}" != "no"; then
+   if test 3 -gt 2; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}chromium-browser", so it can be a program name with args.
+set dummy ${ac_tool_prefix}chromium-browser; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CHROMIUM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CHROMIUM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CHROMIUM="$CHROMIUM" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_CHROMIUM="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+CHROMIUM=$ac_cv_path_CHROMIUM
+if test -n "$CHROMIUM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHROMIUM" >&5
+$as_echo "$CHROMIUM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_CHROMIUM"; then
+  ac_pt_CHROMIUM=$CHROMIUM
+  # Extract the first word of "chromium-browser", so it can be a program name with args.
+set dummy chromium-browser; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_CHROMIUM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_CHROMIUM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CHROMIUM="$ac_pt_CHROMIUM" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_CHROMIUM="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_CHROMIUM=$ac_cv_path_ac_pt_CHROMIUM
+if test -n "$ac_pt_CHROMIUM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CHROMIUM" >&5
+$as_echo "$ac_pt_CHROMIUM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_CHROMIUM" = x; then
+    CHROMIUM=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CHROMIUM=$ac_pt_CHROMIUM
+  fi
+else
+  CHROMIUM="$ac_cv_path_CHROMIUM"
+fi
+   else
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}chromium", so it can be a program name with args.
+set dummy ${ac_tool_prefix}chromium; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CHROMIUM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CHROMIUM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CHROMIUM="$CHROMIUM" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_CHROMIUM="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+CHROMIUM=$ac_cv_path_CHROMIUM
+if test -n "$CHROMIUM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHROMIUM" >&5
+$as_echo "$CHROMIUM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_CHROMIUM"; then
+  ac_pt_CHROMIUM=$CHROMIUM
+  # Extract the first word of "chromium", so it can be a program name with args.
+set dummy chromium; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_CHROMIUM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_CHROMIUM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CHROMIUM="$ac_pt_CHROMIUM" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_CHROMIUM="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_CHROMIUM=$ac_cv_path_ac_pt_CHROMIUM
+if test -n "$ac_pt_CHROMIUM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CHROMIUM" >&5
+$as_echo "$ac_pt_CHROMIUM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_CHROMIUM" = x; then
+    CHROMIUM=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CHROMIUM=$ac_pt_CHROMIUM
+  fi
+else
+  CHROMIUM="$ac_cv_path_CHROMIUM"
+fi
+   fi
+  else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chromium" >&5
+$as_echo_n "checking for chromium... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+# Check whether --with-opera was given.
+if test "${with_opera+set}" = set; then :
+  withval=$with_opera;
+   if test "${withval}" = "no" || test "${withval}" = "yes" || test "${withval}" = "" ; then
+    OPERA=""
+   elif test -f "${withval}" ; then
+    OPERA="${withval}"
+   else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opera" >&5
+$as_echo_n "checking for opera... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "invalid location specified to opera: ${withval}
+See \`config.log' for more details" "$LINENO" 5; }
+   fi
+else
+   withval="yes"
+fi
+  if test -f "${OPERA}"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opera" >&5
+$as_echo_n "checking for opera... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${OPERA}" >&5
+$as_echo "${OPERA}" >&6; }
+  elif test "${withval}" != "no"; then
+   if test 2 -gt 2; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}", so it can be a program name with args.
+set dummy ${ac_tool_prefix}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_OPERA+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $OPERA in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_OPERA="$OPERA" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_OPERA="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+OPERA=$ac_cv_path_OPERA
+if test -n "$OPERA"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPERA" >&5
+$as_echo "$OPERA" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_OPERA"; then
+  ac_pt_OPERA=$OPERA
+  # Extract the first word of "", so it can be a program name with args.
+set dummy ; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_OPERA+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_OPERA in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_OPERA="$ac_pt_OPERA" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_OPERA="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_OPERA=$ac_cv_path_ac_pt_OPERA
+if test -n "$ac_pt_OPERA"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_OPERA" >&5
+$as_echo "$ac_pt_OPERA" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_OPERA" = x; then
+    OPERA=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OPERA=$ac_pt_OPERA
+  fi
+else
+  OPERA="$ac_cv_path_OPERA"
+fi
+   else
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}opera", so it can be a program name with args.
+set dummy ${ac_tool_prefix}opera; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_OPERA+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $OPERA in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_OPERA="$OPERA" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_OPERA="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+OPERA=$ac_cv_path_OPERA
+if test -n "$OPERA"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPERA" >&5
+$as_echo "$OPERA" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_OPERA"; then
+  ac_pt_OPERA=$OPERA
+  # Extract the first word of "opera", so it can be a program name with args.
+set dummy opera; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_OPERA+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_OPERA in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_OPERA="$ac_pt_OPERA" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_OPERA="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_OPERA=$ac_cv_path_ac_pt_OPERA
+if test -n "$ac_pt_OPERA"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_OPERA" >&5
+$as_echo "$ac_pt_OPERA" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_OPERA" = x; then
+    OPERA=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OPERA=$ac_pt_OPERA
+  fi
+else
+  OPERA="$ac_cv_path_OPERA"
+fi
+   fi
+  else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opera" >&5
+$as_echo_n "checking for opera... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+# Check whether --with-midori was given.
+if test "${with_midori+set}" = set; then :
+  withval=$with_midori;
+   if test "${withval}" = "no" || test "${withval}" = "yes" || test "${withval}" = "" ; then
+    MIDORI=""
+   elif test -f "${withval}" ; then
+    MIDORI="${withval}"
+   else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for midori" >&5
+$as_echo_n "checking for midori... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "invalid location specified to midori: ${withval}
+See \`config.log' for more details" "$LINENO" 5; }
+   fi
+else
+   withval="yes"
+fi
+  if test -f "${MIDORI}"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for midori" >&5
+$as_echo_n "checking for midori... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${MIDORI}" >&5
+$as_echo "${MIDORI}" >&6; }
+  elif test "${withval}" != "no"; then
+   if test 2 -gt 2; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}", so it can be a program name with args.
+set dummy ${ac_tool_prefix}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MIDORI+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MIDORI in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MIDORI="$MIDORI" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MIDORI="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+MIDORI=$ac_cv_path_MIDORI
+if test -n "$MIDORI"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MIDORI" >&5
+$as_echo "$MIDORI" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_MIDORI"; then
+  ac_pt_MIDORI=$MIDORI
+  # Extract the first word of "", so it can be a program name with args.
+set dummy ; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_MIDORI+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_MIDORI in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_MIDORI="$ac_pt_MIDORI" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_MIDORI="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_MIDORI=$ac_cv_path_ac_pt_MIDORI
+if test -n "$ac_pt_MIDORI"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_MIDORI" >&5
+$as_echo "$ac_pt_MIDORI" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_MIDORI" = x; then
+    MIDORI=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MIDORI=$ac_pt_MIDORI
+  fi
+else
+  MIDORI="$ac_cv_path_MIDORI"
+fi
+   else
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}midori", so it can be a program name with args.
+set dummy ${ac_tool_prefix}midori; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MIDORI+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MIDORI in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MIDORI="$MIDORI" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MIDORI="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+MIDORI=$ac_cv_path_MIDORI
+if test -n "$MIDORI"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MIDORI" >&5
+$as_echo "$MIDORI" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_MIDORI"; then
+  ac_pt_MIDORI=$MIDORI
+  # Extract the first word of "midori", so it can be a program name with args.
+set dummy midori; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_MIDORI+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_MIDORI in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_MIDORI="$ac_pt_MIDORI" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_MIDORI="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_MIDORI=$ac_cv_path_ac_pt_MIDORI
+if test -n "$ac_pt_MIDORI"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_MIDORI" >&5
+$as_echo "$ac_pt_MIDORI" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_MIDORI" = x; then
+    MIDORI=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MIDORI=$ac_pt_MIDORI
+  fi
+else
+  MIDORI="$ac_cv_path_MIDORI"
+fi
+   fi
+  else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for midori" >&5
+$as_echo_n "checking for midori... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+# Check whether --with-epiphany was given.
+if test "${with_epiphany+set}" = set; then :
+  withval=$with_epiphany;
+   if test "${withval}" = "no" || test "${withval}" = "yes" || test "${withval}" = "" ; then
+    EPIPHANY=""
+   elif test -f "${withval}" ; then
+    EPIPHANY="${withval}"
+   else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epiphany" >&5
+$as_echo_n "checking for epiphany... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "invalid location specified to epiphany: ${withval}
+See \`config.log' for more details" "$LINENO" 5; }
+   fi
+else
+   withval="yes"
+fi
+  if test -f "${EPIPHANY}"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epiphany" >&5
+$as_echo_n "checking for epiphany... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${EPIPHANY}" >&5
+$as_echo "${EPIPHANY}" >&6; }
+  elif test "${withval}" != "no"; then
+   if test 2 -gt 2; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}", so it can be a program name with args.
+set dummy ${ac_tool_prefix}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_EPIPHANY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $EPIPHANY in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_EPIPHANY="$EPIPHANY" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_EPIPHANY="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+EPIPHANY=$ac_cv_path_EPIPHANY
+if test -n "$EPIPHANY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPIPHANY" >&5
+$as_echo "$EPIPHANY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_EPIPHANY"; then
+  ac_pt_EPIPHANY=$EPIPHANY
+  # Extract the first word of "", so it can be a program name with args.
+set dummy ; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_EPIPHANY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_EPIPHANY in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_EPIPHANY="$ac_pt_EPIPHANY" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_EPIPHANY="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_EPIPHANY=$ac_cv_path_ac_pt_EPIPHANY
+if test -n "$ac_pt_EPIPHANY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_EPIPHANY" >&5
+$as_echo "$ac_pt_EPIPHANY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_EPIPHANY" = x; then
+    EPIPHANY=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    EPIPHANY=$ac_pt_EPIPHANY
+  fi
+else
+  EPIPHANY="$ac_cv_path_EPIPHANY"
+fi
+   else
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}epiphany", so it can be a program name with args.
+set dummy ${ac_tool_prefix}epiphany; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_EPIPHANY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $EPIPHANY in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_EPIPHANY="$EPIPHANY" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_EPIPHANY="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+EPIPHANY=$ac_cv_path_EPIPHANY
+if test -n "$EPIPHANY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPIPHANY" >&5
+$as_echo "$EPIPHANY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
+if test -z "$ac_cv_path_EPIPHANY"; then
+  ac_pt_EPIPHANY=$EPIPHANY
+  # Extract the first word of "epiphany", so it can be a program name with args.
+set dummy epiphany; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_EPIPHANY+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_EPIPHANY in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_EPIPHANY="$ac_pt_EPIPHANY" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_EPIPHANY="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  ;;
+esac
+fi
+ac_pt_EPIPHANY=$ac_cv_path_ac_pt_EPIPHANY
+if test -n "$ac_pt_EPIPHANY"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_EPIPHANY" >&5
+$as_echo "$ac_pt_EPIPHANY" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "x$ac_pt_EPIPHANY" = x; then
+    EPIPHANY=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    EPIPHANY=$ac_pt_EPIPHANY
+  fi
+else
+  EPIPHANY="$ac_cv_path_EPIPHANY"
+fi
+   fi
+  else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epiphany" >&5
+$as_echo_n "checking for epiphany... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how browser test will be run" >&5
+$as_echo_n "checking how browser test will be run... " >&6; }
+# Check whether --with-browser-tests was given.
+if test "${with_browser_tests+set}" = set; then :
+  withval=$with_browser_tests;
+               BROWSER_SWITCH=${withval}
+else
+               BROWSER_SWITCH="yes"
+fi
+  D_PARAM_PART="-Dmodified.browsers.run"
+  case "$BROWSER_SWITCH" in
+    "yes" )
+        BROWSER_TESTS_MODIFICATION="" ;;
+    "no" )
+        BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=ignore" ;;
+    "one" )
+        BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=one" ;;
+    "all" )
+        BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=all" ;;
+    *)
+        as_fn_error $? "unknown valkue of with-browser-tests ($BROWSER_SWITCH), so not use (yes) or set yes|no|one|all" "$LINENO" 5
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BROWSER_SWITCH}" >&5
+$as_echo "${BROWSER_SWITCH}" >&6; }
+ if test x"$XSLTPROC" != x ; then
+  WITH_XSLTPROC_TRUE=
+  WITH_XSLTPROC_FALSE='#'
+else
+  WITH_XSLTPROC_TRUE='#'
+  WITH_XSLTPROC_FALSE=
+fi
 …
   else
     JUNIT_AVAILABLE=false
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for emma jar" >&5
+$as_echo_n "checking for emma jar... " >&6; }
+# Check whether --with-emma was given.
+if test "${with_emma+set}" = set; then :
+  withval=$with_emma;
+    case "${withval}" in
+      yes)
+        EMMA_JAR=yes
+        ;;
+      no)
+        EMMA_JAR=no
+        ;;
+      *)
+        if test -f "${withval}"; then
+          EMMA_JAR="${withval}"
+        elif test -z "${withval}"; then
+          EMMA_JAR=yes
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+          as_fn_error $? "\"The emma jar ${withval} was not found.\"" "$LINENO" 5
+        fi
+        ;;
+    esac
+else
+    EMMA_JAR=yes
+fi
+  it_extra_paths_emma="/usr/share/java/emma.jar"
+  if test "x${EMMA_JAR}" = "xyes"; then
+    for path in ${it_extra_paths_emma}; do
+      if test -f ${path}; then
+        EMMA_JAR=${path}
+        break
+      fi
+    done
+  fi
+  if test x"${EMMA_JAR}" = "xyes"; then
+    if test -f "/usr/share/java/emma.jar"; then
+      EMMA_JAR=/usr/share/java/emma.jar
+    fi
+  fi
+  if test x"${EMMA_JAR}" = "xyes"; then
+    EMMA_JAR=no
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${EMMA_JAR}" >&5
+$as_echo "${EMMA_JAR}" >&6; }
+   if test x"${EMMA_JAR}" != "xno"; then
+  WITH_EMMA_TRUE=
+  WITH_EMMA_FALSE='#'
+else
+  WITH_EMMA_TRUE='#'
+  WITH_EMMA_FALSE=
+fi
+  # Clear EMMA_JAR if it doesn't contain a valid filename
+  if test x"${EMMA_JAR}" = "xno"; then
+    EMMA_JAR=
+  fi
+  if test -n "${EMMA_JAR}" ; then
+    EMMA_AVAILABLE=true
+  else
+    EMMA_AVAILABLE=false
   fi
 …
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_XSLTPROC_TRUE}" && test -z "${WITH_XSLTPROC_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_XSLTPROC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_RHINO_TRUE}" && test -z "${WITH_RHINO_FALSE}"; then
   as_fn_error $? "conditional \"WITH_RHINO\" was never defined.
 …
 if test -z "${WITH_JUNIT_TRUE}" && test -z "${WITH_JUNIT_FALSE}"; then
   as_fn_error $? "conditional \"WITH_JUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_EMMA_TRUE}" && test -z "${WITH_EMMA_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_EMMA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 …
 # values after options handling.
 ac_log="
 This file was extended by icedtea-web $as_me 1.1.2, which was
+This file was extended by icedtea-web $as_me 1.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 …
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 icedtea-web config.status 1.1.2
+icedtea-web config.status 1.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"

trunk/icedtea-web/configure.ac

-              r348
+              r418
 AC_INIT([icedtea-web],[1.1.2],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
+AC_INIT([icedtea-web],[1.3],[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])
 …
 FIND_ECJ_JAR
 IT_FIND_JAVADOC
+IT_FIND_KEYTOOL
+IT_FIND_JARSIGNER
 AC_CONFIG_FILES([javac], [chmod +x javac])
 …
 dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
 dnl IT563 - NetX uses sun.security code
-dnl IT564 - NetX depends on sun.misc.BASE64Encoder
 dnl IT605 - NetX depends on sun.misc.HexDumpEncoder
 dnl IT570 - NetX depends on sun.applet.AppletViewPanel
 …
 IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker])
 IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name])
-IT_CHECK_FOR_CLASS(SUN_MISC_BASE64ENCODER, [sun.misc.BASE64Encoder])
 IT_CHECK_FOR_CLASS(SUN_MISC_HEXDUMPENCODER, [sun.misc.HexDumpEncoder])
 IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException])
 IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER,
         [com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager])
+IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE, [sun.net.www.protocol.jar.URLJarFile])
+IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK, [sun.net.www.protocol.jar.URLJarFileCallBack])
 IT_CHECK_FOR_CLASS(SUN_AWT_X11_XEMBEDDEDFRAME, [sun.awt.X11.XEmbeddedFrame])
 IT_CHECK_FOR_CLASS(SUN_MISC_REF, [sun.misc.Ref])
 …
 IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
 IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
+IT_CHECK_GLIB_VERSION
+IT_CHECK_XULRUNNER_API_VERSION
+#
 …
+#
+AC_CHECK_PROGS([XSLTPROC],[xsltproc],[], [])
+# browser to be linked/tested
+# Example: IT_FIND_BROWSER([browser-name],[variable-to-store-path],[default-run-command-if-different-from-the-browser-name])
+IT_FIND_BROWSER([firefox],[FIREFOX])
+IT_FIND_BROWSER([chrome],[CHROME],[google-chrome])
+IT_FIND_BROWSER([chromium],[CHROMIUM],[chromium-browser])
+IT_FIND_BROWSER([opera],[OPERA])
+IT_FIND_BROWSER([midori],[MIDORI])
+IT_FIND_BROWSER([epiphany],[EPIPHANY])
+IT_SET_GLOBAL_BROWSERTESTS_BEHAVIOUR
+AM_CONDITIONAL([WITH_XSLTPROC], [test x"$XSLTPROC" != x ])
 IT_FIND_OPTIONAL_JAR([rhino], RHINO,
     [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar])
 IT_FIND_OPTIONAL_JAR([junit], JUNIT,
     [/usr/share/java/junit4.jar /usr/share/junit-4/lib/junit.jar])
+IT_FIND_OPTIONAL_JAR([emma], EMMA,
+    [/usr/share/java/emma.jar])
 AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript])

trunk/icedtea-web/extra/net/sourceforge/javaws/about/Main.java

-              r348
+              r418
                 tabbedPane = new JTabbedPane();
                 tabbedPane.add("About NetX", aboutPanel);
+                tabbedPane.add("About IcedTea-Web and NetX", aboutPanel);
                 tabbedPane.add("Applications", appsPanel);
                 tabbedPane.add("Notes", notesPanel);
 …
+                }
                 JFrame frame = new JFrame("About NetX");
+                JFrame frame = new JFrame("About IcedTea-Web and NetX");
                 frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
                 Main demo = null;

trunk/icedtea-web/extra/net/sourceforge/javaws/about/resources/about.html

r348	r418
6	6	</head>
7	7	<body>
8		<~~b>NetX</b> is a high-quality JNLP client~~ that executes
	8	<h3>IcedTea-Web</h3> is a high-quality JNLP client, built on <b>NetX</b>, that executes
9	9	network-based applications.
10	10	<br>NetX downloads code over the

trunk/icedtea-web/extra/net/sourceforge/javaws/about/resources/notes.html

-              r348
+              r418
                                                                 <b>Lillian Angel</b> <br>
                                                                 <b>Deepak Bhole</b> <br>
+                                                                <b>Danesh Dadachanji</b> <br>
+                                                                <b>Adam Domurad</b> <br>
                                                                 <b>Thomas Fitzsimmons</b> <br>
                                                                 <b>Andrew John Hughes</b> <br>
 …
                                                                 <b>Omair Majid</b> <br>
                                                                 <b>Jon A. Maxwell</b> <br>
+                                                                <b>Thomas Meyer</b> <br>
+                                                                <b>Saad Mohammad</b> <br>
                                                                 <b>Andrew Su</b> <br>
                                                                 <b>Joshua Sumali</b> <br>
+                                                                <b>Jiri Vanek</b> <br>
                                                                 <b>Mark Wielaard</b> <br>
                                                                 <b>Man Lung Wong</b> <br>
 …
         </tbody>
 </table>
+<b>Please visit the SourceForge site
+<b> Home page of IcedTea-Web:
+    <a href="http://icedtea.classpath.org/wiki/IcedTea-Web">
+                http://icedtea.classpath.org/wiki/IcedTea-Web
+        </a><br>
+    Please visit also the SourceForge site
         <a href="http://jnlp.sourceforge.net/netx/index.html">
                 http://jnlp.sourceforge.net/netx/index.html

trunk/icedtea-web/install-sh

-              r348
+              r418
 # install - install a program, script, or datafile
 scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 …
     -t) dst_arg=$2
+        # Protect names problematic for `test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
         shift;;
 …
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 …
 if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
   # Set umask so as not to create temps with too-generous modes.
 …
 for src
 do
   # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
     -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 …
       exit 1
     fi
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
     # If destination is a directory, append the input filename; won't work
 …
       case $dstdir in
         /*) prefix='/';;
         -*) prefix='./';;
+        [-=\(\)!]*) prefix='./';;
         *)  prefix='';;
       esac
 …
       for d
       do
         test -z "$d" && continue
+        test X"$d" = X && continue
         prefix=$prefix$d

trunk/icedtea-web/jrunscript.in

r348	r418
1	1	#!/bin/bash
2	2
3		if [ x"@RHINO_JAR@" == x ] ; then
	3	if [ x"@RHINO_JAR@" = x ] ; then
4	4	echo "jrunscript requires rhino support"
5	5	exit 1

trunk/icedtea-web/launcher/javaws.in

-              r348
+              r418
 #!/bin/sh
+#!/bin/bash
 JAVA=@JAVA@
 …
 CP=@JRE@/lib/rt.jar
+JAVA_ARGS=
+ARGS=
+JAVA_ARGS=( )
+ARGS=( )
+COMMAND=()
+i=0
+j=0
 while [ "$#" -gt "0" ]; do
   case "$1" in
     -J*)
+      JAVA_ARGS="${JAVA_ARGS} ${1##-J}"
+      JAVA_ARGS[$i]="${1##-J}"
+      i=$((i+1))
       ;;
     *)
+      ARGS="${ARGS} $1"
+      ARGS[$j]="$1"
+      j=$((j+1))
       ;;
   esac
 …
 done
+${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \
+  ${JAVA_ARGS} \
+  -classpath ${CP} \
+  -Dicedtea-web.bin.name=${PROGRAM_NAME} \
+  -Dicedtea-web.bin.location=${BINARY_LOCATION} \
+  ${CLASSNAME} \
+  ${ARGS}
+k=0
+COMMAND[k]="${JAVA}"
+k=$((k+1))
+COMMAND[k]="${LAUNCHER_BOOTCLASSPATH}"
+k=$((k+1))
+COMMAND[k]="${LAUNCHER_FLAGS}"
+k=$((k+1))
+i=0
+while [ "$i" -lt "${#JAVA_ARGS[@]}" ]; do
+  COMMAND[k]="${JAVA_ARGS[$i]}"
+  i=$((i+1))
+  k=$((k+1))
+done
+COMMAND[k]="-classpath"
+k=$((k+1))
+COMMAND[k]="${CP}"
+k=$((k+1))
+COMMAND[k]="-Dicedtea-web.bin.name=${PROGRAM_NAME}"
+k=$((k+1))
+COMMAND[k]="-Dicedtea-web.bin.location=${BINARY_LOCATION}"
+k=$((k+1))
+COMMAND[k]="${CLASSNAME}"
+k=$((k+1))
+j=0
+while [ "$j" -lt "${#ARGS[@]}" ]; do
+  COMMAND[k]="${ARGS[$j]}"
+  j=$((j+1))
+  k=$((k+1))
+done
+exec -a "javaws" "${COMMAND[@]}"
 exit $?

trunk/icedtea-web/missing

-              r348
+              r418
 # Common stub for a few missing GNU programs while installing.
 scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
 # 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 …
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 …
   lex*|yacc*)
     # Not GNU programs, they don't have --version.
-    ;;
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
     ;;
 …
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
         eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
         case $LASTARG in
         *.y)
 …
     rm -f lex.yy.c
     if test $# -ne 1; then
         eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
         case $LASTARG in
         *.l)
 …
     ;;
-  tar*)
-    shift
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-        case $firstarg in
-        *o*)
-            firstarg=`echo "$firstarg" | sed s/o//`
-            tar "$firstarg" "$@" && exit 0
-            ;;
-        esac
-        case $firstarg in
-        *h*)
-            firstarg=`echo "$firstarg" | sed s/h//`
-            tar "$firstarg" "$@" && exit 0
-            ;;
-        esac
-    fi
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
   *)
     echo 1>&2 "\

trunk/icedtea-web/netx/net/sourceforge/jnlp/AppletDesc.java

-              r348
+              r418
  * @version $Revision: 1.8 $
  */
 public class AppletDesc {
+public class AppletDesc implements LaunchDesc {
     /** the applet name */
 …
     /**
      * Returns the main class name
+     * Returns the main class name in the dot-separated form (eg: foo.bar.Baz)
      */
+    @Override
     public String getMainClass() {
         return mainClass;

trunk/icedtea-web/netx/net/sourceforge/jnlp/ApplicationDesc.java

-              r348
+              r418
  * @version $Revision: 1.7 $
  */
 public class ApplicationDesc {
+public class ApplicationDesc implements LaunchDesc {
     /** the main class name and package */
 …
      * Returns the main class name
      */
+    @Override
     public String getMainClass() {
         return mainClass;

trunk/icedtea-web/netx/net/sourceforge/jnlp/DefaultLaunchHandler.java

-              r348
+              r418
 package net.sourceforge.jnlp;
+import java.io.PrintStream;
 import net.sourceforge.jnlp.runtime.*;
 …
  * @version $Revision: 1.1 $
  */
+public class DefaultLaunchHandler implements LaunchHandler {
+public class DefaultLaunchHandler extends AbstractLaunchHandler {
+    public DefaultLaunchHandler(PrintStream out) {
+        super(out);
+    }
     /**
 …
      * @return true to allow the application to continue, false to stop it.
      */
     public boolean validationError(LaunchException security) {
         printMessage(security);
+    public boolean validationError(LaunchException error) {
+        printMessage(error);
         return true;
+    }
 …
     public void launchCompleted(ApplicationInstance application) {
         //
+    }
-    /**
-     * Print a message to stdout.
-     */
-    protected static void printMessage(LaunchException ex) {
-        StringBuffer result = new StringBuffer();
-        result.append("netx: ");
-        result.append(ex.getCategory());
-        if (ex.getSummary() != null) {
-            result.append(": ");
-            result.append(ex.getSummary());
+        }
-        if (JNLPRuntime.isDebug()) {
-            if (ex.getCause() != null)
-                ex.getCause().printStackTrace();
-            else
-                ex.printStackTrace();
+        }
-        Throwable causes[] = ex.getCauses();
-        for (int i = 0; i < causes.length; i++) {
-            result.append(" (");
-            result.append(causes[i].getClass().getName());
-            result.append(" ");
-            result.append(causes[i].getMessage());
-            result.append(")");
+        }
+    }

trunk/icedtea-web/netx/net/sourceforge/jnlp/GuiLaunchHandler.java

-              r348
+              r418
 package net.sourceforge.jnlp;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 …
  * including splash screens and exception dialogs.
  */
 public class GuiLaunchHandler implements LaunchHandler {
+public class GuiLaunchHandler extends AbstractLaunchHandler {
     private JNLPSplashScreen splashScreen = null;
+    private final Object mutex = new Object();
     private UpdatePolicy policy = UpdatePolicy.ALWAYS;
+    public GuiLaunchHandler(PrintStream outputStream) {
+        super(outputStream);
+    }
     @Override
 …
             @Override
             public void run() {
+                closeSplashScreen();
                 BasicExceptionDialog.show(exception);
+            }
         });
+        printMessage(exception);
+    }
+    private void closeSplashScreen() {
+        synchronized(mutex) {
+            if (splashScreen != null) {
+                if (splashScreen.isSplashScreenValid()) {
+                    splashScreen.setVisible(false);
+                }
+                splashScreen.dispose();
+            }
+        }
+    }
 …
             @Override
             public void run() {
+                if (splashScreen != null) {
+                    if (splashScreen.isSplashScreenValid()) {
+                        splashScreen.setVisible(false);
+                    }
+                    splashScreen.dispose();
+                }
+                closeSplashScreen();
+            }
         });
 …
     @Override
     public void launchInitialized(final JNLPFile file) {
+        int preferredWidth = 500;
+        int preferredHeight = 400;
+        final URL splashImageURL = file.getInformation().getIconLocation(
+                IconDesc.SPLASH, preferredWidth, preferredHeight);
+        if (splashImageURL != null) {
+            final ResourceTracker resourceTracker = new ResourceTracker(true);
+            resourceTracker.addResource(splashImageURL, file.getFileVersion(), null, policy);
+            synchronized(mutex) {
+                try {
+                    SwingUtilities.invokeAndWait(new Runnable() {
+                        @Override
+                        public void run() {
+                            splashScreen = new JNLPSplashScreen(resourceTracker, null, null);
+                        }
+                    });
+                } catch (InterruptedException ie) {
+                    // Wait till splash screen is created
+                    while (splashScreen == null);
+                } catch (InvocationTargetException ite) {
+                    ite.printStackTrace();
+                }
+                splashScreen.setSplashImageURL(splashImageURL);
+            }
+        }
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                final int preferredWidth = 500;
-                final int preferredHeight = 400;
-                URL splashImageURL = file.getInformation().getIconLocation(
-                        IconDesc.SPLASH, preferredWidth, preferredHeight);
                 if (splashImageURL != null) {
+                    ResourceTracker resourceTracker = new ResourceTracker(true);
+                    resourceTracker.addResource(splashImageURL, file.getFileVersion(), null, policy);
+                    splashScreen = new JNLPSplashScreen(resourceTracker, null, null);
+                    splashScreen.setSplashImageURL(splashImageURL);
+                    if (splashScreen.isSplashScreenValid()) {
+                        splashScreen.setVisible(true);
+                    synchronized(mutex) {
+                        if (splashScreen.isSplashScreenValid()) {
+                            splashScreen.setVisible(true);
+                        }
+                    }
+                }
 …
     @Override
     public boolean launchWarning(LaunchException warning) {
         DefaultLaunchHandler.printMessage(warning);
+        printMessage(warning);
         return true;
+    }
     @Override
+    public boolean validationError(LaunchException security) {
+        DefaultLaunchHandler.printMessage(security);
+    public boolean validationError(LaunchException error) {
+        closeSplashScreen();
+        printMessage(error);
         return true;
+    }

trunk/icedtea-web/netx/net/sourceforge/jnlp/InstallerDesc.java

-              r348
+              r418
  * @version $Revision: 1.6 $
  */
 public class InstallerDesc {
+public class InstallerDesc implements LaunchDesc {
     /** the main class name and package. */
 …
      * Returns the main class name and package.
      */
+    @Override
     public String getMainClass() {
         return mainClass;

trunk/icedtea-web/netx/net/sourceforge/jnlp/JNLPFile.java

-              r348
+              r418
     /** the application description */
     protected Object launchType;
+    protected LaunchDesc launchType;
     /** the component description */
 …
     protected SecurityDesc security;
+    /** the default JVM locale */
+    protected Locale defaultLocale = null;
     /** the default OS */
     protected Locale defaultLocale = null;
+    protected String defaultOS = null;
     /** the default arch */
-    protected String defaultOS = null;
-    /** the default jvm */
     protected String defaultArch = null;
+    /** A signed JNLP file is missing from the main jar */
+    private boolean missingSignedJNLP = false;
+    /** JNLP file contains special properties */
+    private boolean containsSpecialProperties = false;
+    /**
+     * List of acceptable properties (not-special)
+     */
+    private String[] generalProperties = SecurityDesc.getJnlpRIAPermissions();
     { // initialize defaults if security allows
 …
+    }
+    static enum Match { LANG_COUNTRY_VARIANT, LANG_COUNTRY, LANG, GENERALIZED }
     /**
      * Empty stub, allowing child classes to override the constructor
 …
      */
     public JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
+        this(location, version, strict, policy, null);
+    }
+    /**
+     * Create a JNLPFile from a URL and a version, checking for updates
+     * using the specified policy.
+     *
+     * @param location the location of the JNLP file
+     * @param version the version of the JNLP file
+     * @param strict whether to enforce the spec when
+     * @param policy the update policy
+     * @param forceCodebase codebase to use if not specified in JNLP file.
+     * @throws IOException if an IO exception occurred
+     * @throws ParseException if the JNLP file was invalid
+     */
+    protected JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy, URL forceCodebase) throws IOException, ParseException {
         Node root = Parser.getRootNode(openURL(location, version, policy));
         parse(root, strict, location);
+        parse(root, strict, location, forceCodebase);
         //Downloads the original jnlp file into the cache if possible
 …
         //originated from a website, then download the one from the website
         //into the cache).
         if (sourceLocation != null && location.getProtocol() == "file") {
+        if (sourceLocation != null && "file".equals(location.getProtocol())) {
             openURL(sourceLocation, version, policy);
+        }
 …
      */
     public JNLPFile(InputStream input, boolean strict) throws ParseException {
         parse(Parser.getRootNode(input), strict, null);
+        parse(Parser.getRootNode(input), strict, null, null);
+    }
 …
     /**
      * Returns the JNLP file's title.  This method returns the same
+     * Returns the JNLP file's best localized title. This method returns the same
      * value as InformationDesc.getTitle().
      */
 …
     /**
+     * Returns the JNLP file's best localized vendor. This method returns the same
+     * value as InformationDesc.getVendor().
+     */
+    public String getVendor() {
+        return getInformation().getVendor();
+    }
+    /**
      * Returns the JNLP file's network location as specified in the
      * JNLP file.
 …
     public InformationDesc getInformation(final Locale locale) {
         return new InformationDesc(this, new Locale[] { locale }) {
+            @Override
             protected List<Object> getItems(Object key) {
                 List<Object> result = new ArrayList<Object>();
+                for (int i = 0; i < info.size(); i++) {
+                    InformationDesc infoDesc = info.get(i);
+                    if (localMatches(locale, infoDesc.getLocales()))
+                        result.addAll(infoDesc.getItems(key));
+                for (Match precision : Match.values()) {
+                    for (InformationDesc infoDesc : JNLPFile.this.info) {
+                        if (localeMatches(locale, infoDesc.getLocales(), precision)) {
+                            result.addAll(infoDesc.getItems(key));
+                        }
+                    }
+                    if (result.size() > 0) {
+                        return result;
+                    }
+                }
                 return result;
+            }
+            @Override
+            public String getTitle() {
+                for (Match precision : Match.values()) {
+                    for (InformationDesc infoDesc : JNLPFile.this.info) {
+                        String title = infoDesc.getTitle();
+                        if (localeMatches(locale, infoDesc.getLocales(), precision)
+                                && title != null && !"".equals(title)) {
+                            return title;
+                        }
+                    }
+                }
+                return null;
+            }
+            @Override
+            public String getVendor() {
+                for (Match precision : Match.values()) {
+                    for (InformationDesc infoDesc : JNLPFile.this.info) {
+                        String vendor = infoDesc.getVendor();
+                        if (localeMatches(locale, infoDesc.getLocales(), precision)
+                                && vendor != null && !"".equals(vendor)) {
+                            return vendor;
+                        }
+                    }
+                }
+                return null;
+            }
         };
 …
     public ResourcesDesc getResources(final Locale locale, final String os, final String arch) {
         return new ResourcesDesc(this, new Locale[] { locale }, new String[] { os }, new String[] { arch }) {
+            @Override
             public <T> List<T> getResources(Class<T> launchType) {
                 List<T> result = new ArrayList<T>();
+                for (int i = 0; i < resources.size(); i++) {
+                    ResourcesDesc rescDesc = resources.get(i);
+                    if (localMatches(locale, rescDesc.getLocales())
+                for (ResourcesDesc rescDesc : resources) {
+                    boolean hasUsableLocale = false;
+                    for (Match match : Match.values()) {
+                        hasUsableLocale |= localeMatches(locale, rescDesc.getLocales(), match);
+                    }
+                    if (hasUsableLocale
                             && stringMatches(os, rescDesc.getOS())
                             && stringMatches(arch, rescDesc.getArch()))
 …
+            }
+            @Override
             public void addResource(Object resource) {
                 // todo: honor the current locale, os, arch values
 …
         List<ResourcesDesc> matchingResources = new ArrayList<ResourcesDesc>();
         for (ResourcesDesc rescDesc: resources) {
+            if (localMatches(locale, rescDesc.getLocales())
+            boolean hasUsableLocale = false;
+            for (Match match : Match.values()) {
+                hasUsableLocale |= localeMatches(locale, rescDesc.getLocales(), match);
+            }
+            if (hasUsableLocale
                     && stringMatches(os, rescDesc.getOS())
                     && stringMatches(arch, rescDesc.getArch())) {
 …
      * ApplicationDesc and InstallerDesc
      */
     public Object getLaunchInfo() {
+    public LaunchDesc getLaunchInfo() {
         return launchType;
+    }
 …
      * @param requested the local
      * @param available the available locales
+     * @param precision the depth with which to match locales. 1 checks only
+     * language, 2 checks language and country, 3 checks language, country and
+     * variant for matches. Passing 0 will always return true.
      * @return true if requested matches any of available, or if
      * available is empty or null.
      */
+    private boolean localMatches(Locale requested, Locale available[]) {
+        if (available == null || available.length == 0)
+            return true;
+        for (int i = 0; i < available.length; i++) {
+            String language = requested.getLanguage(); // "" but never null
+            String country = requested.getCountry();
+            String variant = requested.getVariant();
+            if (!"".equals(language) && !language.equalsIgnoreCase(available[i].getLanguage()))
+                continue;
+            if (!"".equals(country) && !country.equalsIgnoreCase(available[i].getCountry()))
+                continue;
+            if (!"".equals(variant) && !variant.equalsIgnoreCase(available[i].getVariant()))
+                continue;
+            return true;
+        }
+    public boolean localeMatches(Locale requested, Locale available[], Match matchLevel) {
+        if (matchLevel == Match.GENERALIZED)
+            return available == null || available.length == 0;
+        String language = requested.getLanguage(); // "" but never null
+        String country = requested.getCountry();
+        String variant = requested.getVariant();
+        for (Locale locale : available) {
+            switch (matchLevel) {
+                case LANG:
+                    if (!language.isEmpty()
+                            && language.equals(locale.getLanguage())
+                            && locale.getCountry().isEmpty()
+                            && locale.getVariant().isEmpty())
+                        return true;
+                    break;
+                case LANG_COUNTRY:
+                    if (!language.isEmpty()
+                            && language.equals(locale.getLanguage())
+                            && !country.isEmpty()
+                            && country.equals(locale.getCountry())
+                            && locale.getVariant().isEmpty())
+                        return true;
+                    break;
+                case LANG_COUNTRY_VARIANT:
+                    if (language.equals(locale.getLanguage())
+                            && country.equals(locale.getCountry())
+                            && variant.equals(locale.getVariant()))
+                        return true;
+                    break;
+                default:
+                    break;
+            }
+        }
         return false;
+    }
 …
      * @param location the file location or null
      */
     private void parse(Node root, boolean strict, URL location) throws ParseException {
+    private void parse(Node root, boolean strict, URL location, URL forceCodebase) throws ParseException {
         try {
             //if (location != null)
             //  location = new URL(location, "."); // remove filename
             Parser parser = new Parser(this, location, root, strict, true); // true == allow extensions
+            Parser parser = new Parser(this, location, root, strict, true, forceCodebase); // true == allow extensions
             // JNLP tag information
 …
             sourceLocation = parser.getFileLocation() != null ? parser.getFileLocation() : location;
             info = parser.getInfo(root);
+            parser.checkForInformation();
             update = parser.getUpdate(root);
             resources = parser.getResources(root, false); // false == not a j2se/java resources section
 …
             component = parser.getComponent(root);
             security = parser.getSecurity(root);
+            checkForSpecialProperties();
         } catch (ParseException ex) {
             throw ex;
 …
             throw new RuntimeException(ex.toString());
+        }
+    }
+    /**
+     * Inspects the JNLP file to check if it contains any special properties
+     */
+    private void checkForSpecialProperties() {
+        for (ResourcesDesc res : resources) {
+            for (PropertyDesc propertyDesc : res.getProperties()) {
+                for (int i = 0; i < generalProperties.length; i++) {
+                    String property = propertyDesc.getKey();
+                    if (property.equals(generalProperties[i])) {
+                        break;
+                    } else if (!property.equals(generalProperties[i])
+                            && i == generalProperties.length - 1) {
+                        containsSpecialProperties = true;
+                        return;
+                    }
+                }
+            }
+        }
+    }
 …
+    }
+    /**
+     * Returns a boolean after determining if a signed JNLP warning should be
+     * displayed in the 'More Information' panel.
+     *
+     * @return true if a warning should be displayed; otherwise false
+     */
+    public boolean requiresSignedJNLPWarning() {
+        return (missingSignedJNLP && containsSpecialProperties);
+    }
+    /**
+     * Informs that a signed JNLP file is missing in the main jar
+     */
+    public void setSignedJNLPAsMissing() {
+        missingSignedJNLP = true;
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/JNLPSplashScreen.java

-              r348
+              r418
 import javax.imageio.ImageIO;
 import javax.swing.JFrame;
+import javax.swing.JDialog;
 import net.sourceforge.jnlp.cache.ResourceTracker;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.ImageResources;
 public class JNLPSplashScreen extends JFrame {
+public class JNLPSplashScreen extends JDialog {
     String applicationTitle;
 …
     public JNLPSplashScreen(ResourceTracker resourceTracker,
             String applicationTitle, String applicationVendor) {
+        setIconImages(ImageResources.INSTANCE.getApplicationImages());
         // If the JNLP file does not contain any icon images, the splash image

trunk/icedtea-web/netx/net/sourceforge/jnlp/LaunchException.java

-              r348
+              r418
 package net.sourceforge.jnlp;
-import java.io.*;
-import java.util.*;
-import net.sourceforge.jnlp.util.*;
 /**
  * Thrown when a JNLP application, applet, or installer could not
 …
 public class LaunchException extends Exception {
+    /** the original exception */
+    private Throwable cause = null;
+    private static final long serialVersionUID = 7283827853612357423L;
     /** the file being launched */
 …
      */
     public LaunchException(JNLPFile file, Exception cause, String severity, String category, String summary, String description) {
+        super(severity + ": " + category + ": " + summary);
+        super(severity + ": " + category + ": " + summary + " "
+                    + (description == null ? "" : description), cause);
         this.file = file;
 …
         this.description = description;
         this.severity = severity;
-        // replace with setCause when no longer 1.3 compatible
-        this.cause = cause;
+    }
 …
      */
     public LaunchException(Throwable cause) {
+        this(cause.getMessage());
+        // replace with setCause when no longer 1.3 compatible
+        this.cause = cause;
+        super(cause);
+    }
 …
      */
     public LaunchException(String message, Throwable cause) {
+        this(message + ": " + cause.getMessage());
+        // replace with setCause when no longer 1.3 compatible
+        this.cause = cause;
+        super(message, cause);
+    }
 …
+    }
-    /**
-     * Return the cause of the launch exception or null if there
-     * is no cause exception.
-     */
-    public Throwable getCause() {
-        return cause;
+    }
-    /**
-     * Returns the causes for this exception.  This method is
-     * useful on JRE 1.3 since getCause is not a standard method,
-     * and will be removed once netx no longer supports 1.3.
-     */
-    public Throwable[] getCauses() {
-        ArrayList<Throwable> result = new ArrayList<Throwable>();
-        Reflect r = new Reflect();
-        Throwable cause = this.cause;
-        while (cause != null) {
-            result.add(cause);
-            cause = (Throwable) r.invoke(cause, "getCause");
+        }
-        return result.toArray(new Throwable[0]);
+    }
-    /**
-     * Print the stack trace and the cause exception (1.3
-     * compatible)
-     */
-    public void printStackTrace(PrintStream stream) {
-        super.printStackTrace(stream);
-        if (cause != null) {
-            stream.println("Caused by: ");
-            cause.printStackTrace(stream);
+        }
+    }
-    /**
-     * Print the stack trace and the cause exception (1.3
-     * compatible)
-     */
-    public void printStackTrace(PrintWriter stream) {
-        super.printStackTrace(stream);
-        if (cause != null) {
-            stream.println("Caused by: ");
-            cause.printStackTrace(stream);
+        }
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/LaunchHandler.java

r348	r418
51	51	* @return true to allow the application to continue, false to stop it.
52	52	*/
53		public boolean validationError(LaunchException ~~security~~);
	53	public boolean validationError(LaunchException error);
54	54
55	55	// this method will probably be replaced when real security

trunk/icedtea-web/netx/net/sourceforge/jnlp/Launcher.java

-              r348
+              r418
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 …
 import net.sourceforge.jnlp.cache.CacheUtil;
 import net.sourceforge.jnlp.cache.UpdatePolicy;
-import net.sourceforge.jnlp.runtime.AppThreadGroup;
 import net.sourceforge.jnlp.runtime.AppletInstance;
 import net.sourceforge.jnlp.runtime.ApplicationInstance;
 …
             main.setAccessible(true);
+            if (JNLPRuntime.isDebug()) {
+                System.out.println("Invoking main() with args: " + Arrays.toString(args));
+            }
             main.invoke(null, new Object[] { args });
 …
+            }
+            AppThreadGroup group = (AppThreadGroup) Thread.currentThread().getThreadGroup();
+            ThreadGroup group = Thread.currentThread().getThreadGroup();
+            // appletInstance is needed by ServiceManager when looking up
+            // services. This could potentially be done in applet constructor
+            // so initialize appletInstance before creating applet.
+            AppletInstance appletInstance;
+            if (cont == null)
+                appletInstance = new AppletInstance(file, group, loader, null);
+            else
+                appletInstance = new AppletInstance(file, group, loader, null, cont);
+            loader.setApplication(appletInstance);
+            // Initialize applet now that ServiceManager has access to its
+            // appletInstance.
             String appletName = file.getApplet().getMainClass();
-            //Classloader chokes if there's '/' in the path to the main class.
-            //Must replace with '.' instead.
-            appletName = appletName.replace('/', '.');
             Class appletClass = loader.loadClass(appletName);
             Applet applet = (Applet) appletClass.newInstance();
+            AppletInstance appletInstance;
+            if (cont == null)
+                appletInstance = new AppletInstance(file, group, loader, applet);
+            else
+                appletInstance = new AppletInstance(file, group, loader, applet, cont);
+            group.setApplication(appletInstance);
+            loader.setApplication(appletInstance);
+            // Finish setting up appletInstance.
+            appletInstance.setApplet(applet);
+            appletInstance.getAppletEnvironment().setApplet(applet);
             setContextClassLoaderForAllThreads(appletInstance.getThreadGroup(), appletInstance.getClassLoader());
 …
             String appletName = file.getApplet().getMainClass();
-            //Classloader chokes if there's '/' in the path to the main class.
-            //Must replace with '.' instead.
-            appletName = appletName.replace('/', '.');
             Class appletClass = loader.loadClass(appletName);
             Applet applet = (Applet) appletClass.newInstance();
 …
         try {
             JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy);
             AppThreadGroup group = (AppThreadGroup) Thread.currentThread().getThreadGroup();
+            ThreadGroup group = Thread.currentThread().getThreadGroup();
             ApplicationInstance app = new ApplicationInstance(file, group, loader);
-            group.setApplication(app);
             loader.setApplication(app);
 …
      * ThreadGroup has to be created at an earlier point in the applet code.
      */
     protected AppThreadGroup createThreadGroup(JNLPFile file) {
         AppThreadGroup appThreadGroup = null;
+    protected ThreadGroup createThreadGroup(JNLPFile file) {
+        ThreadGroup tg = null;
         if (file instanceof PluginBridge) {
             appThreadGroup = (AppThreadGroup) Thread.currentThread().getThreadGroup();
+            tg = Thread.currentThread().getThreadGroup();
         } else {
             appThreadGroup = new AppThreadGroup(mainGroup, file.getTitle());
+        }
         return appThreadGroup;
+            tg = new ThreadGroup(mainGroup, file.getTitle());
+        }
+        return tg;
+    }

trunk/icedtea-web/netx/net/sourceforge/jnlp/NetxPanel.java

-              r348
+              r418
 import net.sourceforge.jnlp.AppletLog;
-import net.sourceforge.jnlp.runtime.AppThreadGroup;
 import net.sourceforge.jnlp.runtime.AppletInstance;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import java.net.URL;
+import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import sun.applet.AppletViewerPanel;
 …
     private AppletInstance appInst = null;
     private boolean appletAlive;
+    private final String uKey;
+    // We use this so that we can create exactly one thread group
+    // for all panels with the same uKey.
+    private static final Map<String, ThreadGroup> uKeyToTG =
+        new HashMap<String, ThreadGroup>();
+    private static final Object TGMapMutex = new Object();
+    // This map is actually a set (unfortunately there is no ConcurrentSet
+    // in java.util.concurrent). If KEY is in this map, then we know that
+    // an app context has been created for the panel that has uKey.equals(KEY),
+    // so we avoid creating it a second time for panels with the same uKey.
+    // Because it's a set, only the keys matter. However, we can't insert
+    // null values in because if we did, we couldn't use null checks to see
+    // if a key was absent before a putIfAbsent.
+    private static final ConcurrentMap<String, Boolean> appContextCreated =
+        new ConcurrentHashMap<String, Boolean>();
     public NetxPanel(URL documentURL, Hashtable<String, String> atts) {
         super(documentURL, atts);
+        /* According to http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/applet-compatibility.html,
+         * classloaders are shared iff these properties match:
+         * codebase, cache_archive, java_archive, archive
+         *
+         * To achieve this, we create the uniquekey based on those 4 values,
+         * always in the same order. The initial "<NAME>=" parts ensure a
+         * bad tag cannot trick the loader into getting shared with another.
+         */
+        // Firefox sometimes skips the codebase if it is default  -- ".",
+        // so set it that way if absent
+        String codebaseAttr =      atts.get("codebase") != null ?
+                                   atts.get("codebase") : ".";
+        String cache_archiveAttr = atts.get("cache_archive") != null ?
+                                   atts.get("cache_archive") : "";
+        String java_archiveAttr =  atts.get("java_archive") != null ?
+                                   atts.get("java_archive") : "";
+        String archiveAttr =       atts.get("archive") != null ?
+                                   atts.get("archive") : "";
+        this.uKey = "codebase=" + codebaseAttr +
+                    "cache_archive=" + cache_archiveAttr +
+                    "java_archive=" + java_archiveAttr +
+                    "archive=" +  archiveAttr;
+        // when this was being done (incorrectly) in Launcher, the call was
+        // new AppThreadGroup(mainGroup, file.getTitle());
+        synchronized(TGMapMutex) {
+            if (!uKeyToTG.containsKey(this.uKey)) {
+                ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString());
+                uKeyToTG.put(this.uKey, tg);
+            }
+        }
+    }
 …
         this.exitOnFailure = exitOnFailure;
         this.appletAlive = true;
+    }
-    @Override
-    public void run() {
-        /*
-         * create an AppContext for this thread associated with this particular
-         * plugin instance (which runs in a different thread group from the rest
-         * of the plugin).
-         */
-        SunToolkit.createNewAppContext();
-        super.run();
+    }
 …
         super.showAppletException(t);
+    }
     //Overriding to use Netx classloader. You might need to relax visibility
     //in sun.applet.AppletPanel for runLoader().
 …
                                 getWidth(),
                                 getHeight(),
                                 atts);
+                                atts, uKey);
             doInit = true;
 …
+        }
+        // when this was being done (incorrectly) in Launcher, the call was
+        // new AppThreadGroup(mainGroup, file.getTitle());
+        ThreadGroup tg = new AppThreadGroup(Launcher.mainGroup,
+                this.documentURL.toString());
+        handler = new Thread(tg, this);
+        handler = new Thread(getThreadGroup(), this);
         handler.start();
+    }
 …
         return handler != null && handler.isAlive() && this.appletAlive;
+    }
+    public ThreadGroup getThreadGroup() {
+        synchronized(TGMapMutex) {
+            return uKeyToTG.get(uKey);
+        }
+    }
+    public void createNewAppContext() {
+        if (Thread.currentThread().getThreadGroup() != getThreadGroup()) {
+            throw new RuntimeException("createNewAppContext called from the wrong thread.");
+        }
+        // only create a new context if one hasn't already been created for the
+        // applets with this unique key.
+        if (null == appContextCreated.putIfAbsent(uKey, Boolean.TRUE)) {
+            SunToolkit.createNewAppContext();
+        }
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/Node.java

-              r348
+              r418
     private Node next;
     private Node children[];
+    private List <String> attributeNames= null;
     Node(XMLElement xml) {
 …
         return children;
+    }
+    /**
+     * To retrieve all attribute names
+     * @return all attribute names of the Node in ArrayList<String>
+     */
+    List<String> getAttributeNames() {
+        if (attributeNames == null) {
+            attributeNames= new ArrayList<String>();
+            for (Enumeration e = xml.enumerateAttributeNames(); e.hasMoreElements();)
+                attributeNames.add(new String((String) e.nextElement()));
+        }
+        return attributeNames;
+    }
     String getAttribute(String name) {
 …
     private Node next;
     private Node children[];
+    private String attributeNames[];
     Node(ParsedXML tinyNode) {
 …
         return children;
+    }
     String getAttribute(String name) {
         return tinyNode.getAttribute(name);

trunk/icedtea-web/netx/net/sourceforge/jnlp/Parser.java

-              r348
+              r418
 // Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
 // Copyright (C) 2009 Red Hat, Inc.
+// Copyright (C) 2012 Red Hat, Inc.
 //
 // This library is free software; you can redistribute it and/or
 …
 import net.sourceforge.jnlp.UpdateDesc.Check;
 import net.sourceforge.jnlp.UpdateDesc.Policy;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.nanoxml.*;
 …
      */
     public Parser(JNLPFile file, URL base, Node root, boolean strict, boolean allowExtensions) throws ParseException {
+        this(file, base, root, strict, allowExtensions, null);
+    }
+    /**
+     * Create a parser for the JNLP file.  If the location
+     * parameters is not null it is used as the default codebase
+     * (does not override value of jnlp element's href
+     * attribute).<p>
+     *
+     * The root node may be normalized as a side effect of this
+     * constructor.
+     *
+     * @param file the (uninitialized) file reference
+     * @param base if codebase is not specified, a default base for relative URLs
+     * @param root the root node
+     * @param strict whether to enforce strict compliance with the JNLP spec
+     * @param allowExtensions whether to allow extensions to the JNLP spec
+     * @param codebase codebase to use if we did not parse one from JNLP file.
+     * @throws ParseException if the JNLP file is invalid
+     */
+    public Parser(JNLPFile file, URL base, Node root, boolean strict, boolean allowExtensions, URL codebase) throws ParseException {
         this.file = file;
         this.root = root;
 …
         this.spec = getVersion(root, "spec", "1.0+");
         this.codebase = addSlash(getURL(root, "codebase", base));
+        this.base = (codebase != null) ? codebase : base; // if codebase not specified use default codebase
+        if (this.codebase == null) // We only override it if it is not specified.
+            this.codebase = codebase;
+        this.base = (this.codebase != null) ? this.codebase : base; // if codebase not specified use default codebase
         fileLocation = getURL(root, "href", this.base);
 …
     /**
+     * Make sure a title and vendor are present and nonempty and localized as
+     * best matching as possible for the JVM's current locale. Fallback to a
+     * generalized title and vendor otherwise. If none is found, throw an exception.
+     *
+     * Additionally prints homepage, description, title and vendor to stdout
+     * if in Debug mode.
+     * @throws RequiredElementException
+     */
+    void checkForInformation() throws RequiredElementException {
+        if (JNLPRuntime.isDebug()) {
+            System.out.println("Homepage: " + file.getInformation().getHomepage());
+            System.out.println("Description: " + file.getInformation().getDescription());
+        }
+        String title = file.getTitle();
+        String vendor = file.getVendor();
+        if (title == null || title.trim().isEmpty())
+            throw new MissingTitleException();
+        else if (JNLPRuntime.isDebug())
+            System.out.println("Acceptable title tag found, contains: " + title);
+        if (vendor == null || vendor.trim().isEmpty())
+            throw new MissingVendorException();
+        else if (JNLPRuntime.isDebug())
+            System.out.println("Acceptable vendor tag found, contains: " + vendor);
+    }
+    /**
      * Returns all of the information elements under the specified
      * node.
 …
         // ensure that there are at least one information section present
         if (info.length == 0)
             throw new ParseException(R("PNoInfoElement"));
+            throw new MissingInformationException();
         // create objects from the info sections
+        for (int i = 0; i < info.length; i++)
+            result.add(getInformationDesc(info[i]));
+        for (Node infoNode : info) {
+            result.add(getInformationDesc(infoNode));
+        }
         return result;
 …
      * @throws ParseException if the JNLP file is invalid
      */
     public Object getLauncher(Node parent) throws ParseException {
+    public LaunchDesc getLauncher(Node parent) throws ParseException {
         // check for other than one application type
         if (1 < getChildNodes(parent, "applet-desc").length
 …
         String language = localeStr.substring(0, 2);
         String country = (localeStr.length() < 5) ? "" : localeStr.substring(3, 5);
         String variant = (localeStr.length() < 7) ? "" : localeStr.substring(6, 8);
+        String variant = (localeStr.length() > 7) ? localeStr.substring(6) : "";
         // null is not allowed n locale but "" is

trunk/icedtea-web/netx/net/sourceforge/jnlp/PluginBridge.java

-              r348
+              r418
 /*
  * Copyright 2007 Red Hat, Inc.
+ * Copyright 2012 Red Hat, Inc.
  * This file is part of IcedTea, http://icedtea.classpath.org
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 …
 package net.sourceforge.jnlp;
+import java.io.File;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.util.Hashtable;
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
+import java.util.Set;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+/**
+ * Allows reuse of code that expects a JNLPFile object,
+ * while overriding behaviour specific to applets.
+ */
 public class PluginBridge extends JNLPFile {
+    String name;
+    String[] jars = new String[0];
+    String[] cacheJars = new String[0];
+    String[] cacheExJars = new String[0];
+    Hashtable<String, String> atts;
+    private String name;
+    private Set<String> jars = new HashSet<String>();
+    //Folders can be added to the code-base through the archive tag
+    private List<String> codeBaseFolders = new ArrayList<String>();
+    private String[] cacheJars = new String[0];
+    private String[] cacheExJars = new String[0];
+    private Map<String, String> atts;
     private boolean usePack;
     private boolean useVersion;
     private boolean codeBaseLookup;
+    private boolean useJNLPHref;
+    /**
+     * Creates a new PluginBridge using a default JNLPCreator.
+     */
     public PluginBridge(URL codebase, URL documentBase, String jar, String main,
+                        int width, int height, Hashtable<String, String> atts)
+                        int width, int height, Map<String, String> atts,
+                        String uKey)
+            throws Exception {
+        this(codebase, documentBase, jar, main, width, height, atts, uKey, new JNLPCreator());
+    }
+    /**
+     * Handles archive tag entries, which may be folders or jar files
+     * @param archives the components of the archive tag
+     */
+    private void addArchiveEntries(String[] archives) {
+        for (String archiveEntry : archives){
+            // trim white spaces
+            archiveEntry = archiveEntry.trim();
+            /*Only '/' on linux, '/' or '\\' on windows*/
+            if (archiveEntry.endsWith("/") || archiveEntry.endsWith(File.pathSeparator)) {
+                this.codeBaseFolders.add(archiveEntry);
+            } else {
+                this.jars.add(archiveEntry);
+            }
+        }
+    }
+    public PluginBridge(URL codebase, URL documentBase, String archive, String main,
+                        int width, int height, Map<String, String> atts,
+                        String uKey, JNLPCreator jnlpCreator)
             throws Exception {
         specVersion = new Version("1.0");
 …
         this.codeBase = codebase;
         this.sourceLocation = documentBase;
+        this.atts = atts;
         if (atts.containsKey("jnlp_href")) {
+            useJNLPHref = true;
             try {
+                URL jnlp = new URL(codeBase.toExternalForm() + atts.get("jnlp_href"));
+                JNLPFile jnlpFile = new JNLPFile(jnlp);
+                // Use codeBase as the context for the URL. If jnlp_href's
+                // value is a complete URL, it will replace codeBase's context.
+                URL jnlp = new URL(codeBase, atts.get("jnlp_href"));
+                JNLPFile jnlpFile = jnlpCreator.create(jnlp, null, false, JNLPRuntime.getDefaultUpdatePolicy(), codeBase);
                 Map<String, String> jnlpParams = jnlpFile.getApplet().getParameters();
+                info = jnlpFile.info;
                 // Change the parameter name to lowercase to follow conventions.
                 for (Map.Entry<String, String> entry : jnlpParams.entrySet()) {
                     atts.put(entry.getKey().toLowerCase(), entry.getValue());
+                    this.atts.put(entry.getKey().toLowerCase(), entry.getValue());
+                }
+                JARDesc[] jarDescs = jnlpFile.getResources().getJARs();
+                for (JARDesc jarDesc : jarDescs) {
+                     String fileName = jarDesc.getLocation().toExternalForm();
+                     this.jars.add(fileName);
+                 }
             } catch (MalformedURLException e) {
                 // Don't fail because we cannot get the jnlp file. Parameters are optional not required.
                 // it is the site developer who should ensure that file exist.
+                System.err.println("Unable to get JNLP file at: " + codeBase.toExternalForm()
+                        + atts.get("jnlp_href"));
+            }
+                System.err.println("Unable to get JNLP file at: " + atts.get("jnlp_href")
+                        + " with context of URL as: " + codeBase.toExternalForm());
+            }
+        } else {
+            // Should we populate this list with applet attribute tags?
+            info = new ArrayList<InformationDesc>();
+            useJNLPHref = false;
+        }
 …
+        }
+        if (jar != null && jar.length() > 0) {
+            this.jars = jar.split(",");
+            // trim white spaces
+            for (int i = 0; i < this.jars.length; i++) {
+                this.jars[i] = this.jars[i].trim();
+            }
+        if (archive != null && archive.length() > 0) {
+            String[] archives = archive.split(",");
+            addArchiveEntries(archives);
             if (JNLPRuntime.isDebug()) {
+                System.err.println("Jar string: " + jar);
+                System.err.println("jars length: " + jars.length);
+            }
+        }
+        this.atts = atts;
+                System.err.println("Jar string: " + archive);
+                System.err.println("jars length: " + archives.length);
+            }
+        }
         name = atts.get("name");
 …
             main = main.substring(0, main.length() - 6);
+        launchType = new AppletDesc(name, main, documentBase, width,
+        // the class name should be of the form foo.bar.Baz not foo/bar/Baz
+        String mainClass = main.replace('/', '.');
+        launchType = new AppletDesc(name, mainClass, documentBase, width,
                                     height, atts);
 …
             security = null;
+        /* According to http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/applet-compatibility.html,
+         * classloaders are shared iff these properties match:
+         * codebase, cache_archive, java_archive, archive
+         *
+         * To achieve this, we create the uniquekey based on those 4 values,
+         * always in the same order. The initial "<NAME>=" parts ensure a
+         * bad tag cannot trick the loader into getting shared with another.
+         */
+        // Firefox sometimes skips the codebase if it is default  -- ".",
+        // so set it that way if absent
+        String codebaseAttr =      atts.get("codebase") != null ?
+                                   atts.get("codebase") : ".";
+        String cache_archiveAttr = atts.get("cache_archive") != null ?
+                                   atts.get("cache_archive") : "";
+        String java_archiveAttr =  atts.get("java_archive") != null ?
+                                   atts.get("java_archive") : "";
+        String archiveAttr =       atts.get("archive") != null ?
+                                   atts.get("archive") : "";
+        this.uniqueKey = "codebase=" + codebaseAttr +
+                         "cache_archive=" + cache_archiveAttr +
+                         "java_archive=" + java_archiveAttr +
+                         "archive=" +  archiveAttr;
+        this.uniqueKey = uKey;
         usePack = false;
         useVersion = false;
 …
+    }
+    public boolean useJNLPHref() {
+        return useJNLPHref;
+    }
     /**
      * {@inheritdoc }
 …
     public String getTitle() {
         return name;
+    }
-    public InformationDesc getInformation(final Locale locale) {
-        return new InformationDesc(this, new Locale[] { locale }) {
-            protected List<Object> getItems(Object key) {
-                // Should we populate this list with applet attribute tags?
-                return new ArrayList<Object>();
+            }
-        };
+    }
 …
                         jarDescs.addAll(sharedResources.getResources(JARDesc.class));
                         for (int i = 0; i < jars.length; i++)
                             if (jars[i].length() > 0)
                                 jarDescs.add(new JARDesc(new URL(codeBase, jars[i]),
+                        for (String name : jars) {
+                            if (name.length() > 0)
+                                jarDescs.add(new JARDesc(new URL(codeBase, name),
                                         null, null, false, true, false, true));
+                        }
                         boolean cacheable = true;
 …
                             cacheable = false;
                         for (int i = 0; i < cacheJars.length; i++) {
                             String[] jarAndVer = cacheJars[i].split(";");
+                        for (String cacheJar : cacheJars) {
+                            String[] jarAndVer = cacheJar.split(";");
                             String jar = jarAndVer[0];
 …
+                        }
                         for (int i = 0; i < cacheExJars.length; i++) {
                             if (cacheExJars[i].length() == 0)
+                        for (String cacheExJar : cacheExJars) {
+                            if (cacheExJar.length() == 0)
                                 continue;
                             String[] jarInfo = cacheExJars[i].split(";");
+                            String[] jarInfo = cacheExJar.split(";");
                             String jar = jarInfo[0].trim();
 …
     /**
+     * Returns the list of folders to be added to the codebase
+     */
+    public List<String> getCodeBaseFolders() {
+        return new ArrayList<String>(codeBaseFolders);
+    }
+    /**
      * Returns the resources section of the JNLP file for the
      * specified locale, os, and arch.

trunk/icedtea-web/netx/net/sourceforge/jnlp/ResourcesDesc.java

-              r348
+              r418
         JARDesc jars[] = getJARs();
+        for (int i = 0; i < jars.length; i++)
+            if (jars[i].isMain())
+                return jars[i];
+        for (JARDesc jar : jars) {
+            if (jar.isMain())
+                return jar;
+        }
         if (jars.length > 0)
 …
         Map<String, String> properties = new HashMap<String, String>();
         List<PropertyDesc> resources = getResources(PropertyDesc.class);
+        for (int i = 0; i < resources.size(); i++) {
+            PropertyDesc prop = resources.get(i);
+        for (PropertyDesc prop : resources) {
             properties.put(prop.getKey(), prop.getValue());
+        }
 …
         List<T> result = new ArrayList<T>();
+        for (int i = 0; i < resources.size(); i++)
+            if (type.isAssignableFrom(resources.get(i).getClass()))
+                result.add(type.cast(resources.get(i)));
+        for (Object resource : resources) {
+            if (type.isAssignableFrom(resource.getClass()))
+                result.add(type.cast(resource));
+        }
         return result;

trunk/icedtea-web/netx/net/sourceforge/jnlp/SecurityDesc.java

-              r348
+              r418
         // discard sandbox, give all
         if (type == ALL_PERMISSIONS) {
+        if (ALL_PERMISSIONS.equals(type)) {
             permissions = new Permissions();
             if (customTrustedPolicy == null) {
 …
         // add j2ee to sandbox if needed
         if (type == J2EE_PERMISSIONS)
+        if (J2EE_PERMISSIONS.equals(type))
             for (int i = 0; i < j2eePermissions.length; i++)
                 permissions.add(j2eePermissions[i]);
 …
                 permissions.add(jnlpRIAPermissions[i]);
         if (downloadHost != null)
+        if (downloadHost != null && downloadHost.length() > 0)
             permissions.add(new SocketPermission(downloadHost,
                                                  "connect, accept"));
 …
         return permissions;
+    }
+    /**
+     * Returns all the names of the basic JNLP system properties accessible by RIAs
+     */
+    public static String[] getJnlpRIAPermissions() {
+        String[] jnlpPermissions = new String[jnlpRIAPermissions.length];
+        for (int i = 0; i < jnlpRIAPermissions.length; i++)
+            jnlpPermissions[i] = jnlpRIAPermissions[i].getName();
+        return jnlpPermissions;
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/Version.java

-              r348
+              r418
         // compare as integers
+        // for normalization key, compare exact object, not using .equals
         try {
             if (!(part1 == emptyString)) // compare to magic normalization key
 …
+        }
         if (part1 == emptyString)
+        if (part1 == emptyString) // compare to magic normalization key
             part1 = "";
         if (part2 == emptyString)
+        if (part2 == emptyString) // compare to magic normalization key
             part2 = "";

trunk/icedtea-web/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java

-              r348
+              r418
 package net.sourceforge.jnlp.cache;
+import java.util.Set;
+import static  net.sourceforge.jnlp.runtime.Translator.R;
 import java.io.File;
 import java.io.IOException;
 …
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 …
     /* location of cache directory */
     private final String cacheDir = new File(JNLPRuntime.getConfiguration()
             .getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR)).getPath();
+    private final String setCachePath = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
+    private final String cacheDir = new File(setCachePath != null ? setCachePath : System.getProperty("java.io.tmpdir")).getPath();
     /*
 …
      */
     public synchronized void load() {
+        cacheOrder.load();
+        boolean loaded = cacheOrder.load();
+        /*
+         * clean up possibly corrupted entries
+         */
+        if (loaded && checkData()) {
+            if (JNLPRuntime.isDebug()) {
+                new LruCacheException().printStackTrace();
+            }
+            System.out.println(R("CFakeCache"));
+            store();
+            System.out.println(R("CFakedCache"));
+        }
+    }
+    /**
+     * check content of cacheOrder and remove invalid/corrupt entries
+     *
+     * @return true, if cache was corrupted and affected entry removed
+     */
+    private boolean checkData () {
+        boolean modified = false;
+        Set<Entry<Object, Object>> q = cacheOrder.entrySet();
+        for (Iterator<Entry<Object, Object>> it = q.iterator(); it.hasNext();) {
+            Entry<Object, Object> currentEntry = it.next();
+            final String key = (String) currentEntry.getKey();
+            final String path = (String) currentEntry.getValue();
+            // 1. check key format: "milliseconds,number"
+            try {
+                String sa[] = key.split(",");
+                Long l1 = Long.parseLong(sa[0]);
+                Long l2 = Long.parseLong(sa[1]);
+            } catch (Exception ex) {
+                it.remove();
+                modified = true;
+                continue;
+            }
+            // 2. check path format - does the path look correct?
+            if (path != null) {
+                if (path.indexOf(cacheDir) < 0) {
+                    it.remove();
+                    modified = true;
+                }
+            } else {
+                it.remove();
+                modified = true;
+            }
+        }
+        return modified;
+    }
 …
             @Override
             public int compare(Entry<String, String> e1, Entry<String, String> e2) {
+                try {
+                    Long t1 = Long.parseLong(e1.getKey().split(",")[0]);
+                    Long t2 = Long.parseLong(e2.getKey().split(",")[0]);
+                    int c = t1.compareTo(t2);
+                    return c < 0 ? 1 : (c > 0 ? -1 : 0);
+                } catch (NumberFormatException e) {
+                    // Perhaps an error is too harsh. Maybe just somehow turn
+                    // caching off if this is the case.
+                    throw new InternalError("Corrupt LRU file entries");
+                }
+                Long t1 = Long.parseLong(e1.getKey().split(",")[0]);
+                Long t2 = Long.parseLong(e2.getKey().split(",")[0]);
+                int c = t1.compareTo(t2);
+                return c < 0 ? 1 : (c > 0 ? -1 : 0);
+            }
         });
 …
         return System.currentTimeMillis() + "," + getIdForCacheFolder(path);
+    }
+    void clearLRUSortedEntries() {
+        cacheOrder.clear();
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/cache/CacheUtil.java

-              r382
+              r418
 public class CacheUtil {
     private static final String cacheDir = new File(JNLPRuntime.getConfiguration()
             .getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR)).getPath(); // Do this with file to standardize it.
+    private static final String setCacheDir = JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_CACHE_DIR);
+    private static final String cacheDir = new File(setCacheDir != null ? setCacheDir : System.getProperty("java.io.tmpdir")).getPath(); // Do this with file to standardize it.
     private static final CacheLRUWrapper lruHandler = CacheLRUWrapper.getInstance();
     private static final HashMap<String, FileLock> propertiesLockPool = new HashMap<String, FileLock>();
 …
      */
     public static boolean urlEquals(URL u1, URL u2) {
         if (u1 == u2)
+        if (u1 == u2) {
             return true;
+        if (u1 == null || u2 == null)
+            return false;
+        if (!compare(u1.getProtocol(), u2.getProtocol(), true) ||
+                !compare(u1.getHost(), u2.getHost(), true) ||
+                //u1.getDefaultPort() != u2.getDefaultPort() || // only in 1.4
+                !compare(u1.getPath(), u2.getPath(), false) ||
+                !compare(u1.getQuery(), u2.getQuery(), false) ||
+                !compare(u1.getRef(), u2.getRef(), false))
+            return false;
+        else
+        }
+        if (u1 == null || u2 == null) {
+            return false;
+        }
+        if (notNullUrlEquals(u1, u2)) {
             return true;
+    }
+        }
+        try {
+            URL nu1 = ResourceTracker.normalizeUrl(u1, false);
+            URL nu2 = ResourceTracker.normalizeUrl(u2, false);
+            if (notNullUrlEquals(nu1, nu2)) {
+                return true;
+            }
+        } catch (Exception ex) {
+            //keep silent here and return false
+        }
+        return false;
+    }
+    private static boolean notNullUrlEquals(URL u1, URL u2) {
+        if (!compare(u1.getProtocol(), u2.getProtocol(), true)
+                || !compare(u1.getHost(), u2.getHost(), true)
+                || //u1.getDefaultPort() != u2.getDefaultPort() || // only in 1.4
+                !compare(u1.getPath(), u2.getPath(), false)
+                || !compare(u1.getQuery(), u2.getQuery(), false)
+                || !compare(u1.getRef(), u2.getRef(), false)) {
+            return false;
+        } else {
+            return true;
+        }
+    }
     /**
      * Caches a resource and returns a URL for it in the cache;
 …
      * and we check for those by calling {@link #okToClearCache()}
      */
     public static void clearCache() {
+    public static boolean clearCache() {
         if (!okToClearCache()) {
             System.err.println(R("CCannotClearCache"));
             return;
+            return false;
+        }
         File cacheDir = new File(CacheUtil.cacheDir);
         if (!(cacheDir.isDirectory())) {
             return;
+            return false;
+        }
 …
             throw new RuntimeException(e);
+        }
+        return true;
+    }
 …
             if (cacheFile == null) { // We did not find a copy of it.
                 cacheFile = makeNewCacheFile(source, version);
+            }
             lruHandler.store();
+            } else
+                lruHandler.store();
             lruHandler.unlock();
+        }
 …
                 final String path = e.getValue();
+                if (path != null) {
+                    if (pathToURLPath(path).equals(urlPath.getPath())) { // Match found.
+                        cacheFile = new File(path);
+                        lruHandler.updateEntry(key);
+                        break; // Stop searching since we got newest one already.
+                    }
+                if (pathToURLPath(path).equals(urlPath.getPath())) { // Match found.
+                    cacheFile = new File(path);
+                    lruHandler.updateEntry(key);
+                    break; // Stop searching since we got newest one already.
+                }
+            }
 …
             // only resources not starting out downloaded are displayed
             List<URL> urlList = new ArrayList<URL>();
             for (int i = 0; i < resources.length; i++) {
                 if (!tracker.checkResource(resources[i]))
                     urlList.add(resources[i]);
+            for (URL url : resources) {
+                if (!tracker.checkResource(url))
+                    urlList.add(url);
+            }
             URL undownloaded[] = urlList.toArray(new URL[urlList.size()]);
 …
                 long total = 0;
                 for (int i = 0; i < undownloaded.length; i++) {
+                for (URL url : undownloaded) {
                     // add in any -1's; they're insignificant
                     total += tracker.getTotalSize(undownloaded[i]);
                     read += tracker.getAmountRead(undownloaded[i]);
+                    total += tracker.getTotalSize(url);
+                    read += tracker.getAmountRead(url);
+                }
                 int percent = (int) ((100 * read) / Math.max(1, total));
                 for (int i = 0; i < undownloaded.length; i++)
                     listener.progress(undownloaded[i], "version",
                                       tracker.getAmountRead(undownloaded[i]),
                                       tracker.getTotalSize(undownloaded[i]),
+                for (URL url : undownloaded) {
+                    listener.progress(url, "version",
+                                      tracker.getAmountRead(url),
+                                      tracker.getTotalSize(url),
                                       percent);
+                }
             } while (!tracker.waitForResources(resources, indicator.getUpdateRate()));
             // make sure they read 100% until indicator closes
             for (int i = 0; i < undownloaded.length; i++)
                 listener.progress(undownloaded[i], "version",
                                   tracker.getTotalSize(undownloaded[i]),
                                   tracker.getTotalSize(undownloaded[i]),
+            for (URL url : undownloaded) {
+                listener.progress(url, "version",
+                                  tracker.getTotalSize(url),
+                                  tracker.getTotalSize(url),
 );
+            }
         } catch (InterruptedException ex) {
             if (JNLPRuntime.isDebug())
 …
      */
     public static void cleanCache() {
         if (okToClearCache()) {
             // First we want to figure out which stuff we need to delete.
 …
                 // Check if the item is contained in cacheOrder.
                 final String key = e.getKey();
+                final String value = e.getValue();
+                if (value != null) {
+                    File file = new File(value);
+                    PropertiesFile pf = new PropertiesFile(new File(value + ".info"));
+                    boolean delete = Boolean.parseBoolean(pf.getProperty("delete"));
+                    /*
+                     * This will get me the root directory specific to this cache item.
+                     * Example:
+                     *  cacheDir = /home/user1/.icedtea/cache
+                     *  file.getPath() = /home/user1/.icedtea/cache/0/http/www.example.com/subdir/a.jar
+                     *  rStr first becomes: /0/http/www.example.com/subdir/a.jar
+                     *  then rstr becomes: /home/user1/.icedtea/cache/0
+                     */
+                    String rStr = file.getPath().substring(cacheDir.length());
+                    rStr = cacheDir + rStr.substring(0, rStr.indexOf(File.separatorChar, 1));
+                    long len = file.length();
+                    if (keep.contains(file.getPath().substring(rStr.length()))) {
+                        lruHandler.removeEntry(key);
+                        continue;
+                    }
+                    /*
+                     * we remove entries from our lru if any of the following condition is met.
+                     * Conditions:
+                     *  - delete: file has been marked for deletion.
+                     *  - !file.isFile(): if someone tampered with the directory, file doesn't exist.
+                     *  - maxSize >= 0 && curSize + len > maxSize: If a limit was set and the new size
+                     *  on disk would exceed the maximum size.
+                     */
+                    if (delete || !file.isFile() || (maxSize >= 0 && curSize + len > maxSize)) {
+                        lruHandler.removeEntry(key);
+                        remove.add(rStr);
+                    } else {
+                        curSize += len;
+                        keep.add(file.getPath().substring(rStr.length()));
+                        for (File f : file.getParentFile().listFiles()) {
+                            if (!(f.equals(file) || f.equals(pf.getStoreFile()))){
+                                try {
+                                    FileUtils.recursiveDelete(f, f);
+                                } catch (IOException e1) {
+                                    e1.printStackTrace();
+                                }
+                            }
+                final String path = e.getValue();
+                File file = new File(path);
+                PropertiesFile pf = new PropertiesFile(new File(path + ".info"));
+                boolean delete = Boolean.parseBoolean(pf.getProperty("delete"));
+                /*
+                 * This will get me the root directory specific to this cache item.
+                 * Example:
+                 *  cacheDir = /home/user1/.icedtea/cache
+                 *  file.getPath() = /home/user1/.icedtea/cache/0/http/www.example.com/subdir/a.jar
+                 *  rStr first becomes: /0/http/www.example.com/subdir/a.jar
+                 *  then rstr becomes: /home/user1/.icedtea/cache/0
+                 */
+                String rStr = file.getPath().substring(cacheDir.length());
+                rStr = cacheDir + rStr.substring(0, rStr.indexOf(File.separatorChar, 1));
+                long len = file.length();
+                if (keep.contains(file.getPath().substring(rStr.length()))) {
+                    lruHandler.removeEntry(key);
+                    continue;
+                }
+                /*
+                 * we remove entries from our lru if any of the following condition is met.
+                 * Conditions:
+                 *  - delete: file has been marked for deletion.
+                 *  - !file.isFile(): if someone tampered with the directory, file doesn't exist.
+                 *  - maxSize >= 0 && curSize + len > maxSize: If a limit was set and the new size
+                 *  on disk would exceed the maximum size.
+                 */
+                if (delete || !file.isFile() || (maxSize >= 0 && curSize + len > maxSize)) {
+                    lruHandler.removeEntry(key);
+                    remove.add(rStr);
+                    continue;
+                }
+                curSize += len;
+                keep.add(file.getPath().substring(rStr.length()));
+                for (File f : file.getParentFile().listFiles()) {
+                    if (!(f.equals(file) || f.equals(pf.getStoreFile()))) {
+                        try {
+                            FileUtils.recursiveDelete(f, f);
+                        } catch (IOException e1) {
+                            e1.printStackTrace();
+                        }
+                    }
+                } else {
+                    lruHandler.removeEntry(key);
+                }
+            }

trunk/icedtea-web/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java

-              r348
+              r418
 import net.sourceforge.jnlp.runtime.*;
+import net.sourceforge.jnlp.util.ImageResources;
 /**
 …
     /** the display window */
     private static JFrame frame;
+    private static final Object frameMutex = new Object();
     /** shared constraint */
 …
         DownloadPanel result = new DownloadPanel(downloadName);
+        if (frame == null) {
+            frame = new JFrame(downloading + "...");
+            frame.getContentPane().setLayout(new GridBagLayout());
+        }
+        if (resources != null)
+            for (int i = 0; i < resources.length; i++)
+                result.addProgressPanel(resources[i], null);
+        frame.getContentPane().add(result, vertical);
+        frame.pack();
+        if (!frame.isVisible()) {
+            Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+            Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(frame.getGraphicsConfiguration());
+            Dimension screen = new Dimension(screenSize.width - insets.left,
+                    screenSize.height - insets.top);
+            frame.setLocation(screen.width - frame.getWidth(),
+                              screen.height - frame.getHeight());
+        }
+        frame.setVisible(true);
+        return result;
+        synchronized (frameMutex) {
+            if (frame == null) {
+                frame = new JFrame(downloading + "...");
+                frame.setIconImages(ImageResources.INSTANCE.getApplicationImages());
+                frame.getContentPane().setLayout(new GridBagLayout());
+            }
+            if (resources != null) {
+                for (URL url : resources) {
+                    result.addProgressPanel(url, null);
+                }
+            }
+            frame.getContentPane().add(result, vertical);
+            frame.pack();
+            if (!frame.isVisible()) {
+                Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+                Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(frame.getGraphicsConfiguration());
+                Dimension screen = new Dimension(screenSize.width - insets.left,
+                        screenSize.height - insets.top);
+                frame.setLocation(screen.width - frame.getWidth(),
+                        screen.height - frame.getHeight());
+            }
+            frame.setVisible(true);
+            return result;
+        }
+    }
 …
         ActionListener hider = new ActionListener() {
             public void actionPerformed(ActionEvent evt) {
+                if (frame.getContentPane().getComponentCount() == 1)
+                    frame.setVisible(false);
+                frame.getContentPane().remove((DownloadPanel) listener);
+                frame.pack();
+                synchronized(frameMutex) {
+                    frame.getContentPane().remove((DownloadPanel) listener);
+                    frame.pack();
+                    if (frame.getContentPane().getComponentCount() == 0) {
+                        frame.setVisible(false);
+                        frame.dispose();
+                        frame = null;
+                    }
+                }
+            }
         };
 …
                 add(panel, verticalIndent);
+                frame.pack();
+                synchronized (frameMutex) {
+                    frame.pack();
+                }
                 urls.add(url);

trunk/icedtea-web/netx/net/sourceforge/jnlp/cache/Resource.java

r348	r418
273	273	}
274	274
275		for (int i = 0; i < send.size(); i++) {
276		ResourceTracker rt = send.get(i);
	275	for (ResourceTracker rt : send) {
277	276	rt.fireDownloadEvent(this);
278	277	}

trunk/icedtea-web/netx/net/sourceforge/jnlp/cache/ResourceTracker.java

-              r348
+              r418
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 …
     private static final int STARTED = Resource.STARTED;
+    // normalization of url
+    private static final char PATH_DELIMITER_MARK = '/';
+    private static final String PATH_DELIMITER = "" + PATH_DELIMITER_MARK;
+    private static final char QUERY_DELIMITER_MARK = '&';
+    private static final String QUERY_DELIMITER = "" + QUERY_DELIMITER_MARK;
+    private static final char QUERY_MARK = '?';
+    private static final char HREF_MARK = '#';
+    private static final String UTF8 = "utf-8";
     /** max threads */
     private static final int maxThreads = 5;
 …
     public void addResource(URL location, Version version, DownloadOptions options, UpdatePolicy updatePolicy) {
         if (location == null)
+            throw new IllegalArgumentException("location==null");
+            throw new IllegalResourceDescriptorException("location==null");
+        try {
+            location = normalizeUrl(location, JNLPRuntime.isDebug());
+        } catch (Exception ex) {
+            System.err.println("Normalization of " + location.toString() + " have failed");
+            ex.printStackTrace();
+        }
         Resource resource = Resource.getResource(location, version, updatePolicy);
         boolean downloaded = false;
 …
      * collected.
+     *
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     public void removeResource(URL location) {
 …
         DownloadEvent event = new DownloadEvent(this, resource);
         for (int i = 0; i < l.length; i++) {
+        for (DownloadListener dl : l) {
             if (0 != ((ERROR | DOWNLOADED) & status))
                 l[i].downloadCompleted(event);
+                dl.downloadCompleted(event);
             else if (0 != (DOWNLOADING & status))
                 l[i].downloadStarted(event);
+                dl.downloadStarted(event);
             else if (0 != (CONNECTING & status))
                 l[i].updateStarted(event);
+                dl.updateStarted(event);
+        }
+    }
 …
      * @param location the resource location
      * @return the resource, or null if it could not be downloaded
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      * @see CacheUtil#isCacheable
      */
 …
      * @param location the resource location
      * @return a local file containing the resource, or null
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      * @see CacheUtil#isCacheable
      */
 …
+     *
      * @throws IOException if there was an error opening the stream
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     public InputStream getInputStream(URL location) throws IOException {
 …
      * @param timeout the time in ms to wait before returning, 0 for no timeout
      * @return whether the resources downloaded before the timeout
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     public boolean waitForResources(URL urls[], long timeout) throws InterruptedException {
 …
         synchronized (resources) {
             // keep the lock so getResource doesn't have to aquire it each time
             for (int i = 0; i < urls.length; i++)
+            for (int i = 0; i < urls.length; i++) {
                 resources[i] = getResource(urls[i]);
+            }
+        }
 …
      * @return whether the resource downloaded before the timeout
      * @throws InterruptedException if another thread interrupted the wait
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     public boolean waitForResource(URL location, long timeout) throws InterruptedException {
 …
      * @param location the resource location
      * @return the number of bytes transferred
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     public long getAmountRead(URL location) {
 …
      * accessed with the getCacheFile method).
+     *
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     public boolean checkResource(URL location) {
 …
+     *
      * @return true if the resource is already downloaded (or an error occurred)
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     public boolean startResource(URL location) {
 …
+     *
      * @return true if the resource is already downloaded (or an error occurred)
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     private boolean startResource(Resource resource) {
 …
      * @param location the resource location
      * @return the number of bytes, or -1
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     public long getTotalSize(URL location) {
 …
         synchronized (lock) {
             if (!resource.isSet(CONNECT | DOWNLOAD))
                 throw new IllegalArgumentException("Invalid resource state (resource: " + resource + ")");
+                throw new IllegalResourceDescriptorException("Invalid resource state (resource: " + resource + ")");
             queue.add(resource);
 …
+        }
         URL bestUrl = null;
+        for (int i = 0; i < urls.size(); i++) {
+            URL url = urls.get(i);
+        for (URL url : urls) {
             try {
                 URLConnection connection = url.openConnection();
 …
         int score = Integer.MAX_VALUE;
+        for (int i = 0; i < source.size(); i++) {
+            Resource resource = source.get(i);
+        for (Resource resource : source) {
             boolean selectable = false;
 …
                 int activeCount = 0;
                 for (int j = 0; j < active.size(); j++)
                     if (active.get(j) == resource.getTracker())
+                for (ResourceTracker rt : active) {
+                    if (rt == resource.getTracker())
                         activeCount++;
+                }
                 // try to spread out the downloads so that a slow host
 …
      * Return the resource matching the specified URL.
+     *
      * @throws IllegalArgumentException if the resource is not being tracked
+     * @throws IllegalResourceDescriptorException if the resource is not being tracked
      */
     private Resource getResource(URL location) {
         synchronized (resources) {
+            for (int i = 0; i < resources.size(); i++) {
+                Resource resource = resources.get(i);
+            for (Resource resource : resources) {
                 if (CacheUtil.urlEquals(resource.location, location))
                     return resource;
 …
+        }
         throw new IllegalArgumentException("Location does not specify a resource being tracked.");
+        throw new IllegalResourceDescriptorException("Location does not specify a resource being tracked.");
+    }
 …
         // start them downloading / connecting in background
+        for (int i = 0; i < resources.length; i++)
+            startResource(resources[i]);
+        for (Resource resource : resources) {
+            startResource(resource);
+        }
         // wait for completion
 …
             synchronized (lock) {
                 // check for completion
                 for (int i = 0; i < resources.length; i++) {
+                for (Resource resource : resources) {
                     //NetX Deadlocking may be solved by removing this
                     //synch block.
                     synchronized (resources[i]) {
                         if (!resources[i].isSet(DOWNLOADED | ERROR)) {
+                    synchronized (resource) {
+                        if (!resource.isSet(DOWNLOADED | ERROR)) {
                             finished = false;
                             break;
 …
     };
+    private static String normalizeChunk(String base, boolean debug) throws UnsupportedEncodingException {
+        if (base == null) {
+            return base;
+        }
+        if ("".equals(base)) {
+            return base;
+        }
+        String result = base;
+        String ssE = URLDecoder.decode(base, UTF8);
+        //            System.out.println("*" + base + "*");
+        //            System.out.println("-" + ssE + "-");
+        if (base.equals(ssE)) {
+            result = URLEncoder.encode(base, UTF8);
+            if (debug) {
+                System.out.println(base + " chunk needs to be encoded => " + result);
+            }
+        } else {
+            if (debug) {
+                System.out.println(base + " chunk already encoded");
+            }
+        }
+        return result;
+    }
+    public static URL normalizeUrl(URL u, boolean debug) throws MalformedURLException, UnsupportedEncodingException {
+        if (u == null) {
+            return null;
+        }
+        String protocol = u.getProtocol();
+        if (protocol == null || "file".equals(protocol)) {
+            return u;
+        }
+        String file = u.getPath();
+        if (file == null) {
+            return u;
+        }
+        String host = u.getHost();
+        String ref = u.getRef();
+        int port = u.getPort();
+        String query = u.getQuery();
+        String[] qq = {};
+        if (query != null) {
+            qq = query.split(QUERY_DELIMITER);
+        }
+        String[] ss = file.split(PATH_DELIMITER);
+        int normalized = 0;
+        if (debug) {
+            System.out.println("normalizing path " + file + " in " + u.toString());
+        }
+        for (int i = 0; i < ss.length; i++) {
+            String base = ss[i];
+            String r = normalizeChunk(base, debug);
+            if (!r.equals(ss[i])) {
+                normalized++;
+            }
+            ss[i] = r;
+        }
+        if (debug) {
+            System.out.println("normalizing query " + query + " in " + u.toString());
+        }
+        for (int i = 0; i < qq.length; i++) {
+            String base = qq[i];
+            String r = normalizeChunk(base, debug);
+            if (!r.equals(qq[i])) {
+                normalized++;
+            }
+            qq[i] = r;
+        }
+        if (normalized == 0) {
+            if (debug) {
+                System.out.println("Nothing was normalized in this url");
+            }
+            return u;
+        } else {
+            if (debug) {
+                System.out.println(normalized + " chunks normalized, rejoining url");
+            }
+        }
+        StringBuilder composed = new StringBuilder("");
+        for (int i = 0; i < ss.length; i++) {
+            String string = ss[i];
+            if (ss.length <= 1 || (string != null && !"".equals(string))) {
+                composed.append(PATH_DELIMITER_MARK).append(string);
+            }
+        }
+        String composed1 = composed.toString();
+        if (query != null && !query.trim().equals("")) {
+            composed.append(QUERY_MARK);
+            for (int i = 0; i < qq.length; i++) {
+                String string = qq[i];
+                if ((string != null && !"".equals(string))) {
+                    composed.append(string);
+                    if (i != qq.length - 1) {
+                        composed.append(QUERY_DELIMITER_MARK);
+                    }
+                }
+            }
+        }
+        String composed2 = composed.substring(composed1.length() - 1);
+        if (ref != null && !ref.trim().equals("")) {
+            composed.append(HREF_MARK).append(ref);
+        }
+        URL result = new URL(protocol, host, port, composed.toString());
+        if (debug) {
+            System.out.println("normalized `" + composed1 + "` and `" + composed2 + "` in " + result.toString());
+        }
+        return result;
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java

-              r348
+              r418
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.Translator;
+import net.sourceforge.jnlp.util.ImageResources;
 /**
 …
     public AdvancedProxySettingsDialog(DeploymentConfiguration config) {
         super((Frame) null, dialogTitle, true); // Don't need a parent.
+        setIconImages(ImageResources.INSTANCE.getApplicationImages());
         this.config = config;

trunk/icedtea-web/netx/net/sourceforge/jnlp/controlpanel/CacheViewer.java

-              r348
+              r418
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.Translator;
+import net.sourceforge.jnlp.util.ImageResources;
 /**
 …
     public CacheViewer(DeploymentConfiguration config) {
         super((Frame) null, dialogTitle, true); // Don't need a parent.
+        setIconImages(ImageResources.INSTANCE.getApplicationImages());
         this.config = config;

trunk/icedtea-web/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java

-              r348
+              r418
 import net.sourceforge.jnlp.security.KeyStores;
 import net.sourceforge.jnlp.security.viewer.CertificatePane;
+import net.sourceforge.jnlp.util.ImageResources;
 /**
 …
         super();
         setTitle(Translator.R("CPHead"));
+        setIconImages(ImageResources.INSTANCE.getApplicationImages());
         this.config = config;

trunk/icedtea-web/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java

-              r348
+              r418
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.io.File;
 import javax.swing.JButton;
 …
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JSlider;
 …
                 JFileChooser fileChooser = new JFileChooser();
                 fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                fileChooser.setFileHidingEnabled(false);
                 if (fileChooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
+                    // Check if we have permission to write to that location.
                     String result = fileChooser.getSelectedFile().getAbsolutePath();
+                    location.setText(result);
+                    config.setProperty(properties[1], result);
+                    File dirLocation = new File(result);
+                    boolean canWrite = dirLocation.canWrite();
+                    while (!canWrite && dirLocation != null){ // File does not exist, or no permission.
+                        if (dirLocation.exists()) {
+                            JOptionPane.showMessageDialog(null, "No permission to write to this location.");
+                            return;
+                        }
+                        dirLocation = dirLocation.getParentFile();
+                        canWrite = dirLocation.canWrite();
+                    }
+                    if (canWrite) {
+                        location.setText(result);
+                        config.setProperty(properties[1], result);
+                    }
+                }
+            }

trunk/icedtea-web/netx/net/sourceforge/jnlp/resources/Messages.properties

-              r372
+              r418
 LSignedAppJarUsingUnsignedJar=Signed application using unsigned jars.
 LSignedAppJarUsingUnsignedJarInfo=The main application jar is signed, but some of the jars it is using aren't.
+LSignedJNLPFileDidNotMatch=The signed JNLP file did not match the launching JNLP file.
+LNoSecInstance=Error: No security instance for {0}. The application may have trouble continuing
+LCertFoundIn={0} found in cacerts ({1})
 JNotApplet=File is not an applet.
 JNotApplication=File is not an application.
 …
 PTwoMains=Duplicate main JAR defined in a resources element (there can be only one)
 PNativeHasMain=Cannot specify main attribute on native JARs.
+PNoInfoElement=No information section defined
+PNoInfoElement=No information section defined.
+PMissingTitle=title
+PMissingVendor=vendor
+PMissingElement=The {0} section has not been defined for your locale nor does a default value exist in the JNLP file.
 PTwoDescriptions=Duplicate description of kind {0}
 PSharing=Element "sharing-allowed" is illegal in a standard JNLP file
 …
 PUrlNotInCodebase=Relative URL does not specify a subdirectory of the codebase. (node={0}, href={1}, base={2})
 PBadRelativeUrl=Invalid relative URL (node={0}, href={1}, base={2})
 PBadNonrelativeUrl=Invalid non-relative URL (node={0}, href={0}).
+PBadNonrelativeUrl=Invalid non-relative URL (node={0}, href={1})
 PNeedsAttribute=The {0} element must specify a {1} attribute.
 PBadXML=Invalid XML document syntax.
 …
 CChooseCacheDir=Cache directory
 CCannotClearCache=Can not clear cache at this time
+CFakeCache=Cache is corrupt. Fixing.
+CFakedCache=Cache is corrupt and has been fixed. It is strongly recommended that you run 'javaws -Xclearcache' and rerun your application as soon as possible.
 # Security
 …
 SSignatureError=The application's digital signature has an error. Do you want to run the application?
 SUntrustedSource=The digital signature could not be verified by a trusted source. Only run if you trust the origin of the application.
+SWarnFullPermissionsIgnorePolicy=The code executed will be given full permissions, ignoring any java policies you may have.
 STrustedSource=The digital signature has been validated by a trusted source.
 SClipboardReadAccess=The application has requested read-only access to the system clipboard. Do you want to allow this action?
 …
 SNetworkAccess=The application has requested permission to establish connections to {0}. Do you want to allow this action?
 SNoAssociatedCertificate=<no associated certificate>
+SUnverified=(unverified)
 SAlwaysTrustPublisher=Always trust content from this publisher
 SHttpsUnverified=The website's certificate cannot be verified.
+SHttpsUnverified=The website's HTTPS certificate cannot be verified.
 SNotAllSignedSummary=Only parts of this application code are signed.
 SNotAllSignedDetail=This application contains both signed and unsigned code. While signed code is safe if you trust the provider, unsigned code may imply code outside of the trusted provider's control.
 SNotAllSignedQuestion=Do you wish to proceed and run this application anyway?
 SAuthenticationPrompt=The {0} server at {1} is requesting authentication. It says "{2}"
+SJNLPFileIsNotSigned=This application contains a digital signature in which the launching JNLP file is not signed.
 # Security - used for the More Information dialog
 …
 CVDetails=Details
 CVExport=Export
+CVExportPasswordMessage=Enter password to protect key file:
 CVImport=Import
+CVImportPasswordMessage=Enter password to access file:
 CVIssuedBy=Issued By
 CVIssuedTo=Issued To
+CVPasswordTitle=Authentication Required
 CVRemove=Remove
 CVRemoveConfirmMessage=Are you sure you want to remove the selected certificate?

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java

-              r348
+              r418
         List<AppletAudioClip> clips = weakClips.hardList();
         for (int i = 0; i < clips.size(); i++) {
             clips.get(i).dispose();
+        for (AppletAudioClip clip : clips) {
+            clip.dispose();
+        }
+    }
 …
     /**
+     * Set the applet of this environment; can only be called once.
+     */
+    public void setApplet(Applet applet) {
+        if (this.applet != null) {
+            if (JNLPRuntime.isDebug()) {
+                Exception ex = new IllegalStateException("Applet can only be set once.");
+                ex.printStackTrace();
+            }
+            return;
+        }
+        this.applet = applet;
+    }
+    /**
      * Returns an enumeration that contains only the applet
      * from the JNLP file.

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/AppletInstance.java

-              r348
+              r418
         this.environment = new AppletEnvironment(file, this);
+    }
+    /**
+     * Set the applet of this launched application; can only be called once.
+     */
+    public void setApplet(Applet applet) {
+        if (this.applet != null) {
+            if (JNLPRuntime.isDebug()) {
+                Exception ex = new IllegalStateException("Applet can only be set once.");
+                ex.printStackTrace();
+            }
+            return;
+        }
+        this.applet = applet;
+    }

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java

-              r348
+              r418
         PrivilegedAction<Object> installProps = new PrivilegedAction<Object>() {
             public Object run() {
                 for (int i = 0; i < props.length; i++) {
                     System.setProperty(props[i].getKey(), props[i].getValue());
+                for (PropertyDesc propDesc : props) {
+                    System.setProperty(propDesc.getKey(), propDesc.getValue());
+                }
 …
         try {
             // destroy resources
+            for (int i = 0; i < weakWindows.size(); i++) {
+                Window w = weakWindows.get(i);
+            for (Window w : weakWindows) {
                 if (w != null)
                     w.dispose();

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/Boot.java

-              r348
+              r418
             JNLPRuntime.setForksAllowed(false);
+        }
+        if (null != getOption("-Xtrustall")) {
+            JNLPRuntime.setTrustAll(true);
+        }
         JNLPRuntime.setInitialArgments(Arrays.asList(argsIn));

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java

-              r348
+              r418
         if (UrlUtils.isLocalFile(localUrl)) {
             // if it is known to us, just return the cached file
+            return new JarFile(localUrl.getPath());
+            JarFile returnFile = new JarFile(localUrl.getPath());
+            try {
+                // Blank out the class-path because:
+                // 1) Web Start does not support it
+                // 2) For the plug-in, we want to cache files from class-path so we do it manually
+                returnFile.getManifest().getMainAttributes().putValue("Class-Path", "");
+                if (JNLPRuntime.isDebug()) {
+                    System.err.println("Class-Path attribute cleared for " + returnFile.getName());
+                }
+            } catch (NullPointerException npe) {
+                // Discard NPE here. Maybe there was no manifest, maybe there were no attributes, etc.
+            }
+            return returnFile;
         } else {
             // throw new IllegalStateException("a non-local file in cache");

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java

-              r348
+              r418
 import static net.sourceforge.jnlp.runtime.Translator.R;
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
+import java.net.SocketPermission;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.security.AccessControlContext;
+import java.security.AccessControlException;
 import java.security.AccessController;
 import java.security.AllPermission;
 …
 import java.security.Permissions;
 import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 …
 import java.util.TreeSet;
 import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+import net.sourceforge.jnlp.AppletDesc;
+import net.sourceforge.jnlp.ApplicationDesc;
 import net.sourceforge.jnlp.DownloadOptions;
 import net.sourceforge.jnlp.ExtensionDesc;
 import net.sourceforge.jnlp.JARDesc;
 import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.JNLPMatcher;
+import net.sourceforge.jnlp.JNLPMatcherException;
+import net.sourceforge.jnlp.LaunchDesc;
 import net.sourceforge.jnlp.LaunchException;
 import net.sourceforge.jnlp.ParseException;
 …
 import net.sourceforge.jnlp.Version;
 import net.sourceforge.jnlp.cache.CacheUtil;
+import net.sourceforge.jnlp.cache.IllegalResourceDescriptorException;
 import net.sourceforge.jnlp.cache.ResourceTracker;
 import net.sourceforge.jnlp.cache.UpdatePolicy;
 import net.sourceforge.jnlp.security.SecurityDialogs;
 import net.sourceforge.jnlp.security.SecurityDialogs.AccessType;
 import net.sourceforge.jnlp.tools.JarSigner;
+import net.sourceforge.jnlp.tools.JarCertVerifier;
 import net.sourceforge.jnlp.util.FileUtils;
 import sun.misc.JarIndex;
 …
     // resources in an extension.
+    /** Signed JNLP File and Template */
+    final public static String TEMPLATE = "JNLP-INF/APPLICATION_TEMPLATE.JNLP";
+    final public static String APPLICATION = "JNLP-INF/APPLICATION.JNLP";
+    /** True if the application has a signed JNLP File */
+    private boolean isSignedJNLP = false;
     /** map from JNLPFile url to shared classloader */
     private static Map<String, JNLPClassLoader> urlToLoader =
 …
     private ArrayList<String> unverifiedJars = null;
     /** the jarsigner tool to verify our jars */
     private JarSigner js = null;
+    /** the jar cert verifier tool to verify our jars */
+    private JarCertVerifier jcv = null;
     private boolean signing = false;
 …
     private HashMap<URL, SecurityDesc> jarLocationSecurityMap =
             new HashMap<URL, SecurityDesc>();
+    /*Set to prevent once tried-to-get resources to be tried again*/
+    private Set<URL> alreadyTried = Collections.synchronizedSet(new HashSet<URL>());
     /** Loader for codebase (which is a path, rather than a file) */
     private CodeBaseClassLoader codeBaseLoader;
+    /** True if the jar with the main class has been found
+     * */
+    private boolean foundMainJar= false;
+    /** Name of the application's main class */
+    private String mainClass = null;
+    /**
+     * Variable to track how many times this loader is in use
+     */
+    private int useCount = 0;
     /**
 …
      */
     protected JNLPClassLoader(JNLPFile file, UpdatePolicy policy) throws LaunchException {
+        this(file,policy,null);
+    }
+    /**
+     * Create a new JNLPClassLoader from the specified file.
+     *
+     * @param file the JNLP file
+     * @param name of the application's main class
+     */
+    protected JNLPClassLoader(JNLPFile file, UpdatePolicy policy, String mainName) throws LaunchException {
         super(new URL[0], JNLPClassLoader.class.getClassLoader());
 …
         this.updatePolicy = policy;
         this.resources = file.getResources();
+        this.mainClass = mainName;
         // initialize extensions
 …
      */
     public static JNLPClassLoader getInstance(JNLPFile file, UpdatePolicy policy) throws LaunchException {
+        return getInstance(file, policy, null);
+    }
+    /**
+     * Returns a JNLP classloader for the specified JNLP file.
+     *
+     * @param file the file to load classes for
+     * @param policy the update policy to use when downloading resources
+     * @param mainName Overrides the main class name of the application
+     */
+    public static JNLPClassLoader getInstance(JNLPFile file, UpdatePolicy policy, String mainName) throws LaunchException {
         JNLPClassLoader baseLoader = null;
         JNLPClassLoader loader = null;
 …
                      !baseLoader.getJNLPFile().getFileLocation().equals(file.getFileLocation()))) {
                 loader = new JNLPClassLoader(file, policy);
+                loader = new JNLPClassLoader(file, policy, mainName);
                 // New loader init may have caused extentions to create a
 …
                     loader.merge(extLoader);
+                    extLoader.decrementLoaderUseCount(); // loader urls have been merged, ext loader is no longer used
+                }
 …
                 // the baseLoader
                 if (baseLoader != null && baseLoader != loader) {
                     loader.merge(baseLoader);
+                   loader.merge(baseLoader);
+                }
 …
                 if (!file.isApplication()) {
                     // If this is an applet, we do need to consider its loader
                     loader = new JNLPClassLoader(file, policy);
+                   loader = new JNLPClassLoader(file, policy, mainName);
                     if (baseLoader != null)
 …
         // loaders are mapped to a unique key. Only extensions and parent
         // share a key, so it is safe to always share based on it
+        urlToLoader.put(uniqueKey, loader);
+        loader.incrementLoaderUseCount();
+        synchronized(urlToLoader) {
+            urlToLoader.put(uniqueKey, loader);
+        }
         return loader;
 …
      * @param version the file's version
      * @param policy the update policy to use when downloading resources
+     */
+    public static JNLPClassLoader getInstance(URL location, String uniqueKey, Version version, UpdatePolicy policy)
+     * @param mainName Overrides the main class name of the application
+     */
+    public static JNLPClassLoader getInstance(URL location, String uniqueKey, Version version, UpdatePolicy policy, String mainName)
             throws IOException, ParseException, LaunchException {
         JNLPClassLoader loader = urlToLoader.get(uniqueKey);
+        if (loader == null || !location.equals(loader.getJNLPFile().getFileLocation()))
+            loader = getInstance(new JNLPFile(location, uniqueKey, version, false, policy), policy);
+        if (loader == null || !location.equals(loader.getJNLPFile().getFileLocation())) {
+            JNLPFile jnlpFile = new JNLPFile(location, uniqueKey, version, false, policy);
+            loader = getInstance(jnlpFile, policy, mainName);
+        }
         return loader;
 …
         loaderList.add(this);
+        if (mainClass == null) {
+            Object obj = file.getLaunchInfo();
+            if (obj instanceof ApplicationDesc) {
+                ApplicationDesc ad = (ApplicationDesc) file.getLaunchInfo();
+                mainClass = ad.getMainClass();
+            } else if (obj instanceof AppletDesc) {
+                AppletDesc ad = (AppletDesc) file.getLaunchInfo();
+                mainClass = ad.getMainClass();
+            }
+        }
         //if (ext != null) {
 …
             try {
                 String uniqueKey = this.getJNLPFile().getUniqueKey();
                 JNLPClassLoader loader = getInstance(ext[i].getLocation(), uniqueKey, ext[i].getVersion(), updatePolicy);
+                JNLPClassLoader loader = getInstance(ext[i].getLocation(), uniqueKey, ext[i].getVersion(), updatePolicy, mainClass);
                 loaderList.add(loader);
             } catch (Exception ex) {
 …
     /**
+     * Check if a described jar file is invalid
+     * @param jar the jar to check
+     * @return true if file exists AND is an invalid jar, false otherwise
+     */
+    private boolean isInvalidJar(JARDesc jar){
+        File cacheFile = tracker.getCacheFile(jar.getLocation());
+        if (cacheFile == null)
+            return false;//File cannot be retrieved, do not claim it is an invalid jar
+        boolean isInvalid = false;
+        try {
+            JarFile jarFile = new JarFile(cacheFile.getAbsolutePath());
+            jarFile.close();
+        } catch (IOException ioe){
+            //Catch a ZipException or any other read failure
+            isInvalid = true;
+        }
+        return isInvalid;
+    }
+    /**
+     * Determine how invalid jars should be handled
+     * @return whether to filter invalid jars, or error later on
+     */
+    private boolean shouldFilterInvalidJars(){
+        if (file instanceof PluginBridge){
+            PluginBridge pluginBridge = (PluginBridge)file;
+            /*Ignore on applet, ie !useJNLPHref*/
+            return !pluginBridge.useJNLPHref();
+        }
+        return false;//Error is default behaviour
+    }
+    /**
      * Load all of the JARs used in this JNLP file into the
      * ResourceTracker for downloading.
      */
     void initializeResources() throws LaunchException {
+        if (file instanceof PluginBridge){
+            PluginBridge bridge = (PluginBridge)file;
+            for (String codeBaseFolder : bridge.getCodeBaseFolders()){
+                try {
+                    addToCodeBaseLoader(new URL(file.getCodeBase(), codeBaseFolder));
+                } catch (MalformedURLException mfe) {
+                    System.err.println("Problem trying to add folder to code base:");
+                    System.err.println(mfe.getMessage());
+                }
+            }
+        }
         JARDesc jars[] = resources.getJARs();
+        if (jars == null || jars.length == 0)
+        if (jars == null || jars.length == 0) {
+            boolean allSigned = true;
+            for (int i = 1; i < loaders.length; i++) {
+                if (!loaders[i].getSigning()) {
+                    allSigned = false;
+                    break;
+                }
+            }
+            if(allSigned)
+                signing = true;
+            //Check if main jar is found within extensions
+            foundMainJar = foundMainJar || hasMainInExtensions();
             return;
+        }
         /*
         if (jars == null || jars.length == 0) {
 …
                                );
+        }
+        //If there are no eager jars, initialize the first jar
+        if(initialJars.size() == 0)
+            initialJars.add(jars[0]);
         if (strict)
             fillInPartJars(initialJars); // add in each initial part's lazy jars
+        waitForJars(initialJars); //download the jars first.
+        //A ZipException will propagate later on if the jar is invalid and not checked here
+        if (shouldFilterInvalidJars()){
+            //We filter any invalid jars
+            Iterator<JARDesc> iterator = initialJars.iterator();
+            while (iterator.hasNext()){
+                JARDesc jar = iterator.next();
+                if (isInvalidJar(jar)) {
+                    //Remove this jar as an available jar
+                    iterator.remove();
+                    tracker.removeResource(jar.getLocation());
+                    available.remove(jar);
+                }
+            }
+        }
         if (JNLPRuntime.isVerifying()) {
+            JarSigner js;
+            waitForJars(initialJars); //download the jars first.
+            JarCertVerifier jcv;
             try {
                 js = verifyJars(initialJars);
+                jcv = verifyJars(initialJars);
             } catch (Exception e) {
                 //we caught an Exception from the JarSigner class.
+                //we caught an Exception from the JarCertVerifier class.
                 //Note: one of these exceptions could be from not being able
                 //to read the cacerts or trusted.certs files.
 …
             //Case when at least one jar has some signing
             if (js.anyJarsSigned() && js.isFullySignedByASingleCert()) {
+            if (jcv.anyJarsSigned() && jcv.isFullySignedByASingleCert()) {
                 signing = true;
                 if (!js.allJarsSigned() &&
+                if (!jcv.allJarsSigned() &&
                                     !SecurityDialogs.showNotAllSignedWarningDialog(file))
                     throw new LaunchException(file, null, R("LSFatal"), R("LCClient"), R("LSignedAppJarUsingUnsignedJar"), R("LSignedAppJarUsingUnsignedJarInfo"));
+                // Check for main class in the downloaded jars, and check/verify signed JNLP fill
+                checkForMain(initialJars);
+                // If jar with main class was not found, check available resources
+                while (!foundMainJar && available != null && available.size() != 0)
+                    addNextResource();
+                // If the jar with main class was not found, check extension
+                // jnlp's resources
+                foundMainJar = foundMainJar || hasMainInExtensions();
+                // If jar with main class was not found and there are no more
+                // available jars, throw a LaunchException
+                if (file.getLaunchInfo() != null) {
+                    if (!foundMainJar
+                            && (available == null || available.size() == 0))
+                        throw new LaunchException(file, null, R("LSFatal"),
+                                R("LCClient"), R("LCantDetermineMainClass"),
+                                R("LCantDetermineMainClassInfo"));
+                }
+                // If main jar was found, but a signed JNLP file was not located
+                if (!isSignedJNLP && foundMainJar)
+                    file.setSignedJNLPAsMissing();
                 //user does not trust this publisher
                 if (!js.getAlreadyTrustPublisher()) {
                     checkTrustWithUser(js);
+                if (!jcv.getAlreadyTrustPublisher()) {
+                    checkTrustWithUser(jcv);
                 } else {
                     /**
 …
         for (JARDesc jarDesc : file.getResources().getJARs()) {
             try {
+                File cachedFile = tracker.getCacheFile(jarDesc.getLocation());
+                File cachedFile;
+                try {
+                    cachedFile = tracker.getCacheFile(jarDesc.getLocation());
+                } catch (IllegalResourceDescriptorException irde){
+                    //Caused by ignored resource being removed due to not being valid
+                    System.err.println("JAR " + jarDesc.getLocation() + " is not a valid jar file. Continuing.");
+                    continue;
+                }
                 if (cachedFile == null) {
 …
+            }
+        }
         activateJars(initialJars);
+    }
+    private void checkTrustWithUser(JarSigner js) throws LaunchException {
+        if (!js.getRootInCacerts()) { //root cert is not in cacerts
+    /***
+     * Checks for the jar that contains the main class. If the main class was
+     * found, it checks to see if the jar is signed and whether it contains a
+     * signed JNLP file
+     *
+     * @param jars Jars that are checked to see if they contain the main class
+     * @throws LaunchException Thrown if the signed JNLP file, within the main jar, fails to be verified or does not match
+     */
+    private void checkForMain(List<JARDesc> jars) throws LaunchException {
+        // Check launch info
+        if (mainClass == null) {
+            LaunchDesc launchDesc = file.getLaunchInfo();
+            if (launchDesc == null) {
+                return;
+            }
+            mainClass = launchDesc.getMainClass();
+        }
+        // The main class may be specified in the manifest
+        // Check main jar
+        if (mainClass == null) {
+            JARDesc mainJarDesc = file.getResources().getMainJAR();
+            mainClass = getMainClassName(mainJarDesc.getLocation());
+        }
+        // Check first jar
+        if (mainClass == null) {
+            JARDesc firstJarDesc = jars.get(0);
+            mainClass = getMainClassName(firstJarDesc.getLocation());
+        }
+        // Still not found? Iterate and set if only 1 was found
+        if (mainClass == null) {
+            for (JARDesc jarDesc: jars) {
+                String mainClassInThisJar = getMainClassName(jarDesc.getLocation());
+                if (mainClassInThisJar != null) {
+                    if (mainClass == null) { // first main class
+                        mainClass = mainClassInThisJar;
+                    } else { // There is more than one main class. Set to null and break.
+                        mainClass = null;
+                        break;
+                    }
+                }
+            }
+        }
+        String desiredJarEntryName = mainClass + ".class";
+        for (int i = 0; i < jars.size(); i++) {
+            try {
+                File localFile = tracker
+                        .getCacheFile(jars.get(i).getLocation());
+                if (localFile == null) {
+                    System.err.println("JAR " + jars.get(i).getLocation() + " not found. Continuing.");
+                    continue; // JAR not found. Keep going.
+                }
+                JarFile jarFile = new JarFile(localFile);
+                Enumeration<JarEntry> entries = jarFile.entries();
+                JarEntry je;
+                while (entries.hasMoreElements()) {
+                    je = entries.nextElement();
+                    String jeName = je.getName().replaceAll("/", ".");
+                    if (jeName.equals(desiredJarEntryName)) {
+                        foundMainJar = true;
+                        verifySignedJNLP(jars.get(i), jarFile);
+                        break;
+                    }
+                }
+            } catch (IOException e) {
+                /*
+                 * After this exception is caught, it is escaped. This will skip
+                 * the jarFile that may have thrown this exception and move on
+                 * to the next jarFile (if there are any)
+                 */
+            }
+        }
+    }
+    /**
+     * Gets the name of the main method if specified in the manifest
+     *
+     * @param location The JAR location
+     * @return the main class name, null if there isn't one of if there was an error
+     */
+    private String getMainClassName(URL location) {
+        String mainClass = null;
+        File f = tracker.getCacheFile(location);
+        if( f != null) {
+            try {
+                JarFile mainJar = new JarFile(f);
+                mainClass = mainJar.getManifest().
+                        getMainAttributes().getValue("Main-Class");
+            } catch (IOException ioe) {
+                mainClass = null;
+            }
+        }
+        return mainClass;
+    }
+    /**
+     * Returns true if this loader has the main jar
+     */
+    public boolean hasMainJar() {
+        return this.foundMainJar;
+    }
+    /**
+     * Returns true if extension loaders have the main jar
+     */
+    private boolean hasMainInExtensions() {
+        boolean foundMain = false;
+        for (int i = 1; i < loaders.length && !foundMain; i++) {
+            foundMain = loaders[i].hasMainJar();
+        }
+        return foundMain;
+    }
+    /**
+     * Is called by checkForMain() to check if the jar file is signed and if it
+     * contains a signed JNLP file.
+     *
+     * @param jarDesc JARDesc of jar
+     * @param jarFile the jar file
+     * @throws LaunchException thrown if the signed JNLP file, within the main jar, fails to be verified or does not match
+     */
+    private void verifySignedJNLP(JARDesc jarDesc, JarFile jarFile)
+            throws LaunchException {
+        JarCertVerifier signer = new JarCertVerifier();
+        List<JARDesc> desc = new ArrayList<JARDesc>();
+        desc.add(jarDesc);
+        // Initialize streams
+        InputStream inStream = null;
+        InputStreamReader inputReader = null;
+        FileReader fr = null;
+        InputStreamReader jnlpReader = null;
+        try {
+            signer.verifyJars(desc, tracker);
+            if (signer.allJarsSigned()) { // If the jar is signed
+                Enumeration<JarEntry> entries = jarFile.entries();
+                JarEntry je;
+                while (entries.hasMoreElements()) {
+                    je = entries.nextElement();
+                    String jeName = je.getName().toUpperCase();
+                    if (jeName.equals(TEMPLATE) || jeName.equals(APPLICATION)) {
+                        if (JNLPRuntime.isDebug())
+                            System.err.println("Creating Jar InputStream from JarEntry");
+                        inStream = jarFile.getInputStream(je);
+                        inputReader = new InputStreamReader(inStream);
+                        if (JNLPRuntime.isDebug())
+                            System.err.println("Creating File InputStream from lauching JNLP file");
+                        JNLPFile jnlp = this.getJNLPFile();
+                        URL url = jnlp.getFileLocation();
+                        File jn = null;
+                        // If the file is on the local file system, use original path, otherwise find cached file
+                        if (url.getProtocol().toLowerCase().equals("file"))
+                            jn = new File(url.getPath());
+                        else
+                            jn = CacheUtil.getCacheFile(url, null);
+                        fr = new FileReader(jn);
+                        jnlpReader = fr;
+                        // Initialize JNLPMatcher class
+                        JNLPMatcher matcher;
+                        if (jeName.equals(APPLICATION)) { // If signed application was found
+                            if (JNLPRuntime.isDebug())
+                                System.err.println("APPLICATION.JNLP has been located within signed JAR. Starting verfication...");
+                            matcher = new JNLPMatcher(inputReader, jnlpReader, false);
+                        } else { // Otherwise template was found
+                            if (JNLPRuntime.isDebug())
+                                System.err.println("APPLICATION_TEMPLATE.JNLP has been located within signed JAR. Starting verfication...");
+                            matcher = new JNLPMatcher(inputReader, jnlpReader,
+                                    true);
+                        }
+                        // If signed JNLP file does not matches launching JNLP file, throw JNLPMatcherException
+                        if (!matcher.isMatch())
+                            throw new JNLPMatcherException("Signed Application did not match launching JNLP File");
+                        this.isSignedJNLP = true;
+                        if (JNLPRuntime.isDebug())
+                            System.err.println("Signed Application Verification Successful");
+                        break;
+                    }
+                }
+            }
+        } catch (JNLPMatcherException e) {
+            /*
+             * Throws LaunchException if signed JNLP file fails to be verified
+             * or fails to match the launching JNLP file
+             */
+            throw new LaunchException(file, null, R("LSFatal"), R("LCClient"),
+                    R("LSignedJNLPFileDidNotMatch"), R(e.getMessage()));
+            /*
+             * Throwing this exception will fail to initialize the application
+             * resulting in the termination of the application
+             */
+        } catch (Exception e) {
+            if (JNLPRuntime.isDebug())
+                e.printStackTrace(System.err);
+            /*
+             * After this exception is caught, it is escaped. If an exception is
+             * thrown while handling the jar file, (mainly for
+             * JarCertVerifier.verifyJars) it assumes the jar file is unsigned and
+             * skip the check for a signed JNLP file
+             */
+        } finally {
+            //Close all streams
+            closeStream(inStream);
+            closeStream(inputReader);
+            closeStream(fr);
+            closeStream(jnlpReader);
+        }
+        if (JNLPRuntime.isDebug())
+            System.err.println("Ending check for signed JNLP file...");
+    }
+    /***
+     * Closes a stream
+     *
+     * @param stream the stream that will be closed
+     */
+    private void closeStream (Closeable stream) {
+        if (stream != null)
+            try {
+                stream.close();
+            } catch (Exception e) {
+                e.printStackTrace(System.err);
+            }
+    }
+    private void checkTrustWithUser(JarCertVerifier jcv) throws LaunchException {
+        if (JNLPRuntime.isTrustAll()){
+            return;
+        }
+        if (!jcv.getRootInCacerts()) { //root cert is not in cacerts
             boolean b = SecurityDialogs.showCertWarningDialog(
                     AccessType.UNVERIFIED, file, js);
+                    AccessType.UNVERIFIED, file, jcv);
             if (!b)
                 throw new LaunchException(null, null, R("LSFatal"),
                         R("LCLaunching"), R("LNotVerified"), "");
         } else if (js.getRootInCacerts()) { //root cert is in cacerts
+        } else if (jcv.getRootInCacerts()) { //root cert is in cacerts
             boolean b = false;
             if (js.noSigningIssues())
+            if (jcv.noSigningIssues())
                 b = SecurityDialogs.showCertWarningDialog(
                         AccessType.VERIFIED, file, js);
             else if (!js.noSigningIssues())
+                        AccessType.VERIFIED, file, jcv);
+            else if (!jcv.noSigningIssues())
                 b = SecurityDialogs.showCertWarningDialog(
                         AccessType.SIGNING_ERROR, file, js);
+                        AccessType.SIGNING_ERROR, file, jcv);
             if (!b)
                 throw new LaunchException(null, null, R("LSFatal"),
 …
      */
     protected PermissionCollection getPermissions(CodeSource cs) {
+        Permissions result = new Permissions();
+        // should check for extensions or boot, automatically give all
+        // access w/o security dialog once we actually check certificates.
+        // copy security permissions from SecurityDesc element
+        if (security != null) {
+            // Security desc. is used only to track security settings for the
+            // application. However, an application may comprise of multiple
+            // jars, and as such, security must be evaluated on a per jar basis.
+            // set default perms
+            PermissionCollection permissions = security.getSandBoxPermissions();
+            // If more than default is needed:
+            // 1. Code must be signed
+            // 2. ALL or J2EE permissions must be requested (note: plugin requests ALL automatically)
+            if (cs.getCodeSigners() != null &&
+                    (getCodeSourceSecurity(cs.getLocation()).getSecurityType().equals(SecurityDesc.ALL_PERMISSIONS) ||
+                     getCodeSourceSecurity(cs.getLocation()).getSecurityType().equals(SecurityDesc.J2EE_PERMISSIONS))) {
+                permissions = getCodeSourceSecurity(cs.getLocation()).getPermissions(cs);
+            }
+            Enumeration<Permission> e = permissions.elements();
+            while (e.hasMoreElements())
+                result.add(e.nextElement());
+        }
+        // add in permission to read the cached JAR files
+        for (int i = 0; i < resourcePermissions.size(); i++)
+            result.add(resourcePermissions.get(i));
+        // add in the permissions that the user granted.
+        for (int i = 0; i < runtimePermissions.size(); i++)
+            result.add(runtimePermissions.get(i));
+        return result;
+        try {
+            Permissions result = new Permissions();
+            // should check for extensions or boot, automatically give all
+            // access w/o security dialog once we actually check certificates.
+            // copy security permissions from SecurityDesc element
+            if (security != null) {
+                // Security desc. is used only to track security settings for the
+                // application. However, an application may comprise of multiple
+                // jars, and as such, security must be evaluated on a per jar basis.
+                // set default perms
+                PermissionCollection permissions = security.getSandBoxPermissions();
+                // If more than default is needed:
+                // 1. Code must be signed
+                // 2. ALL or J2EE permissions must be requested (note: plugin requests ALL automatically)
+                if (cs == null) {
+                    throw new NullPointerException("Code source was null");
+                }
+                if (cs.getCodeSigners() != null) {
+                    if (cs.getLocation() == null) {
+                        throw new NullPointerException("Code source location was null");
+                    }
+                    if (getCodeSourceSecurity(cs.getLocation()) == null) {
+                        throw new NullPointerException("Code source security was null");
+                    }
+                    if (getCodeSourceSecurity(cs.getLocation()).getSecurityType() == null) {
+                        if (JNLPRuntime.isDebug()){
+                        new NullPointerException("Warning! Code source security type was null").printStackTrace();
+                        }
+                    }
+                    Object securityType = getCodeSourceSecurity(cs.getLocation()).getSecurityType();
+                    if (SecurityDesc.ALL_PERMISSIONS.equals(securityType)
+                            || SecurityDesc.J2EE_PERMISSIONS.equals(securityType)) {
+                        permissions = getCodeSourceSecurity(cs.getLocation()).getPermissions(cs);
+                    }
+                }
+                Enumeration<Permission> e = permissions.elements();
+                while (e.hasMoreElements()) {
+                    result.add(e.nextElement());
+                }
+            }
+            // add in permission to read the cached JAR files
+            for (int i = 0; i < resourcePermissions.size(); i++) {
+                result.add(resourcePermissions.get(i));
+            }
+            // add in the permissions that the user granted.
+            for (int i = 0; i < runtimePermissions.size(); i++) {
+                result.add(runtimePermissions.get(i));
+            }
+            // Class from host X should be allowed to connect to host X
+            if (cs.getLocation().getHost().length() > 0)
+                result.add(new SocketPermission(cs.getLocation().getHost(),
+                        "connect, accept"));
+            return result;
+        } catch (RuntimeException ex) {
+            if (JNLPRuntime.isDebug()) {
+                ex.printStackTrace();
+            }
+            throw ex;
+        }
+    }
 …
+                                    }
                                     JarSigner signer = new JarSigner();
+                                    JarCertVerifier signer = new JarCertVerifier();
                                     List<JARDesc> jars = new ArrayList<JARDesc>();
                                     JARDesc jarDesc = new JARDesc(new File(extractedJarLocation).toURL(), null, null, false, false, false, false);
 …
                             JarFile jarFile = new JarFile(localFile.getAbsolutePath());
                             Manifest mf = jarFile.getManifest();
+                            classpaths.addAll(getClassPathsFromManifest(mf, jar.getLocation().getPath()));
+                            // Only check classpath if this is the plugin and there is no jnlp_href usage.
+                            // Note that this is different from proprietary plugin behaviour.
+                            // If jnlp_href is used, the app should be treated similarly to when
+                            // it is run from javaws as a webstart.
+                            if (file instanceof PluginBridge && !((PluginBridge) file).useJNLPHref()) {
+                                classpaths.addAll(getClassPathsFromManifest(mf, jar.getLocation().getPath()));
+                            }
                             JarIndex index = JarIndex.getJarIndex(jarFile, null);
                             if (index != null)
 …
          * @param jars the jars to be verified.
          */
     private JarSigner verifyJars(List<JARDesc> jars) throws Exception {
         js = new JarSigner();
         js.verifyJars(jars, tracker);
         return js;
+    private JarCertVerifier verifyJars(List<JARDesc> jars) throws Exception {
+        jcv = new JarCertVerifier();
+        jcv.verifyJars(jars, tracker);
+        return jcv;
+    }
 …
             Class result = null;
+            if (loaders[i] == this)
+                result = super.findLoadedClass(name);
+            else
+            if (loaders[i] == this) {
+                final String fName = name;
+                try {
+                    result = AccessController.doPrivileged(
+                            new PrivilegedExceptionAction<Class<?>>() {
+                                public Class<?> run() {
+                                    return JNLPClassLoader.super.findLoadedClass(fName);
+                                }
+                            }, getAccessControlContextForClassLoading());
+                } catch (PrivilegedActionException pae) {
+                    result = null;
+                }
+            } else {
                 result = loaders[i].findLoadedClassAll(name);
+            }
             if (result != null)
 …
      * @param desc the JARDesc for the new jar
      */
     private void addNewJar(JARDesc desc) {
+    private void addNewJar(final JARDesc desc) {
         available.add(desc);
 …
                 );
+        URL remoteURL = desc.getLocation();
+        URL cachedUrl = tracker.getCacheURL(remoteURL);
+        addURL(remoteURL);
+        CachedJarFileCallback.getInstance().addMapping(remoteURL, cachedUrl);
+        // Give read permissions to the cached jar file
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            public Void run() {
+                Permission p = CacheUtil.getReadPermission(desc.getLocation(),
+                        desc.getVersion());
+                resourcePermissions.add(p);
+                return null;
+            }
+        });
+        final URL remoteURL = desc.getLocation();
+        final URL cachedUrl = tracker.getCacheURL(remoteURL); // blocks till download
+        available.remove(desc); // Resource downloaded. Remove from available list.
+        try {
+            // Verify if needed
+            final JarCertVerifier signer = new JarCertVerifier();
+            final List<JARDesc> jars = new ArrayList<JARDesc>();
+            jars.add(desc);
+            // Decide what level of security this jar should have
+            // The verification and security setting functions rely on
+            // having AllPermissions as those actions normally happen
+            // during initialization. We therefore need to do those
+            // actions as privileged.
+            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
+                public Void run() throws Exception {
+                    signer.verifyJars(jars, tracker);
+                    if (signer.anyJarsSigned() && !signer.getAlreadyTrustPublisher()) {
+                        checkTrustWithUser(signer);
+                    }
+                    final SecurityDesc security;
+                    if (signer.anyJarsSigned()) {
+                        security = new SecurityDesc(file,
+                                SecurityDesc.ALL_PERMISSIONS,
+                                file.getCodeBase().getHost());
+                    } else {
+                        security = new SecurityDesc(file,
+                                SecurityDesc.SANDBOX_PERMISSIONS,
+                                file.getCodeBase().getHost());
+                    }
+                    jarLocationSecurityMap.put(remoteURL, security);
+                    return null;
+                }
+            });
+            addURL(remoteURL);
+            CachedJarFileCallback.getInstance().addMapping(remoteURL, cachedUrl);
+        } catch (Exception e) {
+            // Do nothing. This code is called by loadClass which cannot
+            // throw additional exceptions. So instead, just ignore it.
+            // Exception => jar will not get added to classpath, which will
+            // result in CNFE from loadClass.
+            e.printStackTrace();
+        }
+    }
 …
         for (int i = 0; i < loaders.length; i++) {
             try {
+                if (loaders[i] == this)
+                    return super.findClass(name);
+                else
+                if (loaders[i] == this) {
+                    final String fName = name;
+                    return AccessController.doPrivileged(
+                            new PrivilegedExceptionAction<Class<?>>() {
+                                public Class<?> run() throws ClassNotFoundException {
+                                    return JNLPClassLoader.super.findClass(fName);
+                                }
+                            }, getAccessControlContextForClassLoading());
+                } else {
                     return loaders[i].findClass(name);
+                }
             } catch (ClassNotFoundException ex) {
             } catch (ClassFormatError cfe) {
+            } catch (PrivilegedActionException pae) {
+            }
+        }
 …
         // Try codebase loader
         if (codeBaseLoader != null)
             return codeBaseLoader.findClass(name);
+            return codeBaseLoader.findClass(name, true);
         // All else failed. Throw CNFE
         throw new ClassNotFoundException(name);
 …
         // add resources until found
         while (true) {
+            JNLPClassLoader addedTo = addNextResource();
+            JNLPClassLoader addedTo = null;
+            try {
+                addedTo = addNextResource();
+            } catch (LaunchException e) {
+                /*
+                 * This method will never handle any search for the main class
+                 * [It is handled in initializeResources()]. Therefore, this
+                 * exception will never be thrown here and is escaped
+                 */
+                throw new IllegalStateException(e);
+            }
             if (addedTo == null)
 …
      * Finds the resource in this, the parent, or the extension
      * class loaders.
+     */
+    public URL getResource(String name) {
+        URL result = super.getResource(name);
+        for (int i = 1; i < loaders.length; i++)
+            if (result == null)
+                result = loaders[i].getResource(name);
+     *
+     * @return a <code>URL</code> for the resource, or <code>null</code>
+     * if the resource could not be found.
+     */
+    @Override
+    public URL findResource(String name) {
+        URL result = null;
+        try {
+            Enumeration<URL> e = findResources(name);
+            if (e.hasMoreElements()) {
+                result = e.nextElement();
+            }
+        } catch (IOException e) {
+            if (JNLPRuntime.isDebug()) {
+                e.printStackTrace();
+            }
+        }
         // If result is still null, look in the codebase loader
         if (result == null && codeBaseLoader != null)
             result = codeBaseLoader.getResource(name);
+            result = codeBaseLoader.findResource(name);
         return result;
 …
     /**
      * Finds the resource in this, the parent, or the extension
      * class loaders.
+     * Find the resources in this, the parent, or the extension
+     * class loaders. Load lazy resources if not found in current resources.
      */
     @Override
     public Enumeration<URL> findResources(String name) throws IOException {
+        Vector<URL> resources = new Vector<URL>();
+        Enumeration<URL> e;
+        Enumeration<URL> resources = findResourcesBySearching(name);
+        try {
+            // if not found, load all lazy resources; repeat search
+            while (!resources.hasMoreElements() && addNextResource() != null) {
+                resources = findResourcesBySearching(name);
+            }
+        } catch (LaunchException le) {
+            le.printStackTrace();
+        }
+        return resources;
+    }
+    /**
+     * Find the resources in this, the parent, or the extension
+     * class loaders.
+     */
+    private Enumeration<URL> findResourcesBySearching(String name) throws IOException {
+        List<URL> resources = new ArrayList<URL>();
+        Enumeration<URL> e = null;
         for (int i = 0; i < loaders.length; i++) {
+            if (loaders[i] == this)
+                e = super.findResources(name);
+            else
+            // TODO check if this will blow up or not
+            // if loaders[1].getResource() is called, wont it call getResource() on
+            // the original caller? infinite recursion?
+            if (loaders[i] == this) {
+                final String fName = name;
+                try {
+                    e = AccessController.doPrivileged(
+                            new PrivilegedExceptionAction<Enumeration<URL>>() {
+                                public Enumeration<URL> run() throws IOException {
+                                    return JNLPClassLoader.super.findResources(fName);
+                                }
+                            }, getAccessControlContextForClassLoading());
+                } catch (PrivilegedActionException pae) {
+                }
+            } else {
                 e = loaders[i].findResources(name);
+            while (e.hasMoreElements())
+                resources.add(e.nextElement());
+            }
+            final Enumeration<URL> fURLEnum = e;
+            try {
+                resources.addAll(AccessController.doPrivileged(
+                    new PrivilegedExceptionAction<Collection<URL>>() {
+                        public Collection<URL> run() {
+                            List<URL> resources = new ArrayList<URL>();
+                            while (fURLEnum != null && fURLEnum.hasMoreElements()) {
+                                resources.add(fURLEnum.nextElement());
+                            }
+                            return resources;
+                        }
+                    }, getAccessControlContextForClassLoading()));
+            } catch (PrivilegedActionException pae) {
+            }
+        }
 …
+        }
         return resources.elements();
+        return Collections.enumeration(resources);
+    }
 …
+     *
      * @return the classloader that resources were added to, or null
+     */
+    protected JNLPClassLoader addNextResource() {
+     * @throws LaunchException Thrown if the signed JNLP file, within the main jar, fails to be verified or does not match
+     */
+    protected JNLPClassLoader addNextResource() throws LaunchException {
         if (available.size() == 0) {
             for (int i = 1; i < loaders.length; i++) {
 …
         fillInPartJars(jars);
+        checkForMain(jars);
         activateJars(jars);
 …
     protected SecurityDesc getCodeSourceSecurity(URL source) {
+        return jarLocationSecurityMap.get(source);
+        SecurityDesc sec=jarLocationSecurityMap.get(source);
+        if (sec == null && !alreadyTried.contains(source)) {
+            alreadyTried.add(source);
+            //try to load the jar which is requesting the permissions, but was NOT downloaded by standard way
+            if (JNLPRuntime.isDebug()) {
+                System.out.println("Application is trying to get permissions for " + source.toString() + ", which was not added by standard way. Trying to download and verify!");
+            }
+            try {
+                JARDesc des = new JARDesc(source, null, null, false, false, false, false);
+                addNewJar(des);
+                sec = jarLocationSecurityMap.get(source);
+            } catch (Throwable t) {
+                if (JNLPRuntime.isDebug()) {
+                    t.printStackTrace();
+                }
+                sec = null;
+            }
+        }
+        if (sec == null){
+            System.out.println(Translator.R("LNoSecInstance",source.toString()));
+        }
+        return sec;
+    }
 …
      */
     private void addToCodeBaseLoader(URL u) {
+        if (u == null) {
+            return;
+        }
         // Only paths may be added
 …
         return result;
+    }
+    /**
+     * Increments loader use count by 1
+     *
+     * @throws SecurityException if caller is not trusted
+     */
+    private synchronized void incrementLoaderUseCount() {
+        // For use by trusted code only
+        if (System.getSecurityManager() != null)
+            System.getSecurityManager().checkPermission(new AllPermission());
+        useCount++;
+    }
+    /**
+     * Decrements loader use count by 1
+     *
+     * If count reaches 0, loader is removed from list of available loaders
+     *
+     * @throws SecurityException if caller is not trusted
+     */
+    public synchronized void decrementLoaderUseCount() {
+        // For use by trusted code only
+        if (System.getSecurityManager() != null)
+            System.getSecurityManager().checkPermission(new AllPermission());
+        useCount--;
+        if (useCount <= 0) {
+            synchronized(urlToLoader) {
+                urlToLoader.remove(file.getUniqueKey());
+            }
+        }
+    }
+    /**
+     * Returns an appropriate AccessControlContext for loading classes in
+     * the running instance.
+     *
+     * The default context during class-loading only allows connection to
+     * codebase. However applets are allowed to load jars from arbitrary
+     * locations and the codebase only access falls short if a class from
+     * one location needs a class from another.
+     *
+     * Given protected access since CodeBaseClassloader uses this function too.
+     *
+     * @return The appropriate AccessControlContext for loading classes for this instance
+     */
+    public AccessControlContext getAccessControlContextForClassLoading() {
+        AccessControlContext context = AccessController.getContext();
+        try {
+            context.checkPermission(new AllPermission());
+            return context; // If context already has all permissions, don't bother
+        } catch (AccessControlException ace) {
+            // continue below
+        } catch (ClassCircularityError cce) {
+            // continue below
+        }
+        // Since this is for class-loading, technically any class from one jar
+        // should be able to access a class from another, therefore making the
+        // original context code source irrelevant
+        PermissionCollection permissions = this.security.getSandBoxPermissions();
+        // Local cache access permissions
+        for (Permission resourcePermission : resourcePermissions) {
+            permissions.add(resourcePermission);
+        }
+        // Permissions for all remote hosting urls
+        for (URL u: jarLocationSecurityMap.keySet()) {
+            permissions.add(new SocketPermission(u.getHost(),
+                                                 "connect, accept"));
+        }
+        // Permissions for codebase urls (if there is a loader)
+        if (codeBaseLoader != null) {
+            for (URL u : codeBaseLoader.getURLs()) {
+                permissions.add(new SocketPermission(u.getHost(),
+                        "connect, accept"));
+            }
+        }
+        ProtectionDomain pd = new ProtectionDomain(null, permissions);
+        return new AccessControlContext(new ProtectionDomain[] { pd });
+    }
     /*
 …
         JNLPClassLoader parentJNLPClassLoader;
+        /**
+         * Classes that are not found, so that findClass can skip them next time
+         */
+        ConcurrentHashMap<String, URL[]> notFoundResources = new ConcurrentHashMap<String, URL[]>();
         public CodeBaseClassLoader(URL[] urls, JNLPClassLoader cl) {
             super(urls);
 …
         @Override
+        public Class<?> findClass(String name) throws ClassNotFoundException {
+            return super.findClass(name);
+        public Class<?> findClass(String name) throws ClassNotFoundException {
+            return findClass(name, false);
+        }
+        public Class<?> findClass(String name, boolean recursivelyInvoked) throws ClassNotFoundException {
+            if (!recursivelyInvoked) {
+                try {
+                    return parentJNLPClassLoader.findClass(name);
+                } catch (ClassNotFoundException cnfe) {
+                    // continue
+                }
+            }
+            // If we have searched this path before, don't try again
+            if (Arrays.equals(super.getURLs(), notFoundResources.get(name)))
+                throw new ClassNotFoundException(name);
+            try {
+                final String fName = name;
+                return AccessController.doPrivileged(
+                        new PrivilegedExceptionAction<Class<?>>() {
+                            public Class<?> run() throws ClassNotFoundException {
+                                return CodeBaseClassLoader.super.findClass(fName);
+                            }
+                        }, parentJNLPClassLoader.getAccessControlContextForClassLoading());
+            } catch (PrivilegedActionException pae) {
+                notFoundResources.put(name, super.getURLs());
+                throw new ClassNotFoundException("Could not find class " + name);
+            }
+        }
 …
         @Override
         public Enumeration<URL> findResources(String name) throws IOException {
+            // If we have searched this path before, don't try again
+            if (Arrays.equals(super.getURLs(), notFoundResources.get(name)))
+                return (new Vector<URL>(0)).elements();
             if (!name.startsWith("META-INF")) {
+                return super.findResources(name);
+            }
+                Enumeration<URL> urls = super.findResources(name);
+                if (!urls.hasMoreElements()) {
+                    notFoundResources.put(name, super.getURLs());
+                }
+                return urls;
+            }
             return (new Vector<URL>(0)).elements();
+        }
 …
         @Override
         public URL findResource(String name) {
+            // If we have searched this path before, don't try again
+            if (Arrays.equals(super.getURLs(), notFoundResources.get(name)))
+                return null;
+            URL url = null;
             if (!name.startsWith("META-INF")) {
+                return super.findResource(name);
+            }
+                try {
+                    final String fName = name;
+                    url = AccessController.doPrivileged(
+                            new PrivilegedExceptionAction<URL>() {
+                                public URL run() {
+                                    return CodeBaseClassLoader.super.findResource(fName);
+                                }
+                            }, parentJNLPClassLoader.getAccessControlContextForClassLoading());
+                } catch (PrivilegedActionException pae) {
+                }
+                if (url == null) {
+                    notFoundResources.put(name, super.getURLs());
+                }
+                return url;
+            }
             return null;
+        }

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java

-              r348
+              r418
 import javax.naming.ConfigurationException;
 import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 …
     private static UpdatePolicy updatePolicy = UpdatePolicy.ALWAYS;
-    /** netx window icon */
-    private static Image windowIcon = null;
     /** whether initialized */
     private static boolean initialized = false;
 …
     private static boolean forksAllowed = true;
+    /** all security dialogs will be consumed and pretented as beeing verified by user and allowed.*/
+    private static boolean trustAll=false;
     /** contains the arguments passed to the jnlp runtime */
     private static List<String> initialArguments;
 …
     public static final String STDERR_FILE = "java.stderr";
     public static final String STDOUT_FILE = "java.stdout";
     /**
 …
             checkHeadless();
-        if (!headless && windowIcon == null)
-            loadWindowIcon();
         if (!headless && indicator == null)
             indicator = new DefaultDownloadIndicator();
 …
         if (handler == null) {
             if (headless) {
                 handler = new DefaultLaunchHandler();
+                handler = new DefaultLaunchHandler(System.err);
             } else {
                 handler = new GuiLaunchHandler();
+                handler = new GuiLaunchHandler(System.err);
+            }
+        }
 …
             SSLSocketFactory sslSocketFactory;
             SSLContext context = SSLContext.getInstance("SSL");
+            KeyStore ks = KeyStores.getKeyStore(KeyStores.Level.USER, KeyStores.Type.CLIENT_CERTS);
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+            kmf.init(ks, KeyStores.getPassword());
             TrustManager[] trust = new TrustManager[] { VariableX509TrustManager.getInstance() };
             context.init(null, trust, null);
+            context.init(kmf.getKeyManagers(), trust, null);
             sslSocketFactory = context.getSocketFactory();
 …
     public static boolean isWebstartApplication() {
         return isWebstartApplication;
+    }
-    /**
-     * Returns the window icon.
-     */
-    public static Image getWindowIcon() {
-        return windowIcon;
+    }
-    /**
-     * Sets the window icon that is displayed in Java applications
-     * and applets instead of the default Java icon.
+     *
-     * @throws IllegalStateException if caller is not the exit class
-     */
-    public static void setWindowIcon(Image image) {
-        checkExitClass();
-        windowIcon = image;
+    }
 …
         } catch (Exception ex) {
             throw new IllegalStateException("Missing resource bundle in netx.jar:net/sourceforge/jnlp/resource/Messages.properties");
+        }
+    }
-    /**
-     * Load the window icon.
-     */
-    private static void loadWindowIcon() {
-        if (windowIcon != null)
-            return;
-        try {
-            windowIcon = new javax.swing.ImageIcon((new sun.misc.Launcher())
-                        .getClassLoader().getResource("net/sourceforge/jnlp/resources/netx-icon.png")).getImage();
-        } catch (Exception ex) {
-            if (JNLPRuntime.isDebug())
-                ex.printStackTrace();
+        }
+    }
 …
+    }
+    static void setTrustAll(boolean b) {
+        trustAll=b;
+    }
+    public static boolean isTrustAll() {
+        return trustAll;
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java

-              r348
+              r418
             //            }
+            try {
+                super.checkPermission(perm);
+            } catch (SecurityException se) {
+                //This section is a special case for dealing with SocketPermissions.
+                if (JNLPRuntime.isDebug())
+                    System.err.println("Requesting permission: " + perm.toString());
+                //Change this SocketPermission's action to connect and accept
+                //(and resolve). This is to avoid asking for connect permission
+                //on every address resolve.
+                Permission tmpPerm = null;
+                if (perm instanceof SocketPermission) {
+                    tmpPerm = new SocketPermission(perm.getName(),
+                                                        SecurityConstants.SOCKET_CONNECT_ACCEPT_ACTION);
+                    // before proceeding, check if we are trying to connect to same origin
+                    ApplicationInstance app = getApplication();
+                    JNLPFile file = app.getJNLPFile();
+                    String srcHost = file.getSourceLocation().getAuthority();
+                    String destHost = name;
+                    // host = abc.xyz.com or abc.xyz.com:<port>
+                    if (destHost.indexOf(':') >= 0)
+                        destHost = destHost.substring(0, destHost.indexOf(':'));
+                    // host = abc.xyz.com
+                    String[] hostComponents = destHost.split("\\.");
+                    int length = hostComponents.length;
+                    if (length >= 2) {
+                        // address is in xxx.xxx.xxx format
+                        destHost = hostComponents[length - 2] + "." + hostComponents[length - 1];
+                        // host = xyz.com i.e. origin
+                        boolean isDestHostName = false;
+                        // make sure that it is not an ip address
+                        try {
+                            Integer.parseInt(hostComponents[length - 1]);
+                        } catch (NumberFormatException e) {
+                            isDestHostName = true;
+                        }
+                        if (isDestHostName) {
+                            // okay, destination is hostname. Now figure out if it is a subset of origin
+                            if (srcHost.endsWith(destHost)) {
+                                addPermission(tmpPerm);
+                                return;
+                            }
+                        }
+                    }
+                } else {
+                    tmpPerm = perm;
+                }
+                if (tmpPerm != null) {
+                    //askPermission will only prompt the user on SocketPermission
+                    //meaning we're denying all other SecurityExceptions that may arise.
+                    if (askPermission(tmpPerm)) {
+                        addPermission(tmpPerm);
+                        //return quietly.
+                    } else {
+                        throw se;
+                    }
+                }
+            }
+            super.checkPermission(perm);
         } catch (SecurityException ex) {
             if (JNLPRuntime.isDebug()) {
 …
             app.addWindow(w);
+        }
-        // change coffee cup to netx for default icon
-        if (window instanceof Window)
-            for (Window w = (Window) window; w != null; w = w.getOwner())
-                if (window instanceof Frame)
-                    ((Frame) window).setIconImage(JNLPRuntime.getWindowIcon());
         // todo: set awt.appletWarning to custom message

trunk/icedtea-web/netx/net/sourceforge/jnlp/runtime/pac-funcs.js

-              r348
+              r418
  */
 function dateRange() {
+    // note: watch out for wrapping around of dates. date ranges, like
+    // month=9 to month=8, wrap around and cover the entire year. this
+    // makes everything more interesting
+    var gmt;
+        if (arguments.length > 1) {
+                if (arguments[arguments.length-1] === "GMT") {
+                        gmt = true;
+            arguments.splice(0,arguments.length-1);
+        }
+        }
+    switch (arguments.length) {
+       case 1: return isDateInRange_internallForIcedTeaWebTesting(new Date(),arguments[0]);
+       case 2: return isDateInRange_internallForIcedTeaWebTesting(new Date(),arguments[0],arguments[1]);
+       case 3: return isDateInRange_internallForIcedTeaWebTesting(new Date(),arguments[0],arguments[1],arguments[2]);
+       case 4: return isDateInRange_internallForIcedTeaWebTesting(new Date(),arguments[0],arguments[1],arguments[2],arguments[3]);
+       case 5: return isDateInRange_internallForIcedTeaWebTesting(new Date(),arguments[0],arguments[1],arguments[2],arguments[3],arguments[4]);
+       case 6: return isDateInRange_internallForIcedTeaWebTesting(new Date(),arguments[0],arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]);
+       case 7: return isDateInRange_internallForIcedTeaWebTesting(new Date(),arguments[0],arguments[1],arguments[2],arguments[3],arguments[4],arguments[5],arguments[6]); //GMT
+       default:
+           return false;
+    }
+}
+function isDateInRange_internallForIcedTeaWebTesting() {
     function isDate(date) {
 …
     function inYearRange(today, year1, year2) {
         if (year1 <= today.getYear() && today.getYear() <= year2) {
+        if (year1 <= today.getFullYear() && today.getFullYear() <= year2) {
             return true;
         } else {
 …
     function inYearMonthRange(today, month1, year1, month2, year2) {
         if (year1 === year2) {
             if (today.getYear() === year1) {
+            if (today.getFullYear() === year1) {
                if (month1 <= today.getMonth() && today.getMonth() <= month2) {
                    return true;
 …
+        }
         if (year1 < year2) {
             if (year1 <= today.getYear() && today.getYear() <= year2) {
                 if (today.getYear() === year1) {
+            if (year1 <= today.getFullYear() && today.getFullYear() <= year2) {
+                if (today.getFullYear() === year1) {
                     if (today.getMonth() >= month1) {
                         return true;
 …
                         return false;
+                    }
                 } else if (today.getYear() === year2) {
+                } else if (today.getFullYear() === year2) {
                     if (today.getMonth() <= month2) {
                         return true;
 …
             return false;
+        }
+    }
     function inYearMonthDateRange(today, date1, month1, year1, date2, month2, year2) {
         if (year1 === year2) {
             if (year1 === today.getYear()) {
+            if (year1 === today.getFullYear()) {
                 if ((month1 <= today.getMonth()) && (today.getMonth() <= month2)) {
                     if (month1 === month2) {
 …
+            }
         } else if (year1 < year2) {
             if (year1 <= today.getYear() && today.getYear() <= year2) {
                 if (today.getYear() === year1) {
+            if (year1 <= today.getFullYear() && today.getFullYear() <= year2) {
+                if (today.getFullYear() === year1) {
                     if (today.getMonth() === month1) {
                         if (today.getDate() >= date1) {
 …
                         return false;
+                    }
+                } else if (today.getYear() === year2) {
+                    if (today.getMonth() <= month2) {
+                    } else {
+                        return true;
+                    }
+                } else {
+                    return true;
+                }
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+                } else if (today.getFullYear() === year2) {
+                    if (today.getMonth() === month2) {
+                        if (today.getDate() <= date1) {
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    } else if (today.getMonth() < month2) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return true;
+                }
+            } else {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+    // note: watch out for wrapping around of dates. date ranges, like
+    // month=9 to month=8, wrap around and cover the entire year. this
+    // makes everything more interesting
+    var gmt;
+        if (arguments.length > 2) {
+                if (arguments[arguments.length-1] === "GMT") {
+                        gmt = true;
+            arguments.splice(0,arguments.length-1);
+        }
+        }
     // TODO: change date to gmt, whatever
     var today = new Date();
+    var today = arguments[0]
     var arg1;
 …
     var arg6;
     switch (arguments.length) {
+    switch (arguments.length-1) {
         case 1:
             var arg = arguments[0];
+            var arg = arguments[1];
             if (isDate(arg)) {
                 if (today.getDate() === arg) {
 …
+                }
             } else { // year
                 if (today.getYear() === arg) {
+                if (today.getFullYear() === arg) {
                     return true;
                 } else {
 …
+            }
         case 2:
             arg1 = arguments[0];
             arg2 = arguments[1];
+            arg1 = arguments[1];
+            arg2 = arguments[2];
             if (isDate(arg1) && isDate(arg2)) {
                 var date1 = arg1;
 …
+            }
         case 4:
             arg1 = arguments[0];
             arg2 = arguments[1];
             arg3 = arguments[2];
             arg4 = arguments[3];
+            arg1 = arguments[1];
+            arg2 = arguments[2];
+            arg3 = arguments[3];
+            arg4 = arguments[4];
             if (isDate(arg1) && isMonth(arg2) && isDate(arg3) && isMonth(arg4)) {
 …
+            }
         case 6:
             arg1 = arguments[0];
             arg2 = arguments[1];
             arg3 = arguments[2];
             arg4 = arguments[3];
             arg5 = arguments[4];
             arg6 = arguments[5];
+            arg1 = arguments[1];
+            arg2 = arguments[2];
+            arg3 = arguments[3];
+            arg4 = arguments[4];
+            arg5 = arguments[5];
+            arg6 = arguments[6];
             if (isDate(arg1) && isMonth(arg2) && isYear(arg3) &&
                 isDate(arg4) && isMonth(arg5) && isYear(arg6)) {

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/AccessWarningPane.java

-              r348
+              r418
         try {
+            publisher = file.getInformation().getVendor() != null ? file.getInformation().getVendor() : R("SNoAssociatedCertificate");
+            publisher = file.getInformation().getVendor() != null ?
+                    file.getInformation().getVendor() + " " + R("SUnverified") :
+                    R("SNoAssociatedCertificate");
         } catch (Exception e) {
+        }
 …
+        }
         ImageIcon icon = new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/warning.png"));
+        ImageIcon icon = new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/question.png"));
         JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.LEFT);
         topLabel.setFont(new Font(topLabel.getFont().toString(),

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/CertWarningPane.java

-              r348
+              r418
 /* CertWarningPane.java
    Copyright (C) 2008 Red Hat, Inc.
+   Copyright (C) 2012 Red Hat, Inc.
 This file is part of IcedTea.
 …
         AccessType type = parent.getAccessType();
         JNLPFile file = parent.getFile();
         Certificate c = parent.getJarSigner().getPublisher();
+        Certificate c = parent.getCertVerifier().getPublisher();
         String name = "";
 …
+        }
         //Top label
+        // Labels
         String topLabelText = "";
+        String bottomLabelText = parent.getCertVerifier().getRootInCacerts() ?
+                                 R("STrustedSource") : R("SUntrustedSource");
         String propertyName = "";
+        String iconLocation = "net/sourceforge/jnlp/resources/";
+        boolean alwaysTrustSelected = false;
         if (certVerifier instanceof HttpsCertVerifier) {
+            topLabelText = R("SHttpsUnverified") + " " +
+                                 R("Continue");
+            // HTTPS certs that are verified do not prompt for a dialog.
+            // @see VariableX509TrustManager#checkServerTrusted
+            topLabelText = R("SHttpsUnverified") + " " + R("Continue");
             propertyName = "OptionPane.warningIcon";
+            iconLocation += "warning.png";
         } else
             switch (type) {
 …
                     topLabelText = R("SSigVerified");
                     propertyName = "OptionPane.informationIcon";
+                    iconLocation += "question.png";
+                    alwaysTrustSelected = true;
                     break;
                 case UNVERIFIED:
                     topLabelText = R("SSigUnverified");
                     propertyName = "OptionPane.warningIcon";
+                    iconLocation += "warning.png";
+                    bottomLabelText += " " + R("SWarnFullPermissionsIgnorePolicy");
                     break;
                 case SIGNING_ERROR:
                     topLabelText = R("SSignatureError");
                     propertyName = "OptionPane.warningIcon";
+                    iconLocation += "warning.png";
+                    bottomLabelText += " " + R("SWarnFullPermissionsIgnorePolicy");
                     break;
+            }
         ImageIcon icon = new ImageIcon((new sun.misc.Launcher())
                                 .getClassLoader().getResource("net/sourceforge/jnlp/resources/warning.png"));
+                                .getClassLoader().getResource(iconLocation));
         JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.LEFT);
         topLabel.setFont(new Font(topLabel.getFont().toString(),
 …
         topPanel.setBackground(Color.WHITE);
         topPanel.add(topLabel, BorderLayout.CENTER);
         topPanel.setPreferredSize(new Dimension(400, 60));
+        topPanel.setPreferredSize(new Dimension(400, 75));
         topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 …
         alwaysTrust = new JCheckBox(R("SAlwaysTrustPublisher"));
         alwaysTrust.setEnabled(true);
+        alwaysTrust.setSelected(alwaysTrustSelected);
         JPanel infoPanel = new JPanel(new GridLayout(4, 1));
 …
         add(buttonPanel);
         JLabel bottomLabel;
+        JLabel bottomLabel = new JLabel(htmlWrap(bottomLabelText));;
         JButton moreInfo = new JButton(R("ButMoreInformation"));
         moreInfo.addActionListener(new MoreInfoButtonListener());
-        if (parent.getJarSigner().getRootInCacerts())
-            bottomLabel = new JLabel(htmlWrap(R("STrustedSource")));
-        else
-            bottomLabel = new JLabel(htmlWrap(R("SUntrustedSource")));
         JPanel bottomPanel = new JPanel();
 …
         bottomPanel.add(bottomLabel);
         bottomPanel.add(moreInfo);
         bottomPanel.setPreferredSize(new Dimension(500, 100));
+        bottomPanel.setPreferredSize(new Dimension(600, 100));
         bottomPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
         add(bottomPanel);
 …
     private class MoreInfoButtonListener implements ActionListener {
         public void actionPerformed(ActionEvent e) {
             SecurityDialog.showMoreInfoDialog(parent.getJarSigner(),
+            SecurityDialog.showMoreInfoDialog(parent.getCertVerifier(),
                                 parent);
+        }
 …
                 try {
                     KeyStore ks = KeyStores.getKeyStore(Level.USER, Type.CERTS);
                     X509Certificate c = (X509Certificate) parent.getJarSigner().getPublisher();
+                    X509Certificate c = (X509Certificate) parent.getCertVerifier().getPublisher();
                     CertificateUtils.addToKeyStore(c, ks);
                     File keyStoreFile = new File(KeyStores.getKeyStoreLocation(Level.USER, Type.CERTS));

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/CertificateUtils.java

-              r348
+              r418
 import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.math.BigInteger;
+import java.security.InvalidKeyException;
+import java.security.Key;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SignatureException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.Enumeration;
 import java.util.Random;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import sun.misc.BASE64Encoder;
+import net.sourceforge.jnlp.runtime.Translator;
+import net.sourceforge.jnlp.util.replacements.BASE64Encoder;
 import sun.security.provider.X509Factory;
 …
+    }
+    public static void addPKCS12ToKeyStore(File file, KeyStore ks, char[] password)
+            throws Exception {
+        BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
+        KeyStore keyStore = KeyStore.getInstance("PKCS12");
+        keyStore.load(bis, password);
+        Enumeration<String> aliasList = keyStore.aliases();
+        while (aliasList.hasMoreElements()) {
+            String alias = aliasList.nextElement();
+            Certificate[] certChain = keyStore.getCertificateChain(alias);
+            Key key = keyStore.getKey(alias, password);
+            addPKCS12ToKeyStore(certChain, key, ks);
+        }
+    }
+    public static void addPKCS12ToKeyStore(Certificate[] certChain, Key key, KeyStore ks)
+            throws KeyStoreException {
+        String alias = null;
+        // does this certificate already exist?
+        alias = ks.getCertificateAlias(certChain[0]);
+        if (alias != null) {
+            return;
+        }
+        // create a unique alias for this new certificate
+        Random random = new Random();
+        do {
+            alias = new BigInteger(20, random).toString();
+        } while (ks.getCertificate(alias) != null);
+        ks.setKeyEntry(alias, key, KeyStores.getPassword(), certChain);
+    }
     /**
      * Checks whether an X509Certificate is already in one of the keystores
 …
         for (int i = 0; i < keyStores.length; i++) {
             try {
+                if (keyStores[i].getCertificateAlias(c) != null) {
+                    if (JNLPRuntime.isDebug()) {
+                        System.out.println(c.getSubjectX500Principal().getName() + " found in cacerts");
+                    }
+                    return true;
+                // Check against all certs
+                Enumeration<String> aliases = keyStores[i].aliases();
+                while (aliases.hasMoreElements()) {
+                    // Verify against this entry
+                    String alias = aliases.nextElement();
+                    if (c.equals(keyStores[i].getCertificate(alias))) {
+                        if (JNLPRuntime.isDebug()) {
+                            System.out.println(Translator.R("LCertFoundIn", c.getSubjectX500Principal().getName(), KeyStores.getPathToKeystore(keyStores[i].hashCode())));
+                        }
+                        return true;
+                    } // else continue
+                }
             } catch (KeyStoreException e) {
                 e.printStackTrace();
 …
         out.println(X509Factory.END_CERT);
+    }
+    public static void dumpPKCS12(String alias, File file, KeyStore ks, char[] password)
+            throws Exception {
+        Certificate[] certChain = ks.getCertificateChain(alias);
+        Key key = ks.getKey(alias, KeyStores.getPassword());
+        BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file));
+        KeyStore keyStore = KeyStore.getInstance("PKCS12");
+        keyStore.load(null, null);
+        keyStore.setKeyEntry(alias, key, password, certChain);
+        keyStore.store(bos, password);
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/CertsInfoPane.java

r348	r418
85	85	*/
86	86	void buildTree() {
87		certPath = parent.get~~JarSign~~er().getCertPath();
	87	certPath = parent.getCertVerifier().getCertPath();
88	88	X509Certificate firstCert =
89	89	((X509Certificate) certPath.getCertificates().get(0));

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/KeyStores.java

-              r348
+              r418
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.StringTokenizer;
 …
+    }
+    public static final Map<Integer,String> keystoresPaths=new HashMap<Integer, String>();
     private static DeploymentConfiguration config = null;
 …
         try {
             ks = createKeyStoreFromFile(new File(location), create, DEFAULT_PASSWORD);
+            //hashcode is used instead of instance so when no references are left
+            //to keystore, then this will not be blocker for garbage collection
+            keystoresPaths.put(ks.hashCode(),location);
         } catch (Exception e) {
             e.printStackTrace();
+        }
         return ks;
+    }
+    public static String getPathToKeystore(int k) {
+        String s = keystoresPaths.get(k);
+        if (s == null) {
+            return "unknown keystore location";
+        }
+        return s;
+    }

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/MoreInfoPane.java

-              r348
+              r418
 public class MoreInfoPane extends SecurityDialogPanel {
+    private boolean showSignedJNLPWarning;
     public MoreInfoPane(SecurityDialog x, CertVerifier certVerifier) {
         super(x, certVerifier);
+        showSignedJNLPWarning= x.requiresSignedJNLPWarning();
         addComponents();
+    }
 …
         ArrayList<String> details = certVerifier.getDetails();
+        // Show signed JNLP warning if the signed main jar does not have a
+        // signed JNLP file and the launching JNLP file contains special properties
+        if(showSignedJNLPWarning)
+            details.add(R("SJNLPFileIsNotSigned"));
         int numLabels = details.size();
         JPanel errorPanel = new JPanel(new GridLayout(numLabels, 1));
 …
             errorPanel.add(new JLabel(htmlWrap(details.get(i)), icon, SwingConstants.LEFT));
+        }
+        // Removes signed JNLP warning after it has been used. This will avoid
+        // any alteration to certVerifier.
+        if(showSignedJNLPWarning)
+            details.remove(details.size()-1);
         JPanel buttonsPanel = new JPanel(new BorderLayout());
 …
     private class CertInfoButtonListener implements ActionListener {
         public void actionPerformed(ActionEvent e) {
             SecurityDialog.showCertInfoDialog(parent.getJarSigner(),
+            SecurityDialog.showCertInfoDialog(parent.getCertVerifier(),
                                 parent);
+        }

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/SecurityDialog.java

-              r348
+              r418
 import net.sourceforge.jnlp.security.SecurityDialogs.AccessType;
 import net.sourceforge.jnlp.security.SecurityDialogs.DialogType;
+import net.sourceforge.jnlp.util.ImageResources;
 import java.awt.*;
 …
     private Object value;
+    SecurityDialog(DialogType dialogType, AccessType accessType,
+                JNLPFile file, CertVerifier jarSigner, X509Certificate cert, Object[] extras) {
+    /** Should show signed JNLP file warning */
+    private boolean requiresSignedJNLPWarning;
+    SecurityDialog(DialogType dialogType, AccessType accessType,
+                JNLPFile file, CertVerifier JarCertVerifier, X509Certificate cert, Object[] extras) {
         super();
+        setIconImages(ImageResources.INSTANCE.getApplicationImages());
         this.dialogType = dialogType;
         this.accessType = accessType;
         this.file = file;
         this.certVerifier = jarSigner;
+        this.certVerifier = JarCertVerifier;
         this.cert = cert;
         this.extras = extras;
         initialized = true;
+        if(file != null)
+            requiresSignedJNLPWarning= file.requiresSignedJNLPWarning();
         initDialog();
+    }
 …
      */
     SecurityDialog(DialogType dialogType, AccessType accessType,
                         JNLPFile file, CertVerifier jarSigner) {
         this(dialogType, accessType, file, jarSigner, null, null);
+                        JNLPFile file, CertVerifier certVerifier) {
+        this(dialogType, accessType, file, certVerifier, null, null);
+    }
 …
      * Shows more information regarding jar code signing
+     *
      * @param jarSigner the JarSigner used to verify this application
+     * @param certVerifier the JarCertVerifier used to verify this application
      * @param parent the parent option pane
      */
     public static void showMoreInfoDialog(
+                CertVerifier jarSigner, SecurityDialog parent) {
+                CertVerifier certVerifier, SecurityDialog parent) {
+        JNLPFile file= parent.getFile();
         SecurityDialog dialog =
                         new SecurityDialog(DialogType.MORE_INFO, null, null,
                                 jarSigner);
+                        new SecurityDialog(DialogType.MORE_INFO, null, file,
+                                certVerifier);
         dialog.setModalityType(ModalityType.APPLICATION_MODAL);
         dialog.setVisible(true);
 …
      * Displays CertPath information in a readable table format.
+     *
      * @param jarSigner the JarSigner used to verify this application
+     * @param certVerifier the JarCertVerifier used to verify this application
      * @param parent the parent option pane
      */
     public static void showCertInfoDialog(CertVerifier jarSigner,
+    public static void showCertInfoDialog(CertVerifier certVerifier,
                 SecurityDialog parent) {
         SecurityDialog dialog = new SecurityDialog(DialogType.CERT_INFO,
                         null, null, jarSigner);
+                        null, null, certVerifier);
         dialog.setLocationRelativeTo(parent);
         dialog.setModalityType(ModalityType.APPLICATION_MODAL);
 …
         String dialogTitle = "";
+        if (dialogType == DialogType.CERT_WARNING)
+            dialogTitle = "Warning - Security";
+        else if (dialogType == DialogType.MORE_INFO)
+        if (dialogType == DialogType.CERT_WARNING) {
+            if (accessType == AccessType.VERIFIED)
+                dialogTitle = "Security Approval Required";
+            else
+                dialogTitle = "Security Warning";
+        } else if (dialogType == DialogType.MORE_INFO)
             dialogTitle = "More Information";
         else if (dialogType == DialogType.CERT_INFO)
 …
+    }
     public CertVerifier getJarSigner() {
+    public CertVerifier getCertVerifier() {
         return certVerifier;
+    }
 …
         listeners.add(listener);
+    }
+    public boolean requiresSignedJNLPWarning()
+    {
+        return requiresSignedJNLPWarning;
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/SecurityDialogs.java

-              r348
+              r418
      * @param accessType the type of warning dialog to show
      * @param file the JNLPFile associated with this warning
+     * @param jarSigner the JarSigner used to verify this application
+     * @param certVerifier the JarCertVerifier used to verify this application
+     *
+     * @return true if the user accepted the certificate
      */
     public static boolean showCertWarningDialog(AccessType accessType,
             JNLPFile file, CertVerifier jarSigner) {
+            JNLPFile file, CertVerifier certVerifier) {
         if (!shouldPromptUser()) {
 …
         message.accessType = accessType;
         message.file = file;
         message.certVerifier = jarSigner;
+        message.certVerifier = certVerifier;
         Object selectedValue = getUserResponse(message);

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java

-              r348
+              r418
 package net.sourceforge.jnlp.security;
+import java.security.AccessController;
 import java.security.KeyStore;
+import java.security.PrivilegedAction;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 …
 import com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.security.SecurityDialogs.AccessType;
 …
      * @return user's response
      */
+    private boolean askUser(X509Certificate[] chain, String authType,
+                            boolean isTrusted, boolean hostMatched,
+                            String hostName) {
+        return SecurityDialogs.showCertWarningDialog(
+    private boolean askUser(final X509Certificate[] chain, final String authType,
+                            final boolean isTrusted, final boolean hostMatched,
+                            final String hostName) {
+        if (JNLPRuntime.isTrustAll()){
+            return true;
+        }
+        final VariableX509TrustManager trustManager = this;
+        return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+            @Override
+            public Boolean run() {
+                return SecurityDialogs.showCertWarningDialog(
                         AccessType.UNVERIFIED, null,
                         new HttpsCertVerifier(this, chain, authType,
+                        new HttpsCertVerifier(trustManager, chain, authType,
                                               isTrusted, hostMatched,
                                               hostName));
+            }
+        });
+    }

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java

-              r348
+              r418
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JPasswordField;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 …
             new CertificateType(KeyStores.Type.CERTS),
             new CertificateType(KeyStores.Type.JSSE_CERTS),
+            new CertificateType(KeyStores.Type.CLIENT_CERTS)
         };
 …
+    }
+    private char[] getPassword(final String label) {
+        JPasswordField jpf = new JPasswordField();
+        int result = JOptionPane.showConfirmDialog(parent,
+                                new Object[]{label, jpf},  R("CVPasswordTitle"),
+                                JOptionPane.OK_CANCEL_OPTION,
+                                JOptionPane.INFORMATION_MESSAGE);
+        if (result == JOptionPane.OK_OPTION)
+            return jpf.getPassword();
+        else
+            return null;
+    }
     /** Allows storing KeyStores.Types in a JComponent */
     private static class CertificateType {
 …
                 try {
                     KeyStore ks = keyStore;
+                    CertificateUtils.addToKeyStore(chooser.getSelectedFile(), ks);
+                    if (currentKeyStoreType == KeyStores.Type.CLIENT_CERTS) {
+                        char[] password = getPassword(R("CVImportPasswordMessage"));
+                        if (password != null) {
+                            CertificateUtils.addPKCS12ToKeyStore(
+                                       chooser.getSelectedFile(), ks, password);
+                        } else {
+                            return;
+                        }
+                    } else {
+                        CertificateUtils.addToKeyStore(chooser.getSelectedFile(), ks);
+                    }
                     File keyStoreFile = new File(KeyStores
                                         .getKeyStoreLocation(currentKeyStoreLevel, currentKeyStoreType));
 …
                                                         .get(selectedRow));
                         if (alias != null) {
+                            Certificate c = keyStore.getCertificate(alias);
+                            PrintStream ps = new PrintStream(chooser.getSelectedFile().getAbsolutePath());
+                            CertificateUtils.dump(c, ps);
+                            if (currentKeyStoreType == KeyStores.Type.CLIENT_CERTS) {
+                                char[] password = getPassword(R("CVExportPasswordMessage"));
+                                if (password != null)
+                                    CertificateUtils.dumpPKCS12(alias, chooser.getSelectedFile(), keyStore, password);
+                            } else {
+                                Certificate c = keyStore.getCertificate(alias);
+                                PrintStream ps = new PrintStream(chooser.getSelectedFile().getAbsolutePath());
+                                CertificateUtils.dump(c, ps);
+                            }
                             repopulateTables();
+                        }

trunk/icedtea-web/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java

-              r348
+              r418
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.ImageResources;
 public class CertificateViewer extends JDialog {
 …
     public CertificateViewer() {
         super((Frame) null, dialogTitle, true);
+        setIconImages(ImageResources.INSTANCE.getApplicationImages());
         Container contentPane = getContentPane();

trunk/icedtea-web/netx/net/sourceforge/jnlp/services/ServiceUtil.java

-              r348
+              r418
                 Object... extras) {
+        if (app == null)
+            app = JNLPRuntime.getApplication();
+        boolean codeTrusted = true;
+        StackTraceElement[] stack = Thread.currentThread().getStackTrace();
+        for (int i = 0; i < stack.length; i++) {
+            Class c = null;
+            try {
+                c = Class.forName(stack[i].getClassName());
+            } catch (Exception e1) {
+                try {
+                    c = Class.forName(stack[i].getClassName(), false, app.getClassLoader());
+                } catch (Exception e2) {
+                    System.err.println(e2.getMessage());
+                }
+            }
+            // Everything up to the desired class/method must be trusted
+            if (c == null || // class not found
+                    (c.getProtectionDomain().getCodeSource() != null && // class is not in bootclasspath
+                    c.getProtectionDomain().getCodeSource().getCodeSigners() == null) // class is trusted
+            ) {
+                codeTrusted = false;
+            }
+        }
+        if (!codeTrusted) {
+        boolean trusted = isSigned(app);
+        if (!trusted) {
             if (!shouldPromptUser()) {
                 return false;
+            }
+            if (app == null)
+                app = JNLPRuntime.getApplication();
             final AccessType tmpType = type;
 …
         });
+    }
+    /**
+     * Returns whether the app requesting a JNLP service is a trusted
+     * application
+     *
+     * @param app
+     *            the application which is requesting the check. If null, the
+     *            current application is used.
+     * @return true, if the app is a trusted application; false otherwise
+     */
+    public static boolean isSigned(ApplicationInstance app) {
+        if (app == null)
+            app = JNLPRuntime.getApplication();
+        StackTraceElement[] stack = Thread.currentThread().getStackTrace();
+        for (int i = 0; i < stack.length; i++) {
+            Class c = null;
+            try {
+                c = Class.forName(stack[i].getClassName());
+            } catch (Exception e1) {
+                try {
+                    c = Class.forName(stack[i].getClassName(), false,
+                            app.getClassLoader());
+                } catch (Exception e2) {
+                    System.err.println(e2.getMessage());
+                }
+            }
+            // Everything up to the desired class/method must be trusted
+            if (c == null || // class not found
+                    (c.getProtectionDomain().getCodeSource() != null && // class is not in bootclasspath
+                    c.getProtectionDomain().getCodeSource().getCodeSigners() == null) // class is trusted
+            ) {
+                return false;
+            }
+        }
+        return true;
+    }
+}

trunk/icedtea-web/netx/net/sourceforge/jnlp/services/XPersistenceService.java

-              r348
+              r418
         URL source = app.getJNLPFile().getCodeBase();
+        if (!source.getHost().equalsIgnoreCase(location.getHost())
+                && !ServiceUtil.isSigned(app)) // Allow trusted application to have access to data from a different host
+            throw new MalformedURLException(
+                    "Untrusted application cannot access data from a different host.");
-        if (!source.getHost().equalsIgnoreCase(location.getHost()))
-            throw new MalformedURLException("Cannot access data from a different host.");
         // test for above codebase, not perfect but works for now
 …
+        }
+        if (!source.getFile().startsWith(requestPath))
+            throw new MalformedURLException("Cannot access data below source URL path.");
+        if (!source.getFile().startsWith(requestPath)
+                && !ServiceUtil.isSigned(app)) // Allow trusted application to have access to data below source URL path
+            throw new MalformedURLException(
+                    "Cannot access data below source URL path.");
+    }
 …
         File file = toCacheFile(location);
         if (!file.exists())
+        if (!file.exists()) {
             throw new FileNotFoundException("Persistence store for "
                     + location.toString() + " is not found.");
+        }
         FileUtils.createParentDir(file, "Persistence store for "
                     + location.toString());

trunk/icedtea-web/netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java

r348	r418
34	34
35	35	// Class and methods marked as public so that they can be
36		// accessed by Jar~~Sign~~er, which although lies in a package
	36	// accessed by JarCertVerifier, which although lies in a package
37	37	// with the same name, but bundled in tools.jar and loaded
38	38	// by another class loader, hence in a different runtime

trunk/icedtea-web/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java

r348	r418
83	83	JOptionPane optionPane = new JOptionPane(mainPanel, JOptionPane.ERROR_MESSAGE);
84	84	final JDialog errorDialog = optionPane.createDialog(R("Error"));
	85	errorDialog.setIconImages(ImageResources.INSTANCE.getApplicationImages());
85	86
86	87	final JPanel quickInfoPanel = new JPanel();

trunk/icedtea-web/netx/net/sourceforge/jnlp/util/PropertiesFile.java

-              r348
+              r418
     /** the header string */
     String header = "netx file";
     /** lazy loaded on getProperty */
     boolean loaded = false;
+    /** time of last modification, lazy loaded on getProperty */
+    long lastStore;
     /**
 …
      */
     public String getProperty(String key) {
         if (!loaded)
+        if (lastStore == 0)
             load();
 …
      */
     public String getProperty(String key, String defaultValue) {
         if (!loaded)
+        if (lastStore == 0)
             load();
 …
      */
     public Object setProperty(String key, String value) {
         if (!loaded)
+        if (lastStore == 0)
             load();
 …
      * loaded; call this method before calling any method defined by
      * a superclass.
+     *
+     * @return true, if file was (re-)loaded
+     *         false, if file was still current
      */
+    public void load() {
+        loaded = true;
+    public boolean load() {
+        InputStream s = null;
+        try {
+            if (!file.exists())
+                return;
+        if (!file.exists()) {
+            return false;
+        }
+        long currentStore = file.lastModified();
+        long currentTime = System.currentTimeMillis();
+        /* (re)load file, if
+         *  - it wasn't loaded/stored, yet (lastStore == 0)
+         *  - current file modification timestamp has changed since last store (currentStore != lastStore) OR
+         *  - current file modification timestamp has not changed since last store AND current system time equals current file modification timestamp
+         *    This is necessary because some filesystems seems only to provide accuracy of the timestamp on the level of seconds!
+         */
+        if(lastStore == 0 || currentStore != lastStore || (currentStore == lastStore && currentStore / 1000 == currentTime / 1000)) {
+            InputStream s = null;
             try {
+                s = new FileInputStream(file);
+                load(s);
+            } finally {
+                if (s != null) s.close();
+                try {
+                    s = new FileInputStream(file);
+                    load(s);
+                } finally {
+                    if (s != null) {
+                        s.close();
+                        lastStore=currentStore;
+                        return true;
+                    }
+                }
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
-        } catch (IOException ex) {
-            ex.printStackTrace();
+        }
+        return false;
+    }
 …
      */
     public void store() {
-        if (!loaded)
-            return; // nothing could have changed so save unnecessary load/save
         OutputStream s = null;
+        FileOutputStream s = null;
         try {
             try {
+                file.getParentFile().mkdirs();
                 s = new FileOutputStream(file);
                 store(s, header);
+                // fsync()
+                s.getChannel().force(true);
+                lastStore = file.lastModified();
             } finally {
                 if (s != null) s.close();

trunk/icedtea-web/netx/net/sourceforge/nanoxml/XMLElement.java

-              r348
+              r418
      *             xml file.
      */
     public void sanitizeInput(InputStreamReader isr, PipedOutputStream pout) {
+    public void sanitizeInput(Reader isr, OutputStream pout) {
         try {
             PrintStream out = new PrintStream(pout);
 …
                 this.sanitizeCharReadTooMuch = next;
                 // If the next char is a ? or !, then we've hit a special tag,
+                // If the next chars are !--, then we've hit a comment tag,
                 // and should skip it.
+                if (prev == '<' && (next == '!' || next == '?')) {
+                    this.skipSpecialTag(0);
+                    this.sanitizeCharReadTooMuch = '\0';
+                if (ch == '<' && sanitizeCharReadTooMuch == '!') {
+                    ch = (char) this.reader.read();
+                    if (ch == '-') {
+                        ch = (char) this.reader.read();
+                        if (ch == '-') {
+                            this.skipComment();
+                            this.sanitizeCharReadTooMuch = '\0';
+                        } else {
+                            out.print('<');
+                            out.print('!');
+                            out.print('-');
+                            this.sanitizeCharReadTooMuch = ch;
+                            if (JNLPRuntime.isDebug()) {
+                                System.out.print('<');
+                                System.out.print('!');
+                                System.out.print('-');
+                            }
+                        }
+                    } else {
+                        out.print('<');
+                        out.print('!');
+                        this.sanitizeCharReadTooMuch = ch;
+                        if (JNLPRuntime.isDebug()) {
+                            System.out.print('<');
+                            System.out.print('!');
+                        }
+                    }
+                }
                 // Otherwise we haven't hit a comment, and we should write ch.

trunk/icedtea-web/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc

-              r358
+              r418
+    {
         className = "java.lang.String";
+#if MOZILLA_VERSION_COLLAPSED < 1090200
+        stringArg += NPVARIANT_TO_STRING(variant).utf8characters;
+#else
+        stringArg += NPVARIANT_TO_STRING(variant).UTF8Characters;
+#endif
+        stringArg = IcedTeaPluginUtilities::NPVariantAsString(variant);
     } else if (NPVARIANT_IS_OBJECT(variant))
+    {
 …
             PLUGIN_DEBUG("NPObject is not a Java object\n");
             NPIdentifier length_id = browser_functions.getstringidentifier("length");
+            bool isJSObjectArray = false;
             // FIXME: We currently only handle <= 2 dim arrays. Do we really need more though?
 …
                 IcedTeaPluginUtilities::itoa(NPVARIANT_TO_INT32(length), &length_str);
                 if (NPVARIANT_TO_INT32(length) > 0)
+                if (NPVARIANT_TO_INT32(length) >= 0)
+                {
                     NPIdentifier id_0 = browser_functions.getintidentifier(0);
 …
                         getArrayTypeForJava(instance, first_element, &java_array_type);
+                    }
+                } else
+                    java_array_type.append("jsobject");
+                }
+                // For JSObject arrays, we create a regular object (accessible via JSObject.getSlot())
+                if (NPVARIANT_TO_INT32(length) < 0 || !java_array_type.compare("jsobject"))
+                {
+                    isJSObjectArray = true;
+                    goto createRegularObject;
+                }
                 java_result = java_request.newArray(java_array_type, length_str);
 …
                 // Got here => no errors above. We're good to return!
                 return;
+            } else // Else it is not an array
+            }
+            createRegularObject:
+            if (!IcedTeaPluginUtilities::isObjectJSArray(instance, obj) || isJSObjectArray) // Else it is not an array
+            {

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

-              r394
+              r418
 #define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
 #define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
+#ifdef HAVE_JAVA7
+ #define JPI_VERSION "1.7.0_" JDK_UPDATE_VERSION
+ #define PLUGIN_APPLET_MIME_DESC7 \
+  "application/x-java-applet;version=1.7:class,jar:IcedTea;"
+ #define PLUGIN_BEAN_MIME_DESC7 \
+  "application/x-java-bean;version=1.7:class,jar:IcedTea;"
+#else
+ #define JPI_VERSION "1.6.0_" JDK_UPDATE_VERSION
+ #define PLUGIN_APPLET_MIME_DESC7
+ #define PLUGIN_BEAN_MIME_DESC7
+#endif
 #define PLUGIN_MIME_DESC                                               \
 …
   "application/x-java-applet;version=1.5:class,jar:IcedTea;"           \
   "application/x-java-applet;version=1.6:class,jar:IcedTea;"           \
+  "application/x-java-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"  \
+  PLUGIN_APPLET_MIME_DESC7 \
+  "application/x-java-applet;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"  \
   "application/x-java-bean:class,jar:IcedTea;"                         \
   "application/x-java-bean;version=1.1:class,jar:IcedTea;"             \
 …
   "application/x-java-bean;version=1.5:class,jar:IcedTea;"             \
   "application/x-java-bean;version=1.6:class,jar:IcedTea;"             \
+  "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"    \
+  PLUGIN_BEAN_MIME_DESC7 \
+  "application/x-java-bean;jpi-version=" JPI_VERSION ":class,jar:IcedTea;"    \
   "application/x-java-vm-npruntime::IcedTea;"
 …
 pthread_cond_t cond_message_available = PTHREAD_COND_INITIALIZER;
+#ifdef LEGACY_GLIB
+// Returns key from first item stored in hashtable
+gboolean
+find_first_item_in_hash_table(gpointer key, gpointer value, gpointer user_data)
+{
+    user_data = key;
+    return (gboolean)TRUE;
+}
+int
+g_strcmp0(char *str1, char *str2)
+{
+   if (str1 != NULL)
+     return str2 != NULL ? strcmp(str1, str2) : 1;
+   else // str1 == NULL
+     return str2 != NULL ? 1 : 0;
+}
+#endif
+/*
+ * Find first member in GHashTable* depending on version of glib
+ */
+gpointer getFirstInTableInstance(GHashTable* table)
+{
+      gpointer id, instance;
+      #ifndef LEGACY_GLIB
+        GHashTableIter iter;
+        g_hash_table_iter_init (&iter, table);
+        g_hash_table_iter_next (&iter, &instance, &id);
+      #else
+        g_hash_table_find(table, (GHRFunc)find_first_item_in_hash_table, &instance);
+      #endif
+        return instance;
+}
 // Functions prefixed by ITNP_ are instance functions.  They are called
 // by the browser and operate on instances of ITNPPluginData.
 …
  cleanup_appletviewer_mutex:
   g_free (data->appletviewer_mutex);
+  g_mutex_free (data->appletviewer_mutex);
   data->appletviewer_mutex = NULL;
 …
 get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len)
+{
+  // Only attempt to perform this operation if there is a valid plugin instance
+  if (g_hash_table_size(instance_to_id_map) <= 0)
+  {
+    return NPERR_GENERIC_ERROR;
+  }
 #if MOZILLA_VERSION_COLLAPSED < 1090100
   nsresult rv;
 …
   if (browser_functions.getvalueforurl)
+  {
+      GHashTableIter iter;
+      gpointer id, instance;
+      g_hash_table_iter_init (&iter, instance_to_id_map);
+      g_hash_table_iter_next (&iter, &instance, &id);
+      gpointer instance=getFirstInTableInstance(instance_to_id_map);
       return browser_functions.getvalueforurl((NPP) instance, NPNURLVCookie, siteAddr, cookieString, len);
   } else
 …
   return NPERR_NO_ERROR;
+}
+static NPError
+set_cookie_info(const char* siteAddr, const char* cookieString, uint32_t len)
+{
+  // Only attempt to perform this operation if there is a valid plugin instance
+  if (g_hash_table_size(instance_to_id_map) > 0 && browser_functions.getvalueforurl)
+  {
+      // We arbitrarily use the first valid instance we can grab
+      // For an explanation of the logic behind this, see get_cookie_info
+      gpointer instance = getFirstInTableInstance(instance_to_id_map);
+      return browser_functions.setvalueforurl((NPP) instance, NPNURLVCookie, siteAddr, cookieString, len);
+  }
+  return NPERR_GENERIC_ERROR;;
+}
 …
                                href_id, &href);
+  // Strip everything after the last "/"
+#if MOZILLA_VERSION_COLLAPSED < 1090200
+  gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).utf8characters, "/", -1);
+#else
+  gchar** parts = g_strsplit (NPVARIANT_TO_STRING(href).UTF8Characters, "/", -1);
+#endif
+  guint parts_sz = g_strv_length (parts);
+  std::string location_str;
+  for (int i=0; i < parts_sz - 1; i++)
+  {
+      location_str += parts[i];
+      location_str += "/";
+  }
+  documentbase_copy = g_strdup (location_str.c_str());
+  std::string href_str = IcedTeaPluginUtilities::NPVariantAsString(href);
+  documentbase_copy = g_strdup (href_str.c_str());
   // Release references.
 …
+}
+static
+void consume_plugin_message(gchar* message) {
+  // internal plugin related message
+  gchar** parts = g_strsplit (message, " ", 5);
+  if (g_str_has_prefix(parts[1], "PluginProxyInfo"))
+  {
+    gchar* proxy;
+    uint32_t len;
+    gchar* decoded_url = (gchar*) calloc(strlen(parts[4]) + 1, sizeof(gchar));
+    IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
+    PLUGIN_DEBUG("parts[0]=%s, parts[1]=%s, reference, parts[3]=%s, parts[4]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[3], parts[4], decoded_url);
+    gchar* proxy_info;
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+        proxy = (char*) malloc(sizeof(char)*2048);
+#endif
+    proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL);
+    if (get_proxy_info(decoded_url, &proxy, &len) == NPERR_NO_ERROR)
+      {
+        proxy_info = g_strconcat (proxy_info, proxy, NULL);
+      }
+    PLUGIN_DEBUG("Proxy info: %s\n", proxy_info);
+    plugin_send_message_to_appletviewer(proxy_info);
+    free(decoded_url);
+    decoded_url = NULL;
+    g_free(proxy_info);
+    proxy_info = NULL;
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+        g_free(proxy);
+        proxy = NULL;
+#endif
+  } else if (g_str_has_prefix(parts[1], "PluginCookieInfo"))
+  {
+    gchar* decoded_url = (gchar*) calloc(strlen(parts[4])+1, sizeof(gchar));
+    IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
+    gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo reference ", parts[3], " ", NULL);
+    gchar* cookie_string;
+    uint32_t len;
+    if (get_cookie_info(decoded_url, &cookie_string, &len) == NPERR_NO_ERROR)
+    {
+        cookie_info = g_strconcat (cookie_info, cookie_string, NULL);
+    }
+    PLUGIN_DEBUG("Cookie info: %s\n", cookie_info);
+    plugin_send_message_to_appletviewer(cookie_info);
+    free(decoded_url);
+    decoded_url = NULL;
+    g_free(cookie_info);
+    cookie_info = NULL;
+  } else if (g_str_has_prefix(parts[1], "PluginSetCookie"))
+  {
+    // Message structure: plugin PluginSetCookie reference -1 <url> <cookie>
+    gchar** cookie_parts = g_strsplit (message, " ", 6);
+    if (g_strv_length(cookie_parts) < 6)
+    {
+       g_strfreev (parts);
+       g_strfreev (cookie_parts);
+       return; // Defensive, message _should_ be properly formatted
+    }
+    gchar* decoded_url = (gchar*) calloc(strlen(cookie_parts[4])+1, sizeof(gchar));
+    IcedTeaPluginUtilities::decodeURL(cookie_parts[4], &decoded_url);
+    gchar* cookie_string = cookie_parts[5];
+    uint32_t len = strlen(cookie_string);
+    if (set_cookie_info(decoded_url, cookie_string, len) == NPERR_NO_ERROR)
+    {
+          PLUGIN_DEBUG("Setting cookie for URL %s to %s\n", decoded_url, cookie_string);
+    } else
+    {
+          PLUGIN_DEBUG("Not able to set cookie for URL %s to %s\n", decoded_url, cookie_string);
+    }
+    free(decoded_url);
+    decoded_url = NULL;
+    g_strfreev (cookie_parts);
+    cookie_parts = NULL;
+  }
+  g_strfreev (parts);
+  parts = NULL;
+}
 void consume_message(gchar* message) {
 …
           // clear the "instance X status" parts
           sprintf(parts[0], "");
           sprintf(parts[1], "");
           sprintf(parts[2], "");
+          strcpy(parts[0], "");
+          strcpy(parts[1], "");
+          strcpy(parts[2], "");
           // join the rest
 …
   else if (g_str_has_prefix (message, "plugin "))
+    {
+      // internal plugin related message
+      gchar** parts = g_strsplit (message, " ", 5);
+      if (g_str_has_prefix(parts[1], "PluginProxyInfo"))
+      {
+        gchar* proxy;
+        uint32_t len;
+        gchar* decoded_url = (gchar*) calloc(strlen(parts[4]) + 1, sizeof(gchar));
+        IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
+        PLUGIN_DEBUG("parts[0]=%s, parts[1]=%s, reference, parts[3]=%s, parts[4]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[3], parts[4], decoded_url);
+        gchar* proxy_info;
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+        proxy = (char*) malloc(sizeof(char)*2048);
+#endif
+        proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL);
+        if (get_proxy_info(decoded_url, &proxy, &len) == NPERR_NO_ERROR)
+          {
+            proxy_info = g_strconcat (proxy_info, proxy, NULL);
+          }
+        PLUGIN_DEBUG("Proxy info: %s\n", proxy_info);
+        plugin_send_message_to_appletviewer(proxy_info);
+        g_free(decoded_url);
+        decoded_url = NULL;
+        g_free(proxy_info);
+        proxy_info = NULL;
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+        g_free(proxy);
+        proxy = NULL;
+#endif
+      } else if (g_str_has_prefix(parts[1], "PluginCookieInfo"))
+      {
+        gchar* decoded_url = (gchar*) calloc(strlen(parts[4])+1, sizeof(gchar));
+        IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
+        gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo reference ", parts[3], " ", NULL);
+        gchar* cookie_string;
+        uint32_t len;
+        if (get_cookie_info(decoded_url, &cookie_string, &len) == NPERR_NO_ERROR)
+        {
+            cookie_info = g_strconcat (cookie_info, cookie_string, NULL);
+        }
+        PLUGIN_DEBUG("Cookie info: %s\n", cookie_info);
+        plugin_send_message_to_appletviewer(cookie_info);
+        g_free(decoded_url);
+        decoded_url = NULL;
+        g_free(cookie_info);
+        cookie_info = NULL;
+      }
+        consume_plugin_message(message);
+    }
   else
 …
         g_print ("  Unable to handle message: %s\n", message);
+    }
+}
 …
 get_proxy_info(const char* siteAddr, char** proxy, uint32_t* len)
+{
+  // Only attempt to perform this operation if there is a valid plugin instance
+  if (g_hash_table_size(instance_to_id_map) <= 0)
+  {
+          return NPERR_GENERIC_ERROR;
+  }
 #if MOZILLA_VERSION_COLLAPSED < 1090100
   nsresult rv;
 …
       // As in get_cookie_info, we use the first active instance
+      GHashTableIter iter;
+      gpointer id, instance;
+      g_hash_table_iter_init (&iter, instance_to_id_map);
+      g_hash_table_iter_next (&iter, &instance, &id);
+      gpointer instance=getFirstInTableInstance(instance_to_id_map);
       browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len);
   } else
 …
   // cleanup_appletviewer_mutex:
   g_free (tofree->appletviewer_mutex);
+  g_mutex_free (tofree->appletviewer_mutex);
   tofree->appletviewer_mutex = NULL;
 …
+}
+static NPError
+plugin_get_entry_points (NPPluginFuncs* pluginTable)
+{
+  // Ensure that the plugin function table we've received is large
+  // enough to store the number of functions that we may provide.
+  if (pluginTable->size < sizeof (NPPluginFuncs))
+    {
+      PLUGIN_ERROR ("Invalid plugin function table.");
+      return NPERR_INVALID_FUNCTABLE_ERROR;
+    }
+  // Return to the browser the plugin functions that we implement.
+static bool
+initialize_browser_functions(const NPNetscapeFuncs* browserTable)
+{
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall)
+#else
+#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl)
+#endif
+  //Determine the size in bytes, as a difference of the address past the last used field
+  //And the browser table address
+  size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable;
+  // compare the reported size versus the size we required
+  if (browserTable->size < usedSize)
+  {
+    return false;
+  }
+  //Ensure any unused fields are NULL
+  memset(&browser_functions, 0, sizeof(NPNetscapeFuncs));
+  //browserTable->size can be larger than sizeof(NPNetscapeFuncs) (PR1106)
+  size_t copySize = browserTable->size < sizeof(NPNetscapeFuncs) ?
+                    browserTable->size : sizeof(NPNetscapeFuncs);
+  //Copy fields according to given size
+  memcpy(&browser_functions, browserTable, copySize);
+  return true;
+}
+/* Set the plugin table to the correct contents, taking care not to write past
+ * the provided object space */
+static bool
+initialize_plugin_table(NPPluginFuncs* pluginTable)
+{
+#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue)
+  //Determine the size in bytes, as a difference of the address past the last used field
+  //And the browser table address
+  size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable;
+  // compare the reported size versus the size we required
+  if (pluginTable->size < usedSize)
+    return false;
   pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
   pluginTable->size = sizeof (NPPluginFuncs);
 …
 #endif
   return NPERR_NO_ERROR;
+  return true;
+}
 …
+    }
+  // Ensure that the browser function table is large enough to store
+  // the number of browser functions that we may use.
+  if (browserTable->size < sizeof (NPNetscapeFuncs))
+    {
+      fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n");
+    }
+  // Store in a local table the browser functions that we may use.
+  browser_functions.size                    = browserTable->size;
+  browser_functions.version                 = browserTable->version;
+  browser_functions.geturlnotify            = browserTable->geturlnotify;
+  browser_functions.geturl                  = browserTable->geturl;
+  browser_functions.posturlnotify           = browserTable->posturlnotify;
+  browser_functions.posturl                 = browserTable->posturl;
+  browser_functions.requestread             = browserTable->requestread;
+  browser_functions.newstream               = browserTable->newstream;
+  browser_functions.write                   = browserTable->write;
+  browser_functions.destroystream           = browserTable->destroystream;
+  browser_functions.status                  = browserTable->status;
+  browser_functions.uagent                  = browserTable->uagent;
+  browser_functions.memalloc                = browserTable->memalloc;
+  browser_functions.memfree                 = browserTable->memfree;
+  browser_functions.memflush                = browserTable->memflush;
+  browser_functions.reloadplugins           = browserTable->reloadplugins;
+  browser_functions.getJavaEnv              = browserTable->getJavaEnv;
+  browser_functions.getJavaPeer             = browserTable->getJavaPeer;
+  browser_functions.getvalue                = browserTable->getvalue;
+  browser_functions.setvalue                = browserTable->setvalue;
+  browser_functions.invalidaterect          = browserTable->invalidaterect;
+  browser_functions.invalidateregion        = browserTable->invalidateregion;
+  browser_functions.forceredraw             = browserTable->forceredraw;
+  browser_functions.getstringidentifier     = browserTable->getstringidentifier;
+  browser_functions.getstringidentifiers    = browserTable->getstringidentifiers;
+  browser_functions.getintidentifier        = browserTable->getintidentifier;
+  browser_functions.identifierisstring      = browserTable->identifierisstring;
+  browser_functions.utf8fromidentifier      = browserTable->utf8fromidentifier;
+  browser_functions.intfromidentifier       = browserTable->intfromidentifier;
+  browser_functions.createobject            = browserTable->createobject;
+  browser_functions.retainobject            = browserTable->retainobject;
+  browser_functions.releaseobject           = browserTable->releaseobject;
+  browser_functions.invoke                  = browserTable->invoke;
+  browser_functions.invokeDefault           = browserTable->invokeDefault;
+  browser_functions.evaluate                = browserTable->evaluate;
+  browser_functions.getproperty             = browserTable->getproperty;
+  browser_functions.setproperty             = browserTable->setproperty;
+  browser_functions.removeproperty          = browserTable->removeproperty;
+  browser_functions.hasproperty             = browserTable->hasproperty;
+  browser_functions.hasmethod               = browserTable->hasmethod;
+  browser_functions.releasevariantvalue     = browserTable->releasevariantvalue;
+  browser_functions.setexception            = browserTable->setexception;
+  browser_functions.pluginthreadasynccall   = browserTable->pluginthreadasynccall;
+#if MOZILLA_VERSION_COLLAPSED >= 1090100
+  browser_functions.getvalueforurl          = browserTable->getvalueforurl;
+  browser_functions.setvalueforurl          = browserTable->setvalueforurl;
+#endif
+  NPError np_error = NPERR_NO_ERROR;
+  // Copy into a global table (browser_functions) the browser functions that we may use.
+  // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED
+  // within this function
+  bool browser_functions_supported = initialize_browser_functions(browserTable);
+  // Check if everything we rely on is supported
+  if ( !browser_functions_supported )
+  {
+        PLUGIN_ERROR ("Invalid browser function table.");
+        return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
 #if !defined(_WIN32) && !defined (__OS2__)
+  np_error = plugin_get_entry_points (pluginTable);
+  if (np_error != NPERR_NO_ERROR)
+    return np_error;
+  // Return to the browser the plugin functions that we implement.
+  // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED
+  // within this function
+  bool plugin_functions_supported = initialize_plugin_table(pluginTable);
+  // Check if everything we rely on is supported
+  if ( !plugin_functions_supported )
+  {
+    PLUGIN_ERROR ("Invalid plugin function table.");
+    return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
 #endif
 …
       return NPERR_OUT_OF_MEMORY_ERROR;
+    }
+  NPError np_error = NPERR_NO_ERROR;
+  gchar* filename = NULL;
   // If P_tmpdir does not exist, try /tmp directly
 …
                     (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
+    {
+      int file_error = 0;
       data_directory = g_strconcat ("/tmp", NULL);
         if (!data_directory)
 …
+  }
+  return plugin_get_entry_points (pluginTable);
+  // Return to the browser the plugin functions that we implement.
+  // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED
+  // within this function
+  bool plugin_functions_supported = initialize_plugin_table(pluginTable);
+  // Check if everything we rely on is supported
+  if ( !plugin_functions_supported )
+  {
+    PLUGIN_ERROR ("Invalid plugin function table.");
+    return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
+  return NPERR_NO_ERROR;
+}
 #endif
 …
 // Returns a string describing the MIME type that this plugin
 // handles.
+const char*
+#ifdef LEGACY_XULRUNNERAPI
+  char*
+#else
+  const char*
+#endif
 OSCALL NP_GetMIMEDescription ()
+{

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc

-              r369
+              r418
             this->sendWindow(message_parts);
             return true;
+        } else if (!command->find("Finalize"))
+        {
+            // Object can be finalized from the main thread only. And this
+                // call returns immediately, so we do it in the same thread.
+            this->finalize(message_parts);
+            return true;
         } else if (!command->find("GetMember") ||
                    !command->find("SetMember") ||
 …
                    !command->find("SetSlot") ||
                    !command->find("Eval") ||
-                   !command->find("Finalize") ||
                    !command->find("LoadURL"))
+        {
 …
     IcedTeaPluginUtilities::callAndWaitForResult(instance, &_eval, &thread_data);
-    NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
-    std::string result_variant_jniid = std::string();
-    createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid);
     IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
     response += " JavaScriptEval ";
     response += result_variant_jniid;
+    response += thread_data.result;
     plugin_to_java_bus->post(response.c_str());
 …
     NPVariant* result_variant;
     std::string result_variant_jniid = std::string();
     NPVariant* args_array;
+    NPVariant* args_array = NULL;
     AsyncCallThreadData thread_data = AsyncCallThreadData();
 …
     IcedTeaPluginUtilities::callAndWaitForResult(instance, &_call, &thread_data);
-    result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
-    if (result_variant)
+    {
-        createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid);
-    } else
+    {
-        result_variant_jniid = "0";
+    }
     IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
     response += " JavaScriptCall ";
     response += result_variant_jniid;
+    response += thread_data.result;
     plugin_to_java_bus->post(response.c_str());
 …
     NPP instance;
     NPVariant* member;
+    NPIdentifier property_identifier;
+    std::string property_id = std::string();
+    bool int_identifier;
     JavaRequestProcessor java_request = JavaRequestProcessor();
 …
     if (*(message_parts->at(4)) == "SetSlot")
+    {
+        property_identifier = browser_functions.getintidentifier(atoi(message_parts->at(6)->c_str()));
+        property_id.append(*(message_parts->at(6)));
+        int_identifier = true;
     } else
+    {
 …
+        }
+        property_identifier = browser_functions.getstringidentifier(java_result->return_string->c_str());
+        property_id.append(*(java_result->return_string));
+        int_identifier = false;
+    }
 …
     thread_data.parameters.push_back(instance);
     thread_data.parameters.push_back(NPVARIANT_TO_OBJECT(*member));
     thread_data.parameters.push_back(&property_identifier);
+    thread_data.parameters.push_back(&property_id);
     thread_data.parameters.push_back(&value);
+    thread_data.parameters.push_back(&int_identifier);
     IcedTeaPluginUtilities::callAndWaitForResult(instance, &_setMember, &thread_data);
 …
  * can only be requested from the main thread in Mozilla, this function
  * does whatever it can seperately, and then makes an internal request that
  * causes _sendMember to do the rest of the work.
+ * causes _getMember to do the rest of the work.
+ *
  * @param message_parts The request message
 …
     JavaResultData* java_result;
     NPVariant* parent_ptr;
+    NPVariant* member_ptr;
     //int reference;
     std::string member_id = std::string();
-    std::string jsObjectClassID = std::string();
-    std::string jsObjectConstructorID = std::string();
     std::string response = std::string();
+    std::string result_id = std::string();
     NPIdentifier member_identifier;
 …
     int instance_id;
     int reference;
+    bool int_identifier;
     // debug printout of parent thread data
 …
     if (*(message_parts->at(4)) == "GetSlot")
+    {
         member_identifier = browser_functions.getintidentifier(atoi(member_id.c_str()));
+        int_identifier=true;
     } else
+    {
 …
+        }
+        member_identifier = browser_functions.getstringidentifier(java_result->return_string->c_str());
+        member_id.assign(*(java_result->return_string));
+        int_identifier=false;
+    }
 …
     thread_data.parameters.push_back(instance);
     thread_data.parameters.push_back(NPVARIANT_TO_OBJECT(*parent_ptr));
+    thread_data.parameters.push_back(&member_identifier);
+    thread_data.parameters.push_back(&member_id);
+    thread_data.parameters.push_back(&int_identifier);
     IcedTeaPluginUtilities::callAndWaitForResult(instance, &_getMember, &thread_data);
-    PLUGIN_DEBUG("Member PTR after internal request: %s\n", thread_data.result.c_str());
-    java_result = java_request.findClass(0, "netscape.javascript.JSObject");
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
+    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
+    }
-    jsObjectClassID.append(*(java_result->return_string));
-    args = std::vector<std::string>();
-    std::string longArg = "J";
-    args.push_back(longArg);
-    java_result = java_request.getMethodID(jsObjectClassID,
-                                           browser_functions.getstringidentifier("<init>"),
-                                           args);
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
+    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
+    }
-    jsObjectConstructorID.append(*(java_result->return_string));
-    // We have the method id. Now create a new object.
-    args.clear();
-    args.push_back(thread_data.result);
-    java_result = java_request.newObjectWithConstructor("",
-                                         jsObjectClassID,
-                                         jsObjectConstructorID,
-                                         args);
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
+    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
+    }
     IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
+    if (*(message_parts->at(2)) == "GetSlot")
+    {
+    if (*(message_parts->at(4)) == "GetSlot")
+    {
+        response.append(" JavaScriptGetSlot ");
+    } else {
         response.append(" JavaScriptGetMember ");
+    } else {
+        response.append(" JavaScriptGetSlot ");
+    }
+    response.append(java_result->return_string->c_str());
+    }
+    response.append(thread_data.result);
     plugin_to_java_bus->post(response.c_str());
+}
 …
                 processor->setMember(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
-            } else if (command == "Finalize")
+            {
-                // write methods are synchronized
-                pthread_mutex_lock(&syn_write_mutex);
-                processor->finalize(message_parts);
-                pthread_mutex_unlock(&syn_write_mutex);
             } else if (command == "LoadURL") // For instance X url <url> <target>
+            {
 …
     NPVariant value_variant = NPVariant();
     NPObject* member;
+    NPIdentifier* property;
+    NPIdentifier property_identifier;
     std::vector<void*> parameters = ((AsyncCallThreadData*) data)->parameters;
     instance = (NPP) parameters.at(0);
     member = (NPObject*) parameters.at(1);
     property = (NPIdentifier*) parameters.at(2);
+    std::string*  property_id = (std::string*) parameters.at(2);
     value = (std::string*) parameters.at(3);
+    PLUGIN_DEBUG("Setting %s on instance %p, object %p to value %s\n", browser_functions.utf8fromidentifier(*property), instance, member, value->c_str());
+    bool* int_identifier = (bool*) parameters.at(4);
+    if(*int_identifier==true)
+        property_identifier = browser_functions.getintidentifier(atoi(property_id->c_str()));
+    else
+        property_identifier = browser_functions.getstringidentifier(property_id->c_str());
+    PLUGIN_DEBUG("Setting %s on instance %p, object %p to value %s\n", browser_functions.utf8fromidentifier(property_identifier), instance, member, value->c_str());
     IcedTeaPluginUtilities::javaResultToNPVariant(instance, value, &value_variant);
     ((AsyncCallThreadData*) data)->call_successful = browser_functions.setproperty(instance, member, *property, &value_variant);
+    ((AsyncCallThreadData*) data)->call_successful = browser_functions.setproperty(instance, member, property_identifier, &value_variant);
     ((AsyncCallThreadData*) data)->result_ready = true;
 …
     instance = (NPP) parameters.at(0);
     parent_ptr = (NPObject*) parameters.at(1);
+    NPIdentifier* member_identifier = (NPIdentifier*) parameters.at(2);
+    std::string*  member_id = (std::string*) parameters.at(2);
+    NPIdentifier member_identifier;
+    bool* int_identifier = (bool*) parameters.at(3);
+    if(*int_identifier==true)
+        member_identifier = browser_functions.getintidentifier(atoi(member_id->c_str()));
+    else
+        member_identifier = browser_functions.getstringidentifier(member_id->c_str());
     // Get the NPVariant corresponding to this member
     PLUGIN_DEBUG("Looking for %p %p %p (%s)\n", instance, parent_ptr, member_identifier, browser_functions.utf8fromidentifier(*member_identifier));
     if (!browser_functions.hasproperty(instance, parent_ptr, *member_identifier))
+    {
         printf("%s not found!\n", browser_functions.utf8fromidentifier(*member_identifier));
+    }
     ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, *member_identifier, member_ptr);
+    PLUGIN_DEBUG("Looking for %p %p %p (%s)\n", instance, parent_ptr, member_identifier, browser_functions.utf8fromidentifier(member_identifier));
+    if (!browser_functions.hasproperty(instance, parent_ptr, member_identifier))
+    {
+        printf("%s not found!\n", browser_functions.utf8fromidentifier(member_identifier));
+    }
+    ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, member_identifier, member_ptr);
     IcedTeaPluginUtilities::printNPVariant(*member_ptr);
 …
     if (((AsyncCallThreadData*) data)->call_successful)
+    {
         IcedTeaPluginUtilities::JSIDToString(member_ptr, &member_ptr_str);
+        createJavaObjectFromVariant(instance, *member_ptr, &member_ptr_str);
         ((AsyncCallThreadData*) data)->result.append(member_ptr_str);
+    }
     ((AsyncCallThreadData*) data)->result_ready = true;
 …
     NPIdentifier script_identifier;
     NPString script = NPString();
     NPVariant* eval_result = new NPVariant();
     std::string eval_result_ptr_str = std::string();
+    NPVariant* eval_variant = new NPVariant();
+    std::string eval_variant_str = std::string();
     PLUGIN_DEBUG("_eval called\n");
 …
     script.utf8length = script_str->size();
     PLUGIN_DEBUG("Evaluating: %s\n", script.utf8characters);
+    PLUGIN_DEBUG("Evaluating: %s\n", script_str->c_str());
 #else
     script.UTF8Characters = script_str->c_str();
     script.UTF8Length = script_str->size();
     PLUGIN_DEBUG("Evaluating: %s\n", script.UTF8Characters);
+    PLUGIN_DEBUG("Evaluating: %s\n", script_str->c_str());
 #endif
     ((AsyncCallThreadData*) data)->call_successful = browser_functions.evaluate(instance, window_ptr, &script, eval_result);
     IcedTeaPluginUtilities::printNPVariant(*eval_result);
+    ((AsyncCallThreadData*) data)->call_successful = browser_functions.evaluate(instance, window_ptr, &script, eval_variant);
+    IcedTeaPluginUtilities::printNPVariant(*eval_variant);
     if (((AsyncCallThreadData*) data)->call_successful)
+    {
+        IcedTeaPluginUtilities::JSIDToString(eval_result, &eval_result_ptr_str);
+        ((AsyncCallThreadData*) data)->result.append(eval_result_ptr_str);
+    }
+        if (eval_variant)
+        {
+            createJavaObjectFromVariant(instance, *eval_variant, &eval_variant_str);
+        } else
+        {
+            eval_variant_str = "0";
+        }
+    } else
+    {
+        eval_variant_str = "0";
+    }
+    ((AsyncCallThreadData*) data)->result.append(eval_variant_str);
     ((AsyncCallThreadData*) data)->result_ready = true;
 …
     if (((AsyncCallThreadData*) data)->call_successful)
+    {
+        IcedTeaPluginUtilities::JSIDToString(call_result, &call_result_ptr_str);
+        ((AsyncCallThreadData*) data)->result.append(call_result_ptr_str);
+    }
+        if (call_result)
+        {
+            createJavaObjectFromVariant(instance, *call_result, &call_result_ptr_str);
+        } else
+        {
+                call_result_ptr_str = "0";
+        }
+    } else
+    {
+        call_result_ptr_str = "0";
+    }
+    ((AsyncCallThreadData*) data)->result.append(call_result_ptr_str);
     ((AsyncCallThreadData*) data)->result_ready = true;
 …
     ((AsyncCallThreadData*) data)->result_ready = true;
     g_free(decoded_url);
+    free(decoded_url);
     decoded_url = NULL;

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginUtils.cc

-              r375
+              r418
 IcedTeaPluginUtilities::JSIDToString(void* id, std::string* result)
+{
+        char* id_str = (char*) malloc(sizeof(char)*20); // max = long long = 8446744073709551615 == 19 chars
+        char id_str[NUM_STR_BUFFER_SIZE];
         if (sizeof(void*) == sizeof(long long))
+        {
                 sprintf(id_str, "%llu", id);
+                snprintf(id_str, NUM_STR_BUFFER_SIZE, "%llu", id);
+        }
         else
+        {
                 sprintf(id_str, "%lu", id); // else use long
+                snprintf(id_str, NUM_STR_BUFFER_SIZE, "%lu", id); // else use long
+        }
 …
         PLUGIN_DEBUG("Converting pointer %p to %s\n", id, id_str);
-        free(id_str);
+}
 …
 IcedTeaPluginUtilities::itoa(int i, std::string* result)
+{
+        // largest possible integer is 10 digits long
+        char* int_str = (char*) malloc(sizeof(char)*11);
+        sprintf(int_str, "%d", i);
+        char int_str[NUM_STR_BUFFER_SIZE];
+        snprintf(int_str, NUM_STR_BUFFER_SIZE, "%d", i);
         result->append(int_str);
-        free(int_str);
+}
 …
  * @param str The string to split
  * @param The delimiters to split on
  * @return A string vector containing the aplit components
+ * @return A string vector containing the split components
  */
 …
         char* copy;
         // Tokening is done on a copy
+        // Tokenization is done on a copy
         copy = (char*) malloc (sizeof(char)*strlen(str) + 1);
         strcpy(copy, str);
 …
             // Allocation on heap since caller has no way to knowing how much will
             // be needed. Make sure caller cleans up!
                 std::string* s = new std::string();
                 s->append(tok_ptr);
                 v->push_back(s);
                 tok_ptr = strtok (NULL, " ");
+            std::string* s = new std::string();
+            s->append(tok_ptr);
+            v->push_back(s);
+            tok_ptr = strtok (NULL, delim);
+        }
+        free(copy);
         return v;
 …
         ostream << length;
+        // UTF-8 characters are 4-bytes max + space + '\0'
+        char* hex_value = (char*) malloc(sizeof(char)*10);
+        char hex_value[NUM_STR_BUFFER_SIZE];
         for (int i = 0; i < str->length(); i++)
+        {
                 sprintf(hex_value, " %hx", str->at(i));
+                snprintf(hex_value, NUM_STR_BUFFER_SIZE," %hx", str->at(i));
                 ostream << hex_value;
+        }
 …
         *utf_str = ostream.str();
-        free(hex_value);
         PLUGIN_DEBUG("Converted %s to UTF-8 string %s\n", str->c_str(), utf_str->c_str());
+}
 …
     else if (NPVARIANT_IS_STRING(variant))
+    {
+#if MOZILLA_VERSION_COLLAPSED < 1090200
+        PLUGIN_DEBUG("STRING: %s\n", NPVARIANT_TO_STRING(variant).utf8characters);
+#else
+        PLUGIN_DEBUG("STRING: %s\n", NPVARIANT_TO_STRING(variant).UTF8Characters);
+#endif
+        std::string str = IcedTeaPluginUtilities::NPVariantAsString(variant);
+        PLUGIN_DEBUG("STRING: %s (length=%d)\n", str.c_str(), str.size());
+    }
     else
 …
 IcedTeaPluginUtilities::NPVariantToString(NPVariant variant, std::string* result)
+{
+        char* str = (char*) malloc(sizeof(char)*32); // enough for everything except string
+    if (NPVARIANT_IS_VOID(variant))
+    {
+        sprintf(str, "%p", variant);
+    }
+    else if (NPVARIANT_IS_NULL(variant))
+    {
+        sprintf(str, "NULL");
+    }
+    else if (NPVARIANT_IS_BOOLEAN(variant))
+    {
+        if (NPVARIANT_TO_BOOLEAN(variant))
+                sprintf(str, "true");
+        else
+                sprintf(str, "false");
+    }
+    else if (NPVARIANT_IS_INT32(variant))
+    {
+        sprintf(str, "%d", NPVARIANT_TO_INT32(variant));
+    }
+    else if (NPVARIANT_IS_DOUBLE(variant))
+    {
+        sprintf(str, "%f", NPVARIANT_TO_DOUBLE(variant));;
+    }
+    else if (NPVARIANT_IS_STRING(variant))
+    {
+        free(str);
+#if MOZILLA_VERSION_COLLAPSED < 1090200
+        str = (char*) malloc(sizeof(char)*NPVARIANT_TO_STRING(variant).utf8length);
+        sprintf(str, "%s", NPVARIANT_TO_STRING(variant).utf8characters);
+#else
+        str = (char*) malloc(sizeof(char)*NPVARIANT_TO_STRING(variant).UTF8Length);
+        sprintf(str, "%s", NPVARIANT_TO_STRING(variant).UTF8Characters);
+#endif
+    }
+  char conv_str[NUM_STR_BUFFER_SIZE]; // conversion buffer
+  bool was_string_already = false;
+  if (NPVARIANT_IS_STRING(variant))
+  {
+    result->append(IcedTeaPluginUtilities::NPVariantAsString(variant));
+    was_string_already = true;
+  }
+  else if (NPVARIANT_IS_VOID(variant))
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "%p", variant);
+  }
+  else if (NPVARIANT_IS_NULL(variant))
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "NULL");
+  }
+  else if (NPVARIANT_IS_BOOLEAN(variant))
+  {
+    if (NPVARIANT_TO_BOOLEAN(variant))
+      snprintf(conv_str, NUM_STR_BUFFER_SIZE, "true");
     else
+    {
+        sprintf(str, "[Object %p]", variant);
+    }
+    result->append(str);
+    free(str);
+      snprintf(conv_str, NUM_STR_BUFFER_SIZE, "false");
+  }
+  else if (NPVARIANT_IS_INT32(variant))
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "%d", NPVARIANT_TO_INT32(variant));
+  }
+  else if (NPVARIANT_IS_DOUBLE(variant))
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "%f", NPVARIANT_TO_DOUBLE(variant));
+  }
+  else
+  {
+    snprintf(conv_str, NUM_STR_BUFFER_SIZE, "[Object %p]", variant);
+  }
+  if (!was_string_already){
+    result->append(conv_str);
+  }
+}
 …
     IcedTeaPluginUtilities::printNPVariant(constructor_str);
+    std::string constructor_name = std::string();
+#if MOZILLA_VERSION_COLLAPSED < 1090200
+    constructor_name.append(NPVARIANT_TO_STRING(constructor_str).utf8characters);
+#else
+    constructor_name.append(NPVARIANT_TO_STRING(constructor_str).UTF8Characters);
+#endif
+    std::string constructor_name = IcedTeaPluginUtilities::NPVariantAsString(constructor_str);
     PLUGIN_DEBUG("Constructor for NPObject is %s\n", constructor_name.c_str());
 …
+}
+/* Copies a variant data type into a C++ string */
+std::string
+IcedTeaPluginUtilities::NPVariantAsString(NPVariant variant)
+{
+#if MOZILLA_VERSION_COLLAPSED < 1090200
+  return std::string(
+    NPVARIANT_TO_STRING(variant).utf8characters,
+    NPVARIANT_TO_STRING(variant).utf8length);
+#else
+  return std::string(
+    NPVARIANT_TO_STRING(variant).UTF8Characters,
+    NPVARIANT_TO_STRING(variant).UTF8Length);
+#endif
+}
 /**
 …
                 PLUGIN_DEBUG("Error: Unable to initialize message queue mutex: %d\n", ret);
         PLUGIN_DEBUG("Mutexs %p and %p initialized\n", &subscriber_mutex, &msg_queue_mutex);
+        PLUGIN_DEBUG("Mutexes %p and %p initialized\n", &subscriber_mutex, &msg_queue_mutex);
+}
 …
 MessageBus::post(const char* message)
+{
-        char* msg = (char*) malloc(sizeof(char)*strlen(message) + 1);
         bool message_consumed = false;
-        // consumer frees this memory
-        strcpy(msg, message);
         PLUGIN_DEBUG("Trying to lock %p...\n", &msg_queue_mutex);
         pthread_mutex_lock(&subscriber_mutex);
     PLUGIN_DEBUG("Message %s received on bus. Notifying subscribers.\n", msg);
+    PLUGIN_DEBUG("Message %s received on bus. Notifying subscribers.\n", message);
     std::list<BusSubscriber*>::const_iterator i;
     for( i = subscribers.begin(); i != subscribers.end() && !message_consumed; ++i ) {
         PLUGIN_DEBUG("Notifying subscriber %p of %s\n", *i, msg);
         message_consumed = ((BusSubscriber*) *i)->newMessageOnBus(msg);
+        PLUGIN_DEBUG("Notifying subscriber %p of %s\n", *i, message);
+        message_consumed = ((BusSubscriber*) *i)->newMessageOnBus(message);
+    }
 …
     if (!message_consumed)
         PLUGIN_DEBUG("Warning: No consumer found for message %s\n", msg);
+        PLUGIN_DEBUG("Warning: No consumer found for message %s\n", message);
     PLUGIN_DEBUG("%p unlocked...\n", &msg_queue_mutex);

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginUtils.h

-              r375
+              r418
      (*c >= 'A' && *c <= 'F'))
+//long long max ~ 19 chars + terminator
+//leave some room for converting strings like "<var> = %d"
+const size_t NUM_STR_BUFFER_SIZE = 32;
 /*
  * This struct holds data specific to a Java operation requested by the plugin
 …
         static void itoa(int i, std::string* result);
+        /* Copies a variant data type into a C++ string */
+        static std::string NPVariantAsString(NPVariant variant);
         /* Frees the given vector and the strings that its contents point to */
         static void freeStringPtrVector(std::vector<std::string*>* v);

trunk/icedtea-web/plugin/icedteanp/java/netscape/javascript/JSObject.java

-              r348
+              r418
             boolean mayProceed = false;
             for (int i = 0; i < stack.length; i++) {
                 if (stack[i].getClassName().equals("netscape.javascript.JSObject") &&
                         stack[i].getMethodName().equals("getWindow")) {
+            for (StackTraceElement element : stack) {
+                if (element.getClassName().equals("netscape.javascript.JSObject") &&
+                        element.getMethodName().equals("getWindow")) {
                     mayProceed = true;
+                }
 …
         PluginDebug.debug("JSObject.call ", methodName);
+        for (int i = 0; i < args.length; i++)
+            PluginDebug.debug(" ", args[i]);
+        for (Object arg : args) {
+            PluginDebug.debug(" ", arg);
+        }
         PluginDebug.debug("");
         return PluginAppletViewer.call(internal, methodName, args);

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/AppletSecurityContextManager.java

r348	r418
1		/* VoidPluginCallRequest -- represent Java-to-JavaScript requests
	1	/* AppletSecurityContextManager -- handles messages in an appropriate security
	2	context
	3
2	4	Copyright (C) 2008 Red Hat
3	5

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java

r348	r418
51	51	// FIXME: Is it even possible to distinguish between null and void
52	52	// here?
53		if (~~args[3] != "null" && args[3] != "void"~~)
	53	if (!"null".equals(args[3]) && !"void".equals(args[3]))
54	54	object = AppletSecurityContextManager.getSecurityContext(0).getObject(Integer.parseInt(args[3]));
55	55	setDone(true);

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/JavaConsole.java

-              r348
+              r418
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.ImageResources;
 /**
 …
         consoleWindow = new JFrame("Java Console");
+        consoleWindow.setIconImages(ImageResources.INSTANCE.getApplicationImages());
         JPanel contentPanel = new JPanel();
 …
         boolean toShowConsole = false;
         for (int i = 0; i < args.length; i++) {
             if (args[i] == "--show-console") {
+        for (String arg : args) {
+            if ("--show-console".equals(arg)) {
                 toShowConsole = true;
+            }

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java

-              r348
+              r418
         if (System.getSecurityManager() == null) {
             JNLPRuntime.initialize(/* isApplication */false);
             JNLPRuntime.setDefaultLaunchHandler(new DefaultLaunchHandler());
+            JNLPRuntime.setDefaultLaunchHandler(new DefaultLaunchHandler(System.err));
+        }
 …
         Permissions grantedPermissions = new Permissions();
+        for (int i = 0; i < nsPrivilegeList.length; i++) {
+            String privilege = nsPrivilegeList[i];
+        for (String privilege : nsPrivilegeList) {
             if (privilege.equals("UniversalBrowserRead")) {
                 BrowserReadPermission bp = new BrowserReadPermission();

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java

-              r362
+              r418
     public AppletPanel createPanel(PluginStreamHandler streamhandler,
                                     int identifier,
                                     long handle, int x, int y,
                                     final URL doc,
                                     final Hashtable<String, String> atts) {
+                                   final int identifier,
+                                   final long handle, int x, int y,
+                                   final URL doc,
+                                   final Hashtable<String, String> atts) {
         final NetxPanel panel = AccessController.doPrivileged(new PrivilegedAction<NetxPanel>() {
             public NetxPanel run() {
 …
         });
+        // create the frame.
+        PluginAppletViewer.framePanel(identifier, handle, panel);
+        panel.init();
+        // Start the applet
+        initEventQueue(panel);
+        // Framing the panel needs to happen in a thread whose thread group
+        // is the same as the threadgroup of the applet thread. If this
+        // isn't the case, the awt eventqueue thread's context classloader
+        // won't be set to a JNLPClassLoader, and when an applet class needs
+        // to be loaded from the awt eventqueue, it won't be found.
+        Thread panelInit = new Thread(panel.getThreadGroup(), new Runnable() {
+            @Override public void run() {
+                panel.createNewAppContext();
+                // create the frame.
+                PluginAppletViewer.framePanel(identifier, handle, panel);
+                panel.init();
+                // Start the applet
+                initEventQueue(panel);
+            }
+        }, "NetXPanel initializer");
+        panelInit.start();
+        while(panelInit.isAlive()) {
+            try {
+                panelInit.join();
+            } catch (InterruptedException e) {
+            }
+        }
         // Wait for the panel to initialize
 …
             String[] events = eventList.split(",");
             for (int i = 0; i < events.length; i++) {
                 PluginDebug.debug("Adding event to queue: ", events[i]);
                 if (events[i].equals("dispose"))
+            for (String event : events) {
+                PluginDebug.debug("Adding event to queue: ", event);
+                if ("dispose".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_DISPOSE);
                 else if (events[i].equals("load"))
+                else if ("load".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_LOAD);
                 else if (events[i].equals("init"))
+                else if ("init".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_INIT);
                 else if (events[i].equals("start"))
+                else if ("start".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_START);
                 else if (events[i].equals("stop"))
+                else if ("stop".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_STOP);
                 else if (events[i].equals("destroy"))
+                else if ("destroy".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_DESTROY);
                 else if (events[i].equals("quit"))
+                else if ("quit".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_QUIT);
                 else if (events[i].equals("error"))
+                else if ("error".equals(event))
                     panel.sendEvent(AppletPanel.APPLET_ERROR);
                 else
                     // non-fatal error if we get an unrecognized event
                     PluginDebug.debug("Unrecognized event name: ", events[i]);
+                    PluginDebug.debug("Unrecognized event name: ", event);
+            }
 …
                 appletShutdown(p);
                 appletPanels.removeElement(p);
+                // Mark classloader unusable
+                ((JNLPClassLoader) cl).decrementLoaderUseCount();
                 try {
 …
                         String att = t.get("name");
-                        if (atts.containsKey(att))
-                            continue;
                         if (att == null) {
                             statusMsgStream.println(requiresNameWarning);

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginCallRequest.java

r348	r418
38	38	package sun.applet;
39	39
40		~~// FIXME: for each type of request extend a new (anonymous?)~~
41		~~// PluginCallRequest.~~
42	40	public abstract class PluginCallRequest {
43	41	private String message;

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java

-              r348
+              r418
+/* VoidPluginCallRequest -- represent Java-to-JavaScript requests
+/* PluginCallRequestFactory -- contains factory methods for dispatching
+ an appropriate PluginCallRequest.
    Copyright (C) 2008  Red Hat
 …
     public PluginCallRequest getPluginCallRequest(String id, String message, Long reference) {
         if (id == "member") {
+        if ("member".equals(id)) {
             return new GetMemberPluginCallRequest(message, reference);
         } else if (id == "void") {
+        } else if ("void".equals(id)) {
             return new VoidPluginCallRequest(message, reference);
         } else if (id == "window") {
+        } else if ("window".equals(id)) {
             return new GetWindowPluginCallRequest(message, reference);
         } else if (id == "proxyinfo") {
+        } else if ("proxyinfo".equals(id)) {
             return new PluginProxyInfoRequest(message, reference);
         } else if (id == "cookieinfo") {
+        } else if ("cookieinfo".equals(id)) {
             return new PluginCookieInfoRequest(message, reference);
         } else {

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginCookieManager.java

-              r348
+              r418
 import java.util.Map;
+import com.sun.jndi.toolkit.url.UrlUtil;
 public class PluginCookieManager extends CookieManager {
+    private PluginStreamHandler streamHandler;
+    public PluginCookieManager(PluginStreamHandler streamHandler) {
+        this.streamHandler = streamHandler;
+    }
+    @Override
     public Map<String, List<String>> get(URI uri,
             Map<String, List<String>> requestHeaders) throws IOException {
 …
         return false;
+    }
+    @Override
+    public void put(URI uri,
+            Map<String, List<String>> responseHeaders) throws IOException {
+        super.put(uri, responseHeaders);
+        for (Map.Entry<String, List<String>> headerEntry : responseHeaders.entrySet()) {
+            String type = headerEntry.getKey();
+            if ("Set-Cookie".equalsIgnoreCase(type) || "Set-Cookie2".equalsIgnoreCase(type)) {
+                List<String> cookies = headerEntry.getValue();
+                for (String cookie : cookies) {
+                    streamHandler.write("plugin PluginSetCookie reference -1 " + UrlUtil.encode(uri.toString(), "UTF-8") + " " + cookie);
+                }
+            }
+        }
+    }
+}

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginException.java

r348	r418
1		/* ~~VoidPluginCallRequest -- represent Java-to-JavaScript requests~~
	1	/* PluginException -- represents an exception in handling a plugin message
2	2	Copyright (C) 2008 Red Hat
3	3

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginMain.java

-              r368
+              r418
             // Streams set. Start processing.
             streamHandler.startProcessing();
+            setCookieHandler(streamHandler);
         } catch (Exception e) {
             e.printStackTrace();
 …
         // override the proxy selector set by JNLPRuntime
         ProxySelector.setDefault(new PluginProxySelector());
+    }
+        CookieManager ckManager = new PluginCookieManager();
+    private static void setCookieHandler(PluginStreamHandler streamHandler) {
+        CookieManager ckManager = new PluginCookieManager(streamHandler);
         CookieHandler.setDefault(ckManager);
+    }

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginMessageHandlerWorker.java

r348	r418
1		/* ~~VoidPluginCallRequest -- represent Java-to-JavaScript request~~s
	1	/* PluginMessageHandlerWorker -- worker thread for handling messages
2	2	Copyright (C) 2008 Red Hat
3	3

trunk/icedtea-web/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java

-              r348
+              r418
     private PluginMessageConsumer consumer;
     private Boolean shuttingDown = false;
+    private volatile boolean shuttingDown = false;
 …
             if (message == null || message.equals("shutdown")) {
+                synchronized (shuttingDown) {
+                    shuttingDown = true;
+                }
+                shuttingDown = true;
                 try {
                     // Close input/output channels to plugin.
 …
                 // if we are shutting down, ignore write failures as
                 // pipe may have closed
+                synchronized (shuttingDown) {
+                    if (!shuttingDown) {
+                        e.printStackTrace();
+                    }
+                if (!shuttingDown) {
+                    e.printStackTrace();
+                }

trunk/icedtea-web/tests/junit-runner/CommandLine.java

-              r348
+              r418
  */
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 …
         for (String each : args) {
             try {
+                if (each.contains("$")) continue;
+                if (each.toLowerCase().endsWith(".jnlp")) continue;
                 classes.add(Class.forName(each));
             } catch (ClassNotFoundException e) {
 …
+            }
+        }
+        RunListener jXmlOutput = new JunitLikeXmlOutputListener(system, new File("tests-output.xml"));
+        addListener(jXmlOutput);
         RunListener listener = new LessVerboseTextListener(system);
         addListener(listener);

trunk/icedtea-web/tests/junit-runner/LessVerboseTextListener.java

-              r348
+              r418
  */
 import java.io.PrintStream;
+import java.lang.reflect.Method;
+import net.sourceforge.jnlp.annotations.KnownToFail;
 import org.junit.internal.JUnitSystem;
 …
     private PrintStream writer;
     private boolean testFailed = false;
+    private int  totalK2F=0;
+    private int  failedK2F=0;
+    private int  passedK2F=0;
+    private int  ignoredK2F=0;
     public LessVerboseTextListener(JUnitSystem system) {
 …
     @Override
+    public void testIgnored(Description description) throws Exception {
+        writer.println("Ignored: " + description.getClassName() + "." + description.getMethodName());
+        printK2F(writer, null, description);
+    }
+    @Override
     public void testFailure(Failure failure) {
         testFailed = true;
         writer.println("FAILED: " + failure.getTestHeader() + " " + failure.getMessage());
+        printK2F(writer,true,failure.getDescription());
+    }
 …
         if (!testFailed) {
             writer.println("Passed: " + description.getClassName() + "." + description.getMethodName());
+            printK2F(writer,false,description);
+        }
+    }
 …
         int failed = result.getFailureCount();
         int ignored = result.getIgnoreCount();
+        writer.println("Total tests run: "+result.getRunCount()+"; From  those : " + totalK2F + " known to fail");
+        writer.println("Test known to fail: passed: " + passedK2F + "; failed: " + failedK2F + "; ignored: " + ignoredK2F);
         writer.println("Test results: passed: " + passed + "; failed: " + failed + "; ignored: " + ignored);
+    }
+    private void printK2F(PrintStream writer, Boolean failed, Description description) {
+        try {
+            KnownToFail k2f = getK2F(description);
+            if (k2f != null) {
+                totalK2F++;
+                if (failed != null) {
+                    if (failed) {
+                        failedK2F++;
+                    } else {
+                        passedK2F++;
+                    }
+                } else {
+                    ignoredK2F++;
+                }
+                if (failed != null && !failed) {
+                    writer.println(" - WARNING This test is known to fail, but have passed!");
+                } else {
+                    writer.println(" - This test is known to fail");
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+    public static  KnownToFail getK2F(Description description) {
+        try {
+            Class q = description.getTestClass();
+            if (q != null) {
+                String qs = description.getMethodName();
+                if (qs.contains(" - ")) {
+                    qs = qs.replaceAll(" - .*", "");
+                }
+                Method qm = q.getMethod(qs);
+                if (qm != null) {
+                    KnownToFail k2f = qm.getAnnotation(KnownToFail.class);
+                    return k2f;
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }

trunk/icedtea-web/tests/netx/pac/pac-funcs-test.js

-              r348
+              r418
         testDnsDomainLevels();
         testShExpMatch();
-        testWeekdayRange();
         testDateRange();
         testTimeRange();
+        testWeekdayRange();
+        testDateRange2();
+        testDateRange3();
         java.lang.System.out.println("Test results: passed: " + testsPassed + "; failed: " + testsFailed + ";");
 …
 function runTests(name, tests) {
         var undefined_var;
         for ( var i = 0; i < tests.length; i++) {
+                var expectedVal = tests[i][0];
+                var args = tests[i].slice(1);
+                var returnVal;
+                try {
+                        returnVal = name.apply(null, args);
+                } catch (e) {
+                        returnVal = e;
+                }
+                if (returnVal === expectedVal) {
+                        java.lang.System.out.println("Passed: " + name.name + "(" + args.join(", ") + ")");
+                        testsPassed++;
+                } else {
+                        java.lang.System.out.println("FAILED: " + name.name + "(" + args.join(", ") + ")");
+                        java.lang.System.out.println("        Expected '" + expectedVal + "' but got '" + returnVal + "'");
+                        testsFailed++;
+                }
+                runTest(name, tests[i]);
+        }
+}
+function runTest(name, test) {
+    var expectedVal = test[0];
+    var args = test.slice(1);
+    var returnVal;
+    try {
+        returnVal = name.apply(null, args);
+    } catch (e) {
+        returnVal = e;
+    }
+    if (returnVal === expectedVal) {
+        java.lang.System.out.println("Passed: " + name.name + "(" + args.join(", ") + ")");
+        testsPassed++;
+    } else {
+        java.lang.System.out.println("FAILED: " + name.name + "(" + args.join(", ") + ")");
+        java.lang.System.out.println("        Expected '" + expectedVal + "' but got '" + returnVal + "'");
+        testsFailed++;
+    }
+}
 function testIsPlainHostName() {
 …
        [ false, dayToStr(day-1) ],
     ];
+    runTests(weekdayRange, tests);
+}
+/** Returns an array: [day, month, year] */
+function incDate() {
+    if ((arguments.length >= 3) && (arguments.length % 2 === 1)) {
+        var date = arguments[0];
+        var result = date;
+        var index = 1;
+        while (index < arguments.length) {
+            var whichThing = arguments[index];
+            var by = arguments[index+1];
+            switch (whichThing) {
+                case 'year':
+                    result = new Date(result.getFullYear()+by, result.getMonth(), result.getDate());
+                    break;
+                case 'month':
+                    result = new Date(result.getFullYear(), result.getMonth()+by, result.getDate());
+                    break;
+                case 'day':
+                    result = new Date(result.getFullYear(), result.getMonth(), result.getDate()+by);
+                    break;
+            }
+            index += 2;
+        }
+        return [result.getDate(), result.getMonth(), result.getFullYear()];
+    }
+    throw "Please call incDate properly";
+}
+function monthToStr(month) {
+    switch (month) {
+        case -1: return "DEC";
+        case 0: return "JAN";
+        case 1: return "FEB";
+        case 2: return "MAR";
+        case 3: return "APR";
+        case 4: return "MAY";
+        case 5: return "JUN";
+        case 6: return "JUL";
+        case 7: return "AUG";
+        case 8: return "SEP";
+        case 9: return "OCT";
+        case 10: return "NOV";
+        case 11: return "DEC";
+        case 12: return "JAN";
+        default: throw "Invalid Month" + month;
+    }
+}
 function testDateRange() {
+    function incDate(date) {
+        return (date + 1 - 1) % 31 +1 ;
+    }
+    function decDate(date) {
+        return (date - 1 - 1 + 31) % 31 + 1;
+    }
+    function monthToStr(month) {
+        switch (month) {
+            case -1: return "DEC";
+            case 0: return "JAN";
+            case 1: return "FEB";
+            case 2: return "MAR";
+            case 3: return "APR";
+            case 4: return "MAY";
+            case 5: return "JUN";
+            case 6: return "JUL";
+            case 7: return "AUG";
+            case 8: return "SEP";
+            case 9: return "OCT";
+            case 10: return "NOV";
+            case 11: return "DEC";
+            case 12: return "JAN";
+            default: throw "Invalid Month";
+        }
+    }
+    var today = new Date();
+    var date = today.getDate();
+    var month = today.getMonth();
+    var year = today.getYear();
+    var tests = [
+        [ true, date ],
+        [ false, incDate(date) ],
+        [ false, decDate(date) ],
+        [ true, monthToStr(month) ],
+        [ false, monthToStr(month+1) ],
+        [ false, monthToStr(month-1) ],
+        [ true, year ],
+        [ false, year - 1],
+        [ false, year + 1],
+        [ true, date, date ],
+        [ true, date, incDate(date) ],
+        [ true, decDate(date), date ],
+        [ true, decDate(date), incDate(date) ],
+        [ false, incDate(date), decDate(date) ],
+        [ false, decDate(decDate(date)), decDate(date) ],
+        [ false, incDate(date), incDate(incDate(date)) ],
+        [ true, monthToStr(month), monthToStr(month) ],
+        [ true, monthToStr(month), monthToStr(month+1) ],
+        [ true, monthToStr(month-1), monthToStr(month) ],
+        [ true, monthToStr(month-1), monthToStr(month+1) ],
+        [ true, "JAN", "DEC" ],
+        [ true, "DEC", "NOV" ],
+        [ true, "JUL", "JUN"],
+        [ false, monthToStr(month+1), monthToStr(month+1) ],
+        [ false, monthToStr(month-1), monthToStr(month-1) ],
+        [ false, monthToStr(month+1), monthToStr(month-1) ],
+        [ true, year, year ],
+        [ true, year, year+1 ],
+        [ true, year-1, year ],
+        [ true, year-1, year+1 ],
+        [ false, year-2, year-1 ],
+        [ false, year+1, year+1 ],
+        [ false, year+1, year+2 ],
+        [ false, year+1, year-1 ],
+        [ true, date, monthToStr(month) , date, monthToStr(month) ],
+        [ true, decDate(date), monthToStr(month) , date, monthToStr(month) ],
+        [ false, decDate(date), monthToStr(month) , decDate(date), monthToStr(month) ],
+        [ true, date, monthToStr(month) , incDate(date), monthToStr(month) ],
+        [ false, incDate(date), monthToStr(month) , incDate(date), monthToStr(month) ],
+        [ true, decDate(date), monthToStr(month) , incDate(date), monthToStr(month) ],
+        [ false, incDate(date), monthToStr(month) , decDate(date), monthToStr(month) ],
+        [ true, date, monthToStr(month-1) , date, monthToStr(month) ],
+        [ true, date, monthToStr(month) , date, monthToStr(month+1) ],
+        [ true, date, monthToStr(month-1) , date, monthToStr(month+1) ],
+        [ true, incDate(date), monthToStr(month-1) , date, monthToStr(month+1) ],
+        [ true, date, monthToStr(month-1) , decDate(date), monthToStr(month+1) ],
+        [ false, date, monthToStr(month+1) , date, monthToStr(month-1) ],
+        [ false, incDate(date), monthToStr(month+1) , incDate(date), monthToStr(month-1) ],
+        [ false, decDate(date), monthToStr(month+1) , decDate(date), monthToStr(month-1) ],
+        [ true, 1, "JAN", 31, "DEC" ],
+        [ true, 2, "JAN", 1, "JAN" ],
+        [ false, 1, monthToStr(month+1), 31, monthToStr(month+1) ],
+        [ false, 1, monthToStr(month-1), 31, monthToStr(month-1) ],
+        [ true, monthToStr(month), year, monthToStr(month), year ],
+        [ true, monthToStr(month-1), year, monthToStr(month), year ],
+        [ true, monthToStr(month), year, monthToStr(month+1), year ],
+        [ true, monthToStr(month-1), year, monthToStr(month+1), year ],
+        [ true, monthToStr(0), year, monthToStr(11), year ],
+        [ false, monthToStr(month+1), year, monthToStr(month-1), year ],
+        [ false, monthToStr(month+1), year, monthToStr(month+1), year ],
+        [ false, monthToStr(month-1), year, monthToStr(month-1), year ],
+        [ false, monthToStr(month), year-1, monthToStr(month-1), year ],
+        [ true, monthToStr(month), year, monthToStr(month), year + 1 ],
+        [ true, monthToStr(month), year-1, monthToStr(month), year ],
+        [ true, monthToStr(month), year-1, monthToStr(month), year+1 ],
+        [ true, monthToStr(0), year, monthToStr(0), year+1 ],
+        [ true, monthToStr(0), year-1, monthToStr(0), year+1 ],
+        [ false, monthToStr(0), year-1, monthToStr(11), year-1 ],
+        [ false, monthToStr(0), year+1, monthToStr(11), year+1 ],
+        [ true, date, monthToStr(month), year, date, monthToStr(month), year ],
+        [ true, decDate(date), monthToStr(month), year, incDate(date), monthToStr(month), year ],
+        [ true, decDate(date), monthToStr(month-1), year, incDate(date), monthToStr(month+1), year ],
+        [ true, decDate(date), monthToStr(month-1), year-1, incDate(date), monthToStr(month+1), year+1 ],
+        [ true, incDate(date), monthToStr(month-1), year-1, incDate(date), monthToStr(month+1), year+1 ],
+        [ false, incDate(date), monthToStr(month), year, incDate(date), monthToStr(month+1), year+1 ],
+        [ false, date, monthToStr(month+1), year, incDate(date), monthToStr(month+1), year+1 ],
+        [ true, 1, monthToStr(0), 0, 31, monthToStr(11), 100000 ],
+        [ true, 1, monthToStr(0), year, 31, monthToStr(11), year ],
+        [ true, 1, monthToStr(0), year-1, 31, monthToStr(11), year+1 ],
+        [ false, 1, monthToStr(0), year-1, 31, monthToStr(11), year-1 ],
+        [ false, 1, monthToStr(0), year+1, 31, monthToStr(11), year+1 ],
+    ];
+    runTests(dateRange, tests);
+    {
+        var current = new Date();
+        var date = current.getDate();
+        var month = current.getMonth();
+        var year = current.getFullYear();
+        var today = incDate(current, 'day', 0);
+        var tomorrow = incDate(current, 'day', 1);
+        var yesterday = incDate(current, 'day', -1);
+        runTest(dateRange, [ true, date ]);
+        runTest(dateRange, [ false, tomorrow[0] ]);
+        runTest(dateRange, [ false, yesterday[0] ]);
+        runTest(dateRange, [ true, monthToStr(month) ]);
+        runTest(dateRange, [ false, monthToStr(month+1) ]);
+        runTest(dateRange, [ false, monthToStr(month-1) ]);
+        runTest(dateRange, [ true, year ]);
+        runTest(dateRange, [ false, year - 1]);
+        runTest(dateRange, [ false, year + 1]);
+        runTest(dateRange, [ true, date, date ]);
+        runTest(dateRange, [ true, today[0], tomorrow[0] ]);
+        runTest(dateRange, [ true, yesterday[0], today[0] ]);
+        runTest(dateRange, [ true, yesterday[0], tomorrow[0] ]);
+        runTest(dateRange, [ false, tomorrow[0], yesterday[0] ]);
+        runTest(dateRange, [ false, incDate(current,'day',-2)[0], yesterday[0] ]);
+        runTest(dateRange, [ false, tomorrow[0], incDate(current,'day',2)[0] ]);
+        runTest(dateRange, [ true, monthToStr(month), monthToStr(month) ]);
+        runTest(dateRange, [ true, monthToStr(month), monthToStr(month+1) ]);
+        runTest(dateRange, [ true, monthToStr(month-1), monthToStr(month) ]);
+        runTest(dateRange, [ true, monthToStr(month-1), monthToStr(month+1) ]);
+        runTest(dateRange, [ true, "JAN", "DEC" ]);
+        runTest(dateRange, [ true, "FEB", "JAN" ]);
+        runTest(dateRange, [ true, "DEC", "NOV" ]);
+        runTest(dateRange, [ true, "JUL", "JUN"]);
+        runTest(dateRange, [ false, monthToStr(month+1), monthToStr(month+1) ]);
+        runTest(dateRange, [ false, monthToStr(month-1), monthToStr(month-1) ]);
+        runTest(dateRange, [ false, monthToStr(month+1), monthToStr(month-1) ]);
+        runTest(dateRange, [ true, year, year ]);
+        runTest(dateRange, [ true, year, year+1 ]);
+        runTest(dateRange, [ true, year-1, year ]);
+        runTest(dateRange, [ true, year-1, year+1 ]);
+        runTest(dateRange, [ false, year-2, year-1 ]);
+        runTest(dateRange, [ false, year+1, year+1 ]);
+        runTest(dateRange, [ false, year+1, year+2 ]);
+        runTest(dateRange, [ false, year+1, year-1 ]);
+        runTest(dateRange, [ true, date, monthToStr(month) , date, monthToStr(month) ]);
+        runTest(dateRange, [ true, yesterday[0], monthToStr(yesterday[1]) , date, monthToStr(month) ]);
+        runTest(dateRange, [ false, yesterday[0], monthToStr(yesterday[1]) , yesterday[0], monthToStr(yesterday[1]) ]);
+        runTest(dateRange, [ true, date, monthToStr(month) , tomorrow[0], monthToStr(tomorrow[1]) ]);
+        runTest(dateRange, [ false, tomorrow[0], monthToStr(tomorrow[1]) , tomorrow[0], monthToStr(tomorrow[1]) ]);
+        runTest(dateRange, [ true, yesterday[0], monthToStr(yesterday[1]) , tomorrow[0], monthToStr(tomorrow[1]) ]);
+        runTest(dateRange, [ false, tomorrow[0], monthToStr(tomorrow[1]) , yesterday[0], monthToStr(yesterday[1]) ]);
+    }
+    {
+        var lastMonth = incDate(new Date(), 'month', -1);
+        var thisMonth = incDate(new Date(), 'month', 0);
+        var nextMonth = incDate(new Date(), 'month', +1);
+        runTest(dateRange, [ true, lastMonth[0], monthToStr(lastMonth[1]) , thisMonth[0], monthToStr(thisMonth[1]) ]);
+        runTest(dateRange, [ true, thisMonth[0], monthToStr(thisMonth[1]) , nextMonth[0], monthToStr(nextMonth[1]) ]);
+        runTest(dateRange, [ true, lastMonth[0], monthToStr(lastMonth[1]) , nextMonth[0], monthToStr(nextMonth[1]) ]);
+        var date1 = incDate(new Date(), 'day', +1, 'month', -1);
+        var date2 = incDate(new Date(), 'day', -1, 'month', +1);
+        runTest(dateRange, [ true, date1[0], monthToStr(date1[1]) , nextMonth[0], monthToStr(nextMonth[1]) ]);
+        runTest(dateRange, [ true, lastMonth[0], monthToStr(lastMonth[1]) , date2[0], monthToStr(date2[1]) ]);
+        runTest(dateRange, [ false, nextMonth[0], monthToStr(nextMonth[1]) , lastMonth[0], monthToStr(lastMonth[1]) ]);
+        var date3 = incDate(new Date(), 'day', +1, 'month', +1);
+        var date4 = incDate(new Date(), 'day', +1, 'month', -1);
+        runTest(dateRange, [ false, date3[0], monthToStr(date3[1]) , date4[0], monthToStr(date4[1]) ]);
+        var date5 = incDate(new Date(), 'day', -1, 'month', -1);
+        runTest(dateRange, [ false, date2[0], monthToStr(date2[1]) , date5[0], monthToStr(date5[1]) ]);
+        runTest(dateRange, [ true, 1, "JAN", 31, "DEC" ]);
+        runTest(dateRange, [ true, 2, "JAN", 1, "JAN" ]);
+        var month = new Date().getMonth();
+        runTest(dateRange, [ false, 1, monthToStr(month+1), 31, monthToStr(month+1) ]);
+        runTest(dateRange, [ false, 1, monthToStr(month-1), 31, monthToStr(month-1) ]);
+    }
+    {
+        var lastMonth = incDate(new Date(), 'month', -1);
+        var thisMonth = incDate(new Date(), 'month', 0);
+        var nextMonth = incDate(new Date(), 'month', +1);
+        runTest(dateRange, [ true, monthToStr(thisMonth[1]), thisMonth[2], monthToStr(thisMonth[1]), thisMonth[2] ]);
+        runTest(dateRange, [ true, monthToStr(lastMonth[1]), lastMonth[2], monthToStr(thisMonth[1]), thisMonth[2] ]);
+        runTest(dateRange, [ true, monthToStr(thisMonth[1]), thisMonth[2], monthToStr(nextMonth[1]), nextMonth[2] ]);
+        runTest(dateRange, [ true, monthToStr(lastMonth[1]), lastMonth[2], monthToStr(nextMonth[1]), nextMonth[2] ]);
+        runTest(dateRange, [ true, monthToStr(0), year, monthToStr(11), year ]);
+        runTest(dateRange, [ false, monthToStr(nextMonth[1]), nextMonth[2], monthToStr(lastMonth[1]), lastMonth[2] ]);
+        runTest(dateRange, [ false, monthToStr(nextMonth[1]), nextMonth[2], monthToStr(nextMonth[1]), nextMonth[2] ]);
+        runTest(dateRange, [ false, monthToStr(lastMonth[1]), lastMonth[2], monthToStr(lastMonth[1]), lastMonth[2] ]);
+        var lastYear = incDate(new Date(), 'year', -1);
+        var nextYear = incDate(new Date(), 'year', +1);
+        runTest(dateRange, [ false, monthToStr(lastYear[1]), lastYear[2], monthToStr(lastMonth[1]), lastMonth[2] ]);
+        runTest(dateRange, [ true, monthToStr(thisMonth[1]), thisMonth[2], monthToStr(nextYear[1]), nextYear[2] ]);
+        var year = new Date().getFullYear();
+        var month = new Date().getMonth();
+        runTest(dateRange, [ true, monthToStr(month), year-1, monthToStr(month), year ]);
+        runTest(dateRange, [ true, monthToStr(month), year-1, monthToStr(month), year+1 ]);
+        runTest(dateRange, [ true, monthToStr(0), year, monthToStr(0), year+1 ]);
+        runTest(dateRange, [ true, monthToStr(0), year-1, monthToStr(0), year+1 ]);
+        runTest(dateRange, [ false, monthToStr(0), year-1, monthToStr(11), year-1 ]);
+        runTest(dateRange, [ false, monthToStr(0), year+1, monthToStr(11), year+1 ]);
+    }
+    {
+        var today = incDate(new Date(), 'day', 0);
+        var yesterday = incDate(new Date(), 'day', -1);
+        var tomorrow = incDate(new Date(), 'day', +1);
+        runTest(dateRange, [ true,
+            today[0], monthToStr(today[1]), today[2], today[0], monthToStr(today[1]), today[2] ]);
+        runTest(dateRange, [ true,
+            yesterday[0], monthToStr(yesterday[1]), yesterday[2], tomorrow[0], monthToStr(tomorrow[1]), tomorrow[2] ]);
+    }
+    {
+        var dayLastMonth = incDate(new Date(), 'day', -1, 'month', -1);
+        var dayNextMonth = incDate(new Date(), 'day', +1, 'month', +1);
+        runTest(dateRange, [ true,
+            dayLastMonth[0], monthToStr(dayLastMonth[1]), dayLastMonth[2], dayNextMonth[0], monthToStr(dayNextMonth[1]), dayNextMonth[2] ]);
+    }
+    {
+        var dayLastYear = incDate(new Date(), 'day', -1, 'month', -1, 'year', -1);
+        var dayNextYear = incDate(new Date(), 'day', +1, 'month', +1, 'year', +1);
+        runTest(dateRange, [ true,
+            dayLastYear[0], monthToStr(dayLastYear[1]), dayLastYear[2], dayNextYear[0], monthToStr(dayNextYear[1]), dayNextYear[2] ]);
+    }
+    {
+        var dayLastYear = incDate(new Date(), 'day', +1, 'month', -1, 'year', -1);
+        var dayNextYear = incDate(new Date(), 'day', +1, 'month', +1, 'year', +1);
+        runTest(dateRange, [ true,
+            dayLastYear[0], monthToStr(dayLastYear[1]), dayLastYear[2], dayNextYear[0], monthToStr(dayNextYear[1]), dayNextYear[2] ]);
+    }
+    {
+        var tomorrow = incDate(new Date(), 'day', +1);
+        var dayNextYear = incDate(new Date(), 'day', +1, 'month', +1, 'year', +1);
+        runTest(dateRange, [ false,
+            tomorrow[0], monthToStr(tomorrow[1]), tomorrow[2], dayNextYear[0], monthToStr(dayNextYear[1]), dayNextYear[2] ]);
+    }
+    {
+        var nextMonth = incDate(new Date(), 'month', +1);
+        var nextYear = incDate(new Date(), 'day', +1, 'month', +1, 'year', +1);
+        runTest(dateRange, [ false,
+            nextMonth[0], monthToStr(nextMonth[1]), nextMonth[2], nextYear[0], monthToStr(nextYear[1]), nextYear[2] ]);
+    }
+    {
+        runTest(dateRange, [ true, 1, monthToStr(0), 0, 31, monthToStr(11), 100000 ]);
+        runTest(dateRange, [ true, 1, monthToStr(0), year, 31, monthToStr(11), year ]);
+        runTest(dateRange, [ true, 1, monthToStr(0), year-1, 31, monthToStr(11), year+1 ]);
+        runTest(dateRange, [ false, 1, monthToStr(0), year-1, 31, monthToStr(11), year-1 ]);
+        runTest(dateRange, [ false, 1, monthToStr(0), year+1, 31, monthToStr(11), year+1 ]);
+     }
+}
+function testDateRange2() {
+  var dates = [
+        new Date("January 31, 2011 3:33:33"),
+        new Date("February 28, 2011 3:33:33"),
+        new Date("February 29, 2012 3:33:33"),
+        new Date("March 31, 2011 3:33:33"),
+        new Date("April 30, 2011 3:33:33"),
+        new Date("May 31, 2011 3:33:33"),
+        new Date("June 30, 2011 3:33:33"),
+        new Date("July 31, 2011 3:33:33"),
+        new Date("August 31, 2011 3:33:33"),
+        new Date("September 30, 2011 3:33:33"),
+        new Date("October 31, 2011 3:33:33"),
+        new Date("November 30, 2011 3:33:33"),
+        new Date("December 31, 2011 3:33:33"),
+]
+  for (var i = 0; i < dates.length; i++)  {
+      var current = dates[i];
+      var today = incDate(current, 'day', 0);
+      var yesterday = incDate(current, 'day', -1);
+      var tomorrow = incDate(current, 'day', 1);
+      var aYearFromNow = new Date(current.getFullYear()+1, current.getMonth()+1, current.getDate()+1);
+      var later = [aYearFromNow.getDate(), aYearFromNow.getMonth(), aYearFromNow.getFullYear()];
+      runTest(isDateInRange_internallForIcedTeaWebTesting, [ true, current,
+        today[0], monthToStr(today[1]) , tomorrow[0], monthToStr(tomorrow[1]) ]);
+      runTest(isDateInRange_internallForIcedTeaWebTesting, [ true, current,
+        yesterday[0], monthToStr(yesterday[1]) , tomorrow[0], monthToStr(tomorrow[1]) ]);
+      runTest(isDateInRange_internallForIcedTeaWebTesting, [ true, current,
+        yesterday[0], monthToStr(yesterday[1]), yesterday[2], tomorrow[0], monthToStr(tomorrow[1]), tomorrow[2] ]);
+      runTest(isDateInRange_internallForIcedTeaWebTesting, [ false, current,
+        tomorrow[0], monthToStr(tomorrow[1]), tomorrow[2], later[0], monthToStr(later[1]), later[2] ]);
+  }
+}
+function testDateRange3() {
+  var dates = [
+        new Date("January 1, 2011 1:11:11"),
+        new Date("February 1, 2011 1:11:11"),
+        new Date("March 1, 2011 1:11:11"),
+        new Date("April 1, 2011 1:11:11"),
+        new Date("May 1, 2011 1:11:11"),
+        new Date("June 1, 2011 1:11:11"),
+        new Date("July 1, 2011 1:11:11"),
+        new Date("August 1, 2011 1:11:11"),
+        new Date("September 1, 2011 1:11:11"),
+        new Date("October 1, 2011 1:11:11"),
+        new Date("November 1, 2011 1:11:11"),
+        new Date("December 1, 2011 1:11:11"),
+    ]
+  for (var i = 0; i < dates.length; i++)  {
+    var current = dates[i];
+    var yesterday = incDate(current,'day',-1);
+    var today = incDate(current,'day',0);
+    var tomorrow = incDate(current,'day',1);
+    runTest(isDateInRange_internallForIcedTeaWebTesting, [ true, current,
+      yesterday[0], monthToStr(yesterday[1]) , today[0], monthToStr(today[1]) ]);
+    runTest(isDateInRange_internallForIcedTeaWebTesting, [ true, current,
+      yesterday[0], monthToStr(yesterday[1]) , tomorrow[0], monthToStr(tomorrow[1]) ]);
+    runTest(isDateInRange_internallForIcedTeaWebTesting, [ true, current,
+      yesterday[0], monthToStr(yesterday[1]), yesterday[2], tomorrow[0], monthToStr(tomorrow[1]), tomorrow[2] ]);
+  }
+}

trunk/icedtea-web/tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java

-              r348
+              r418
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import net.sourceforge.jnlp.annotations.KnownToFail;
+import org.junit.After;
+import net.sourceforge.nanoxml.XMLElement;
+import net.sourceforge.nanoxml.XMLParseException;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 /** Test various corner cases of the parser */
 public class ParserCornerCases {
+    @Test
+    public void testCdata() throws ParseException, XMLParseException, IOException {
+        String data = "<argument><![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?> <!DOCTYPE properties SYSTEM \"http://java.sun.com/dtd/properties.dtd\"> <properties> <entry key=\"key\">value</entry> </properties> ]]></argument>";
+        XMLElement elem = new XMLElement();
+        elem.parseFromReader(new StringReader(data));
+        XMLElement target = elem;
+        Assert.assertEquals("argument", target.getName());
+        Assert.assertTrue("too small", target.getContent().length() > 20);
+        Assert.assertTrue(target.getContent().contains("xml"));
+        Assert.assertTrue(target.getContent().contains("DOCTYPE"));
+        Assert.assertTrue(target.getContent().contains("<entry key=\"key\">value</entry>"));
+        Node node = Parser.getRootNode(new ByteArrayInputStream(data.getBytes()));
+        Assert.assertEquals("argument", node.getNodeName());
+        String contents = node.getNodeValue();
+        Assert.assertTrue(contents.contains("xml"));
+        Assert.assertTrue(contents.contains("DOCTYPE"));
+        Assert.assertTrue(contents.contains("<entry key=\"key\">value</entry>"));
+    }
+    @Test
+    public void testCdataNested() throws ParseException, XMLParseException, IOException {
+        String data = "<jnlp>\n" +
+                "<application-desc>\n" +
+                "<argument>\n" +
+                "<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?> <!DOCTYPE properties SYSTEM \"http://java.sun.com/dtd/properties.dtd\"> <properties> <entry key=\"key\">value</entry> </properties> ]]>" +
+                "</argument>\n" +
+                "<argument>1</argument>\n" +
+                "</application-desc>\n" +
+                "</jnlp>";
+        XMLElement elem = new XMLElement();
+        elem.parseFromReader(new StringReader(data));
+        XMLElement target = (XMLElement) ((XMLElement) elem.enumerateChildren().nextElement()).enumerateChildren().nextElement();
+        Assert.assertEquals("argument", target.getName());
+        Assert.assertTrue("too small", target.getContent().length() > 20);
+        Assert.assertTrue(target.getContent().contains("xml"));
+        Assert.assertTrue(target.getContent().contains("DOCTYPE"));
+        Assert.assertTrue(target.getContent().contains("<entry key=\"key\">value</entry>"));
+        Node node = Parser.getRootNode(new ByteArrayInputStream(data.getBytes()));
+        node = node.getFirstChild().getFirstChild();
+        Assert.assertEquals("argument", node.getNodeName());
+        String contents = node.getNodeValue();
+        Assert.assertTrue(contents.contains("xml"));
+        Assert.assertTrue(contents.contains("DOCTYPE"));
+        Assert.assertTrue(contents.contains("<entry key=\"key\">value</entry>"));
+    }
+    @Test
+    @KnownToFail
+    public void testCDataFirstChild() throws XMLParseException, IOException {
+        String xml = "<?xml version=\"1.0\"?>\n" +
+                "<jnlp spec=\"1.5+\">\n" +
+                "<![CDATA[Text you want to escape goes here...<test> random tag test </test>]]>\n" +
+                "<information/>\n" +
+                "</jnlp>";
+        XMLElement elem = new XMLElement();
+        elem.parseFromReader(new StringReader(xml));
+    }
+    @Test
+    @KnownToFail
+    public void testCDataSecondChild() throws XMLParseException, IOException {
+        String xml = "<?xml version=\"1.0\"?>\n" +
+                "<jnlp spec=\"1.5+\">\n" +
+                "<information/>\n" +
+                "<![CDATA[Text you want to escape goes here...<test> random tag test </test>]]>\n" +
+                "</jnlp>";
+        XMLElement elem = new XMLElement();
+        elem.parseFromReader(new StringReader(xml));
+    }
     @Test
     public void testUnsupportedSpecNumber() throws ParseException {
 …
     @Test
+    public void testCommentInElements2() throws ParseException {
+        String malformedJnlp = "<?xml?><jnlp <!-- comment --> spec='1.0'> </jnlp>";
+        Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+        Parser p = new Parser(null, null, root, false, false);
+        Assert.assertEquals("1.0", p.getSpecVersion().toString());
+    }
+    @Test
+    @KnownToFail
     public void testCommentInAttributes() throws ParseException {
         String malformedJnlp = "<?xml?><jnlp spec='<!-- something -->'></jnlp>";
 …
     public void testNestedComments() throws ParseException {
         String malformedJnlp = "<?xml?>" +
+                "<jnlp><information><description>" +
+                "<jnlp><information><title>testNestedComments</title>" +
+                "<vendor>IcedTea</vendor><description>" +
                 "<!-- outer <!-- inner --> -->" +
                 "</description></information></jnlp>";
 …
         Assert.assertEquals(" -->", p.getInfo(root).get(0).getDescription());
+    }
+    @Test
+    public void testDoubleDashesInComments() throws ParseException {
+        String malformedJnlp = "<?xml?>" +
+                "<jnlp> <!-- \n" +
+                " -- a very very long and \n" +
+                " -- multiline comment \n" +
+                " -- that contains double dashes \n" +
+                " -->\n" +
+                "  <information/>" +
+                "</jnlp>";
+        Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+        Parser p = new Parser(null, null, root, false, false);
+    }
+}