--- a/ChangeLog	Wed May 27 20:20:48 2009 +0100
+++ b/ChangeLog	Thu May 28 10:18:19 2009 +0100
@@ -1,3 +1,236 @@
+2009-05-27  Andrew John Hughes  <ahughes@redhat.com>
+
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/BasicService.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ClipboardService.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadService.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/DownloadServiceListener.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ExtensionInstallerService.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileContents.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileOpenService.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/FileSaveService.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/JNLPRandomAccessFile.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/PersistenceService.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/PrintService.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManager.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/ServiceManagerStub.java,
+	* overlays/openjdk/jdk/src/share/classes/javax/jnlp/UnavailableServiceException.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/AppletDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ApplicationDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ComponentDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/DefaultLaunchHandler.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ExtensionDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/IconDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InformationDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/InstallerDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JARDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPFile.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JNLPSplashScreen.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/JREDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchException.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/LaunchHandler.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Launcher.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/NetxPanel.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Node.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PackageDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ParseException.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Parser.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PluginBridge.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/PropertyDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/ResourcesDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/SecurityDesc.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/Version.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheEntry.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/CacheUtil.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/DownloadIndicator.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/Resource.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/ResourceTracker.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/UpdatePolicy.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/cache/package.html,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationEvent.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/ApplicationListener.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadEvent.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/DownloadListener.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/event/package.html,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/package.html,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Manifest.mf,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/Messages.properties,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/about.jnlp,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources/default.jnlp,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/AppletInstance.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/Boot13.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/package.html,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AppletWarningPane.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertVerifier.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertWarningPane.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/CertsInfoPane.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/MoreInfoPane.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityDialogUI.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityUtil.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/ServiceUtil.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XBasicService.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XClipboardService.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XDownloadService.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileContents.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileOpenService.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XFileSaveService.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPersistenceService.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XPrintService.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/XServiceManagerStub.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/services/package.html,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/CharacterEncoder.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarRunner.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSigner.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/JarSignerResources.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/tools/KeyTool.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/PropertiesFile.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/Reflect.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/util/WeakList.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLElement.java,
+	* overlays/openjdk/jdk/src/share/classes/net/sourceforge/nanoxml/XMLParseException.java:
+	Moved to...
+	* Makefile.am:
+	Remove use of ALT_BINARY_PLUGS_PATH (and thus turn off the binary plugs build),
+	add a INITIAL_BOOTSTRAP_LINK_STAMP target which allows us to depend on $(ICEDTEA_BOOT_DIR)
+	for both types of build, output to lib/tools.jar not jre/lib/tools.jar, add targets
+	for building netx and liveconnect classes and make icedtea targets dependent on this.
+	* netx/javax/jnlp/BasicService.java,
+	* netx/javax/jnlp/ClipboardService.java,
+	* netx/javax/jnlp/DownloadService.java,
+	* netx/javax/jnlp/DownloadServiceListener.java,
+	* netx/javax/jnlp/ExtensionInstallerService.java,
+	* netx/javax/jnlp/FileContents.java,
+	* netx/javax/jnlp/FileOpenService.java,
+	* netx/javax/jnlp/FileSaveService.java,
+	* netx/javax/jnlp/JNLPRandomAccessFile.java,
+	* netx/javax/jnlp/PersistenceService.java,
+	* netx/javax/jnlp/PrintService.java,
+	* netx/javax/jnlp/ServiceManager.java,
+	* netx/javax/jnlp/ServiceManagerStub.java,
+	* netx/javax/jnlp/UnavailableServiceException.java,
+	* netx/net/sourceforge/jnlp/AppletDesc.java,
+	* netx/net/sourceforge/jnlp/ApplicationDesc.java,
+	* netx/net/sourceforge/jnlp/ComponentDesc.java,
+	* netx/net/sourceforge/jnlp/DefaultLaunchHandler.java,
+	* netx/net/sourceforge/jnlp/ExtensionDesc.java,
+	* netx/net/sourceforge/jnlp/IconDesc.java,
+	* netx/net/sourceforge/jnlp/InformationDesc.java,
+	* netx/net/sourceforge/jnlp/InstallerDesc.java,
+	* netx/net/sourceforge/jnlp/JARDesc.java,
+	* netx/net/sourceforge/jnlp/JNLPFile.java,
+	* netx/net/sourceforge/jnlp/JNLPSplashScreen.java,
+	* netx/net/sourceforge/jnlp/JREDesc.java,
+	* netx/net/sourceforge/jnlp/LaunchException.java,
+	* netx/net/sourceforge/jnlp/LaunchHandler.java,
+	* netx/net/sourceforge/jnlp/Launcher.java,
+	* netx/net/sourceforge/jnlp/NetxPanel.java,
+	* netx/net/sourceforge/jnlp/Node.java,
+	* netx/net/sourceforge/jnlp/PackageDesc.java,
+	* netx/net/sourceforge/jnlp/ParseException.java,
+	* netx/net/sourceforge/jnlp/Parser.java,
+	* netx/net/sourceforge/jnlp/PluginBridge.java,
+	* netx/net/sourceforge/jnlp/PropertyDesc.java,
+	* netx/net/sourceforge/jnlp/ResourcesDesc.java,
+	* netx/net/sourceforge/jnlp/SecurityDesc.java,
+	* netx/net/sourceforge/jnlp/Version.java,
+	* netx/net/sourceforge/jnlp/cache/CacheEntry.java,
+	* netx/net/sourceforge/jnlp/cache/CacheUtil.java,
+	* netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java,
+	* netx/net/sourceforge/jnlp/cache/DownloadIndicator.java,
+	* netx/net/sourceforge/jnlp/cache/Resource.java,
+	* netx/net/sourceforge/jnlp/cache/ResourceTracker.java,
+	* netx/net/sourceforge/jnlp/cache/UpdatePolicy.java,
+	* netx/net/sourceforge/jnlp/cache/package.html,
+	* netx/net/sourceforge/jnlp/event/ApplicationEvent.java,
+	* netx/net/sourceforge/jnlp/event/ApplicationListener.java,
+	* netx/net/sourceforge/jnlp/event/DownloadEvent.java,
+	* netx/net/sourceforge/jnlp/event/DownloadListener.java,
+	* netx/net/sourceforge/jnlp/event/package.html,
+	* netx/net/sourceforge/jnlp/package.html,
+	* netx/net/sourceforge/jnlp/resources/Manifest.mf,
+	* netx/net/sourceforge/jnlp/resources/Messages.properties,
+	* netx/net/sourceforge/jnlp/resources/about.jnlp,
+	* netx/net/sourceforge/jnlp/resources/default.jnlp,
+	* netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java,
+	* netx/net/sourceforge/jnlp/runtime/AppletAudioClip.java,
+	* netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java,
+	* netx/net/sourceforge/jnlp/runtime/AppletInstance.java,
+	* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java,
+	* netx/net/sourceforge/jnlp/runtime/Boot.java,
+	* netx/net/sourceforge/jnlp/runtime/Boot13.java,
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
+	* netx/net/sourceforge/jnlp/runtime/JNLPPolicy.java,
+	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java,
+	* netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
+	* netx/net/sourceforge/jnlp/runtime/package.html,
+	* netx/net/sourceforge/jnlp/security/AccessWarningPane.java,
+	* netx/net/sourceforge/jnlp/security/AppletWarningPane.java,
+	* netx/net/sourceforge/jnlp/security/CertVerifier.java,
+	* netx/net/sourceforge/jnlp/security/CertWarningPane.java,
+	* netx/net/sourceforge/jnlp/security/CertsInfoPane.java,
+	* netx/net/sourceforge/jnlp/security/HttpsCertVerifier.java,
+	* netx/net/sourceforge/jnlp/security/MoreInfoPane.java,
+	* netx/net/sourceforge/jnlp/security/SecurityDialogUI.java,
+	* netx/net/sourceforge/jnlp/security/SecurityUtil.java,
+	* netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java,
+	* netx/net/sourceforge/jnlp/security/SingleCertInfoPane.java,
+	* netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java,
+	* netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java,
+	* netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java,
+	* netx/net/sourceforge/jnlp/services/ServiceUtil.java,
+	* netx/net/sourceforge/jnlp/services/XBasicService.java,
+	* netx/net/sourceforge/jnlp/services/XClipboardService.java,
+	* netx/net/sourceforge/jnlp/services/XDownloadService.java,
+	* netx/net/sourceforge/jnlp/services/XExtensionInstallerService.java,
+	* netx/net/sourceforge/jnlp/services/XFileContents.java,
+	* netx/net/sourceforge/jnlp/services/XFileOpenService.java,
+	* netx/net/sourceforge/jnlp/services/XFileSaveService.java,
+	* netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java,
+	* netx/net/sourceforge/jnlp/services/XPersistenceService.java,
+	* netx/net/sourceforge/jnlp/services/XPrintService.java,
+	* netx/net/sourceforge/jnlp/services/XServiceManagerStub.java,
+	* netx/net/sourceforge/jnlp/services/package.html,
+	* netx/net/sourceforge/jnlp/tools/CharacterEncoder.java,
+	* netx/net/sourceforge/jnlp/tools/HexDumpEncoder.java,
+	* netx/net/sourceforge/jnlp/tools/JarRunner.java,
+	* netx/net/sourceforge/jnlp/tools/JarSigner.java,
+	* netx/net/sourceforge/jnlp/tools/JarSignerResources.java,
+	* netx/net/sourceforge/jnlp/tools/KeyStoreUtil.java,
+	* netx/net/sourceforge/jnlp/tools/KeyTool.java,
+	* netx/net/sourceforge/jnlp/util/PropertiesFile.java,
+	* netx/net/sourceforge/jnlp/util/Reflect.java,
+	* netx/net/sourceforge/jnlp/util/WeakList.java,
+	* netx/net/sourceforge/nanoxml/XMLElement.java,
+	* netx/net/sourceforge/nanoxml/XMLParseException.java: to here.
+	* patches/ecj/icedtea.patch:
+	Recreated.
+	* patches/icedtea-ant.patch:
+	Remove hack to jaxws which uses plugs directory (now undefined).
+	* patches/icedtea-javac-debuginfo.patch: Recreated.
+	* patches/icedtea-netx.patch:
+	Include netx and netscape classes via the same import mechanism
+	as jaxws, jaxp, corba and langtools (extracting a classes.zip).
+
 2009-05-27  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:

--- a/Makefile.am	Wed May 27 20:20:48 2009 +0100
+++ b/Makefile.am	Thu May 28 10:18:19 2009 +0100
@@ -26,14 +26,14 @@
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net
+LIVECONNECT_DIR = -C lib/rt netscape
 JNLP_ABOUT_TARGET = extra-lib/about.jar 
 else
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net
+LIVECONNECT_DIR = -C lib/rt netscape
 JNLP_ABOUT_TARGET = extra-lib/about.jar 
 else
 ICEDTEAPLUGIN_CLEAN =
@@ -63,6 +63,18 @@
 JIBX_DEPS_DIR=$(abs_top_builddir)/jibx
 endif
 
+SHARE = openjdk/jdk/src/share/classes
+SOLARIS = openjdk/jdk/src/solaris/classes
+LANGTOOLS = openjdk/langtools/src/share/classes
+JAXP = openjdk/jaxp/src/share/classes
+CORBA = openjdk/corba/src/share/classes
+JAXWS = openjdk/jaxws/src/share/classes
+
+OPENJDK_SOURCEPATH_DIRS = \
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
+
+SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
+
 # Top-Level Targets
 # =================
 
@@ -1527,7 +1539,6 @@
 	"LANG=C" \
 	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
@@ -1556,7 +1567,9 @@
 	"JAVAC=" \
 	"RHINO_JAR=$(RHINO_JAR)" \
 	"DISTRIBUTION_ID=$(DIST_ID)" \
-	"ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)"
+	"ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \
+	"ALT_NETX_DIST=$(abs_top_builddir)/netx" \
+	"ALT_LIVECONNECT_DIST=$(abs_top_builddir)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -1603,7 +1616,6 @@
 	"LANG=C" \
 	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
 	"ICEDTEA_RT=$(ICEDTEA_RT)" \
 	"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -1639,7 +1651,9 @@
 	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
 	"JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
 	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)" \
-	"DISABLE_NIMBUS=true"
+	"DISABLE_NIMBUS=true" \
+	"ALT_NETX_DIST=$(abs_top_builddir)/netx" \
+	"ALT_LIVECONNECT_DIST=$(abs_top_builddir)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -2060,6 +2074,7 @@
 	patches/icedtea-jvmtiEnv.patch \
 	patches/icedtea-xml-encodinginfo.patch \
 	patches/icedtea-cc-interp-backedge.patch \
+	patches/icedtea-netx.patch \
 	$(DISTRIBUTION_PATCHES)
 
 if WITH_RHINO
@@ -2277,12 +2292,12 @@
 	    test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
 	done ; \
-	mv stamps/patch.stamp.tmp stamps/patch.stamp ; \
 	if ! test x$${all_patches_ok} = "xyes"; then \
 	  echo ERROR patch $${all_patches_ok} FAILED! ; \
 	  echo WARNING make clean-patch before retrying a fix ; \
 	  exit 2; \
-	fi
+	fi ; \
+	mv stamps/patch.stamp.tmp stamps/patch.stamp 
 
 if ENABLE_NPPLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedteanp/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
@@ -2539,13 +2554,16 @@
 if WITH_OPENJDK
   BOOTSTRAP_DIRECTORY_STAMP =
   ICEDTEA_HOME = $(SYSTEM_OPENJDK_DIR)
+  INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp
 else
 if WITH_ICEDTEA
   BOOTSTRAP_DIRECTORY_STAMP =
   ICEDTEA_HOME = $(SYSTEM_ICEDTEA_DIR)
+  INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp
 else
   BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
   ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea
+  INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
 endif
 endif
 
@@ -2601,10 +2619,10 @@
 	  rm -f bootstrap/ecj/include/$$i; \
 	  ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
 	done; \
-	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar ; \
 	then \
 	  mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
-	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \
 	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar ; \
 	fi
 	if test -f \
@@ -2654,7 +2672,8 @@
   ICEDTEA_DEBUG_BUILD_TARGET=debug_build
 endif
 
-NETX_RESOURCE_DIR=openjdk/jdk/src/share/classes/net/sourceforge/jnlp/resources
+NETX_DIR=$(abs_top_srcdir)/netx/net/sourceforge
+NETX_RESOURCE_DIR=$(NETX_DIR)/jnlp/resources
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
@@ -2662,8 +2681,8 @@
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
 	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
-	stamps/jibx.stamp stamps/cacao.stamp \
-	stamps/pulse-java.stamp stamps/visualvm.stamp
+	stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \
+	stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -2748,8 +2767,8 @@
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
 	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
-	stamps/jibx.stamp stamps/cacao.stamp \
-	stamps/pulse-java.stamp stamps/visualvm.stamp
+	stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \
+	stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
@@ -2861,8 +2880,9 @@
 	touch stamps/native-ecj.stamp
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
+	stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/netx-dist.stamp \
+	stamps/liveconnect.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp \
+	stamps/cacao.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj \
@@ -2908,7 +2928,7 @@
 	mkdir -p stamps
 	touch stamps/plugs.stamp
 
-stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
+stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/lib/tools.jar
 	mkdir -p stamps
 	touch stamps/hotspot-tools.stamp
 
@@ -2919,7 +2939,7 @@
 
 clean-tools-jar: clean-hotspot-tools
 	rm -f stamps/hotspot-tools.stamp
-	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
+	rm -f bootstrap/jdk1.7.0/lib/tools.jar
 
 # Sources copied from OpenJDK.
 ICEDTEA_COPY_DIRS = \
@@ -2954,16 +2974,6 @@
 	  rm -rf rt/$$copy_dir ; \
 	done
 
-SHARE = openjdk/jdk/src/share/classes
-SOLARIS = openjdk/jdk/src/solaris/classes
-LANGTOOLS = openjdk/langtools/src/share/classes
-JAXP = openjdk/jaxp/src/share/classes
-CORBA = openjdk/corba/src/share/classes
-JAXWS = openjdk/jaxws/src/share/classes
-
-OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
-
 # tools.jar class files.
 stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp
 	for copy_dir in \
@@ -3002,21 +3012,21 @@
 	find hotspot-tools -name '*.java' | sort > $@
 	mkdir -p lib/hotspot-tools
 
-ABS_SOURCE_DIRS = $(abs_top_builddir)/generated
-stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
+stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \
+	$(INITIAL_BOOTSTRAP_LINK_STAMP)
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
             -source 1.5 \
             -sourcepath \
-	      'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+	      'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
             -bootclasspath \'\' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
 	    -d lib/hotspot-tools \
 	    -source 1.5 \
 	    -sourcepath \
-	      'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+	      'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
 	    -bootclasspath \'\' @$< ; \
 	fi
 	mkdir -p stamps
@@ -3029,8 +3039,8 @@
 	rm -f stamps/hotspot-tools-copy-source-files.stamp
 
 # tools.jar
-bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
-	mkdir -p bootstrap/jdk1.7.0/jre/lib/
+bootstrap/jdk1.7.0/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
+	mkdir -p bootstrap/jdk1.7.0/lib/
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
         then \
 	  $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
@@ -3045,7 +3055,7 @@
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
-	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \
 	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
 
@@ -3054,20 +3064,20 @@
 	find $(abs_top_builddir)/rt -name '*.java' \
 	  | sort -u > $@
 
-stamps/rt-class-files.stamp: rt-source-files.txt
+stamps/rt-class-files.stamp: rt-source-files.txt stamps/hotspot-tools.stamp
 	mkdir -p lib/rt
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
         then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
 	    -source 1.5 \
-	    -sourcepath \
-	      '$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+	    -classpath $(abs_top_builddir)/lib/hotspot-tools \
+	    -sourcepath '$(SOURCEPATH_DIRS)' \
 	    -bootclasspath \'\' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
             -source 1.5 \
-            -sourcepath \
-	      '$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+	    -classpath $(abs_top_builddir)/lib/hotspot-tools \
+            -sourcepath '$(SOURCEPATH_DIRS)' \
             -bootclasspath \'\' @$< ; \
 	fi
 	mkdir -p stamps
@@ -3084,10 +3094,10 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAR) cf $@ -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \
+	    -C lib/rt javax -C lib/rt sun ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \
+	    -C lib/rt javax -C lib/rt sun ; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
@@ -3099,21 +3109,21 @@
 extra-source-files.txt:
 	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
 
-stamps/extra-class-files.stamp: extra-source-files.txt stamps/plugs.stamp
+stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp
 	mkdir -p extra-lib
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
 	    -source 1.5 \
-	    -sourcepath $(abs_top_srcdir)/extra \
-	    -classpath $(ICEDTEA_RT) \
+	    -classpath $(abs_top_builddir)/lib/hotspot-tools \
+	    -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
 	    -bootclasspath \'\' \
 	    @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
             -source 1.5 \
-	    -sourcepath $(abs_top_srcdir)/extra \
-	    -classpath $(ICEDTEA_RT) \
+	    -classpath $(abs_top_builddir)/lib/hotspot-tools \
+	    -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
 	    -bootclasspath \'\' \
 	    @extra-source-files.txt ; \
 	fi
@@ -3137,6 +3147,43 @@
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
 	fi
 
+# netx
+# requires availability of OpenJDK source code including
+# a patch applied to sun.plugin.AppletViewerPanel and generated sources
+
+netx-source-files.txt:
+	find $(abs_top_srcdir)/netx -name '*.java' | sort > $@
+
+stamps/netx.stamp: netx-source-files.txt stamps/hotspot-tools.stamp
+	mkdir -p $(abs_top_builddir)/netx
+	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
+	    -d $(abs_top_builddir)/netx \
+            -source 1.5 \
+	    -classpath $(abs_top_builddir)/lib/hotspot-tools \
+	    -sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \
+	    -bootclasspath \'\' \
+	    @netx-source-files.txt ;
+	mkdir -p $(abs_top_builddir)/stamps
+	touch stamps/netx.stamp
+
+stamps/netx-dist.stamp: stamps/netx.stamp
+	(cd $(abs_top_builddir)/netx ; \
+	 mkdir -p lib ; \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
+	 cd $(abs_top_srcdir)/netx ; \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx/lib/classes.jar \
+	  `find . -type f -not -name '*.java'` ; \
+	 $(ZIP) -qr $(abs_top_builddir)/netx/lib/src.zip javax net )
+	mkdir -p stamps
+	touch stamps/netx-dist.stamp
+
+stamps/liveconnect.stamp: stamps/hotspot-tools.stamp
+	if test "x${LIVECONNECT_DIR}" != x; then \
+	  $(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \
+	fi
+	mkdir -p stamps
+	touch stamps/liveconnect.stamp
+
 stamps/jibx.stamp:
 if ENABLE_NIMBUS
 if ENABLE_NIMBUS_GENERATION
@@ -3270,7 +3317,7 @@
 	mkdir -p stamps
 	touch stamps/pulse-java-jar.stamp
 
-stamps/pulse-java-class.stamp: 
+stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
 if ENABLE_PULSE_JAVA
 	mkdir -p $(PULSE_JAVA_CLASS_DIR)
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
@@ -3677,3 +3724,9 @@
 clean: distclean-local
 
 jtreg: stamps/jtreg.stamp
+
+netx: stamps/netx.stamp
+
+netx-dist: stamps/netx-dist.stamp
+
+liveconnect: stamps/liveconnect.stamp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/BasicService.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,13 @@
+
+
+package javax.jnlp;
+
+public interface BasicService {
+
+  public java.net.URL getCodeBase();
+  public boolean isOffline();
+  public boolean showDocument(java.net.URL url);
+  public boolean isWebBrowserSupported();
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/ClipboardService.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,11 @@
+
+
+package javax.jnlp;
+
+public interface ClipboardService {
+
+  public java.awt.datatransfer.Transferable getContents();
+  public void setContents(java.awt.datatransfer.Transferable contents);
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/DownloadService.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,25 @@
+
+
+package javax.jnlp;
+
+public interface DownloadService {
+
+  public boolean isResourceCached(java.net.URL ref, java.lang.String version);
+  public boolean isPartCached(java.lang.String part);
+  public boolean isPartCached(java.lang.String[] parts);
+  public boolean isExtensionPartCached(java.net.URL ref, java.lang.String version, java.lang.String part);
+  public boolean isExtensionPartCached(java.net.URL ref, java.lang.String version, java.lang.String[] parts);
+  public void loadResource(java.net.URL ref, java.lang.String version, DownloadServiceListener progress) throws java.io.IOException;
+  public void loadPart(java.lang.String part, DownloadServiceListener progress) throws java.io.IOException;
+  public void loadPart(java.lang.String[] parts, DownloadServiceListener progress) throws java.io.IOException;
+  public void loadExtensionPart(java.net.URL ref, java.lang.String version, java.lang.String part, DownloadServiceListener progress) throws java.io.IOException;
+  public void loadExtensionPart(java.net.URL ref, java.lang.String version, java.lang.String[] parts, DownloadServiceListener progress) throws java.io.IOException;
+  public void removeResource(java.net.URL ref, java.lang.String version) throws java.io.IOException;
+  public void removePart(java.lang.String part) throws java.io.IOException;
+  public void removePart(java.lang.String[] parts) throws java.io.IOException;
+  public void removeExtensionPart(java.net.URL ref, java.lang.String version, java.lang.String part) throws java.io.IOException;
+  public void removeExtensionPart(java.net.URL ref, java.lang.String version, java.lang.String[] parts) throws java.io.IOException;
+  public DownloadServiceListener getDefaultProgressWindow();
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/DownloadServiceListener.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,13 @@
+
+
+package javax.jnlp;
+
+public interface DownloadServiceListener {
+
+  public void progress(java.net.URL url, java.lang.String version, long readSoFar, long total, int overallPercent);
+  public void validating(java.net.URL url, java.lang.String version, long entry, long total, int overallPercent);
+  public void upgradingArchive(java.net.URL url, java.lang.String version, int patchPercent, int overallPercent);
+  public void downloadFailed(java.net.URL url, java.lang.String version);
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/ExtensionInstallerService.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,22 @@
+
+
+package javax.jnlp;
+
+public interface ExtensionInstallerService {
+
+  public java.lang.String getInstallPath();
+  public java.lang.String getExtensionVersion();
+  public java.net.URL getExtensionLocation();
+  public void hideProgressBar();
+  public void hideStatusWindow();
+  public void setHeading(java.lang.String heading);
+  public void setStatus(java.lang.String status);
+  public void updateProgress(int value);
+  public void installSucceeded(boolean needsReboot);
+  public void installFailed();
+  public void setJREInfo(java.lang.String platformVersion, java.lang.String jrePath);
+  public void setNativeLibraryInfo(java.lang.String path);
+  public java.lang.String getInstalledJRE(java.net.URL url, java.lang.String version);
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/FileContents.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,18 @@
+
+
+package javax.jnlp;
+
+public interface FileContents {
+
+  public java.lang.String getName() throws java.io.IOException;
+  public java.io.InputStream getInputStream() throws java.io.IOException;
+  public java.io.OutputStream getOutputStream(boolean overwrite) throws java.io.IOException;
+  public long getLength() throws java.io.IOException;
+  public boolean canRead() throws java.io.IOException;
+  public boolean canWrite() throws java.io.IOException;
+  public JNLPRandomAccessFile getRandomAccessFile(java.lang.String mode) throws java.io.IOException;
+  public long getMaxLength() throws java.io.IOException;
+  public long setMaxLength(long maxlength) throws java.io.IOException;
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/FileOpenService.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,11 @@
+
+
+package javax.jnlp;
+
+public interface FileOpenService {
+
+  public FileContents openFileDialog(java.lang.String pathHint, java.lang.String[] extensions) throws java.io.IOException;
+  public FileContents[] openMultiFileDialog(java.lang.String pathHint, java.lang.String[] extensions) throws java.io.IOException;
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/FileSaveService.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,11 @@
+
+
+package javax.jnlp;
+
+public interface FileSaveService {
+
+  public FileContents saveFileDialog(java.lang.String pathHint, java.lang.String[] extensions, java.io.InputStream stream, java.lang.String name) throws java.io.IOException;
+  public FileContents saveAsFileDialog(java.lang.String pathHint, java.lang.String[] extensions, FileContents contents) throws java.io.IOException;
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/JNLPRandomAccessFile.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,46 @@
+
+
+package javax.jnlp;
+
+public interface JNLPRandomAccessFile {
+
+  public void close() throws java.io.IOException;
+  public long length() throws java.io.IOException;
+  public long getFilePointer() throws java.io.IOException;
+  public int read() throws java.io.IOException;
+  public int read(byte[] b, int off, int len) throws java.io.IOException;
+  public int read(byte[] b) throws java.io.IOException;
+  public void readFully(byte[] b) throws java.io.IOException;
+  public void readFully(byte[] b, int off, int len) throws java.io.IOException;
+  public int skipBytes(int n) throws java.io.IOException;
+  public boolean readBoolean() throws java.io.IOException;
+  public byte readByte() throws java.io.IOException;
+  public int readUnsignedByte() throws java.io.IOException;
+  public short readShort() throws java.io.IOException;
+  public int readUnsignedShort() throws java.io.IOException;
+  public char readChar() throws java.io.IOException;
+  public int readInt() throws java.io.IOException;
+  public long readLong() throws java.io.IOException;
+  public float readFloat() throws java.io.IOException;
+  public double readDouble() throws java.io.IOException;
+  public java.lang.String readLine() throws java.io.IOException;
+  public java.lang.String readUTF() throws java.io.IOException;
+  public void seek(long pos) throws java.io.IOException;
+  public void setLength(long newLength) throws java.io.IOException;
+  public void write(int b) throws java.io.IOException;
+  public void write(byte[] b) throws java.io.IOException;
+  public void write(byte[] b, int off, int len) throws java.io.IOException;
+  public void writeBoolean(boolean v) throws java.io.IOException;
+  public void writeByte(int v) throws java.io.IOException;
+  public void writeShort(int v) throws java.io.IOException;
+  public void writeChar(int v) throws java.io.IOException;
+  public void writeInt(int v) throws java.io.IOException;
+  public void writeLong(long v) throws java.io.IOException;
+  public void writeFloat(float v) throws java.io.IOException;
+  public void writeDouble(double v) throws java.io.IOException;
+  public void writeBytes(java.lang.String s) throws java.io.IOException;
+  public void writeChars(java.lang.String s) throws java.io.IOException;
+  public void writeUTF(java.lang.String str) throws java.io.IOException;
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/PersistenceService.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,18 @@
+
+package javax.jnlp;
+
+public interface PersistenceService {
+
+  public static final int CACHED = 0;
+  public static final int TEMPORARY = 1;
+  public static final int DIRTY = 2;
+
+  public long create(java.net.URL url, long maxsize) throws java.net.MalformedURLException, java.io.IOException;
+  public FileContents get(java.net.URL url) throws java.net.MalformedURLException, java.io.IOException, java.io.FileNotFoundException;
+  public void delete(java.net.URL url) throws java.net.MalformedURLException, java.io.IOException;
+  public java.lang.String[] getNames(java.net.URL url) throws java.net.MalformedURLException, java.io.IOException;
+  public int getTag(java.net.URL url) throws java.net.MalformedURLException, java.io.IOException;
+  public void setTag(java.net.URL url, int tag) throws java.net.MalformedURLException, java.io.IOException;
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/PrintService.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,13 @@
+
+
+package javax.jnlp;
+
+public interface PrintService {
+
+  public java.awt.print.PageFormat getDefaultPage();
+  public java.awt.print.PageFormat showPageFormatDialog(java.awt.print.PageFormat page);
+  public boolean print(java.awt.print.Pageable document);
+  public boolean print(java.awt.print.Printable painter);
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/ServiceManager.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,54 @@
+
+
+
+package javax.jnlp;
+
+import java.util.*;
+
+
+public final class ServiceManager {
+
+  private static ServiceManagerStub stub = null;
+
+  private static Map lookupTable = new HashMap(); // ensure lookup is idempotent
+
+  private ServiceManager() {
+    // says it can't be instantiated
+  }
+
+
+  public static java.lang.Object lookup(java.lang.String name) throws UnavailableServiceException {
+    if (stub == null)
+      throw new UnavailableServiceException("service stub not set.");
+
+    synchronized(lookupTable) {
+      Object result = lookupTable.get(name);
+
+      if (result == null) {
+        result = stub.lookup(name);
+        if (result != null)
+          lookupTable.put(name, result);
+      }
+
+      if (result == null)
+        throw new UnavailableServiceException("service not available (stub returned null).");
+
+      return result;
+    }
+  }
+
+  public static java.lang.String[] getServiceNames() {
+    // should this return the required ones even though no stub??
+    if (stub == null)
+      return new String[0];
+
+    return stub.getServiceNames();
+  }
+
+  public static void setServiceManagerStub(ServiceManagerStub stub) {
+    if (ServiceManager.stub == null)
+      ServiceManager.stub = stub;
+  }
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/ServiceManagerStub.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,11 @@
+
+
+package javax.jnlp;
+
+public interface ServiceManagerStub {
+
+  public java.lang.Object lookup(java.lang.String name) throws UnavailableServiceException;
+  public java.lang.String[] getServiceNames();
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/javax/jnlp/UnavailableServiceException.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,16 @@
+
+
+package javax.jnlp;
+
+public class UnavailableServiceException extends Exception {
+
+  public UnavailableServiceException() {
+    super();
+  }
+
+  public UnavailableServiceException(java.lang.String message) {
+    super(message);
+  }
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/AppletDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,125 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * The applet-desc element.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.8 $
+ */
+public class AppletDesc {
+
+    /** the applet name */
+    private String name;
+
+    /** the main class name and package */
+    private String mainClass;
+
+    /** the document base */
+    private URL documentBase;
+
+    /** the width */
+    private int width;
+
+    /** the height */
+    private int height;
+
+    /** the parameters */
+    private Map parameters;
+
+
+    /**
+     * Create an Applet descriptor.
+     * 
+     * @param name the applet name
+     * @param mainClass the main class name and package
+     * @param documentBase the document base
+     * @param width the width
+     * @param height the height
+     * @param parameters the parameters
+     */
+    public AppletDesc(String name, String mainClass, URL documentBase, int width, int height, Map parameters) {
+        this.name = name;
+        this.mainClass = mainClass;
+        this.documentBase = documentBase;
+        this.width = width;
+        this.height = height;
+        this.parameters = new HashMap(parameters);
+    }
+
+    /**
+     * Returns the applet name 
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the main class name 
+     */
+    public String getMainClass() {
+        return mainClass;
+    }
+
+    /**
+     * Returns the document base 
+     */
+    public URL getDocumentBase() {
+        return documentBase;
+    }
+
+    /**
+     * Returns the width 
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /** 
+     * Returns the height 
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /** 
+     * Returns the applet parameters 
+     */
+    public Map getParameters() {
+        return new HashMap(parameters);
+    }
+
+    /**
+     * Adds a parameter to the applet.  If the parameter already
+     * exists then it is overwritten with the new value.  Adding a
+     * parameter will have no effect on already-running applets
+     * launched from this JNLP file.
+     */
+    public void addParameter(String name, String value) {
+        parameters.put(name, value);
+    }
+
+}
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/ApplicationDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,76 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * The application-desc element.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.7 $
+ */
+public class ApplicationDesc {
+
+    /** the main class name and package */
+    private String mainClass;
+
+    /** the arguments */
+    private String arguments[];
+
+
+    /**
+     * Create an Application descriptor.
+     * 
+     * @param mainClass the main class name and package
+     * @param arguments the arguments
+     */
+    public ApplicationDesc(String mainClass, String arguments[]) {
+        this.mainClass = mainClass;
+        this.arguments = arguments;
+    }
+
+    /**
+     * Returns the main class name 
+     */
+    public String getMainClass() {
+        return mainClass;
+    }
+
+    /** 
+     * Returns the arguments
+     */
+    public String[] getArguments() {
+        return (String[]) arguments.clone();
+    }
+
+    /**
+     * Add an argument to the end of the arguments.
+     */
+    public void addArgument(String arg) {
+        ArrayList l = new ArrayList(Arrays.asList(arguments));
+        l.add(arg);
+
+        arguments = (String[]) l.toArray(arguments);
+    }
+
+}
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/ComponentDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,43 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * The component-desc element.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.6 $
+ */
+public class ComponentDesc {
+
+    // this is for completeness and in case of changes to spec for components.
+
+    /**
+     * Create a component descriptor.
+     */
+    public ComponentDesc() {
+    }
+
+}
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/DefaultLaunchHandler.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,114 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+package net.sourceforge.jnlp;
+
+import net.sourceforge.jnlp.runtime.*;
+import net.sourceforge.jnlp.util.*;
+
+import java.awt.*;
+import java.util.*;
+import javax.swing.*;
+
+
+/**
+ * This default implementation shows prints the exception to
+ * stdout and if not in headless mode displays the exception in a
+ * dialog.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.1 $
+ */
+public class DefaultLaunchHandler implements LaunchHandler {
+
+    /**
+     * Called when the application could not be launched due to a
+     * fatal error, such as the inability to find the main class
+     * or non-parseable XML.
+     */
+    public void launchError(LaunchException exception) {
+        printMessage(exception);
+    }
+
+    /**
+     * Called when launching the application can not be launched
+     * due to an error that is not fatal.  For example a JNLP file
+     * that is not strictly correct yet does not necessarily
+     * prohibit the system from attempting to launch the
+     * application.
+     *
+     * @return true if the launch should continue, false to abort
+     */
+    public boolean launchWarning(LaunchException warning) {
+        printMessage(warning);
+        return true;
+    }
+
+    /**
+     * Called when a security validation error occurs while
+     * launching the application.
+     *
+     * @return true to allow the application to continue, false to stop it.
+     */
+    public boolean validationError(LaunchException security) {
+        printMessage(security);
+        return true;
+    }
+
+    /**
+     * Called when an application, applet, or installer has been
+     * launched successfully (the main method or applet start method
+     * returned normally).
+     *
+     * @param application the launched application instance
+     */
+    public void launchCompleted(ApplicationInstance application) {
+        //
+    }
+
+    /**
+     * Print a message to stdout.
+     */
+    protected 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(")");
+        }
+    }
+
+}
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/ExtensionDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,157 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+
+/**
+ * The extension element.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.8 $
+ */
+public class ExtensionDesc {
+
+    /** the extension name */
+    private String name;
+
+    /** the required extension version */
+    private Version version;
+
+    /** the location of the extension JNLP file */
+    private URL location;
+    
+    /** the cookie string sent with resource requests */
+    private String cookieStr;
+
+    /** the JNLPFile the extension refers to */
+    private JNLPFile file;
+
+    /** map from ext-part to local part */
+    private Map extToPart = new HashMap();
+
+    /** eager ext parts */ 
+    private List eagerExtParts = new ArrayList();
+
+
+    /**
+     * Create an extention descriptor.
+     *
+     * @param name the extension name
+     * @param version the required version of the extention JNLPFile
+     * @param location the location of the extention JNLP file
+     */
+    public ExtensionDesc(String name, Version version, URL location, String cookieStr) {
+        this.name = name;
+        this.version = version;
+        this.location = location;
+        this.cookieStr = cookieStr;
+    }
+
+    /**
+     * Adds an extension part to be downloaded when the specified
+     * part of the main JNLP file is loaded.  The extension part
+     * will be downloaded before the application is launched if the
+     * lazy value is false or the part is empty or null.
+     *
+     * @param extPart the part name in the extension file
+     * @param part the part name in the main file
+     * @param lazy whether to load the part before launching
+     */
+    protected void addPart(String extPart, String part, boolean lazy) {
+        extToPart.put(extPart, part);
+
+        if (!lazy || part == null || part.length() == 0)
+            eagerExtParts.add(extPart);
+    }
+
+    /**
+     * Returns the parts in the extension JNLP file mapped to the
+     * part of the main file.
+     */
+    public String[] getExtensionParts(String thisPart) {
+
+        return null;
+    }
+
+    /**
+     * Returns the name of the extension.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the required version of the extension JNLP file.
+     */
+    public Version getVersion() {
+        return version;
+    }
+
+    /**
+     * Returns the location of the extension JNLP file.
+     */
+    public URL getLocation() {
+        return location;
+    }
+
+    /**
+     * Resolves the extension by creating a JNLPFile from the file
+     * specified by the extension's location property.
+     *
+     * @throws IOException if the extension JNLPFile could not be resolved.
+     * @throws ParseException if the extension JNLPFile could not be
+     * parsed or was not a component or installer descriptor.
+     */
+    public void resolve() throws ParseException, IOException {
+        if (file == null) {
+            file = new JNLPFile(location, cookieStr);
+
+            if (JNLPRuntime.isDebug())
+                System.out.println("Resolve: "+file.getInformation().getTitle());
+
+            // check for it being an extension descriptor
+            if (!file.isComponent() && !file.isInstaller())
+                throw new ParseException(JNLPRuntime.getMessage("JInvalidExtensionDescriptor", new Object[] {name, location} ));
+        }
+
+    }
+
+    /**
+     * Returns a JNLPFile for the extension, or null if the JNLP
+     * file has not been resolved.
+     */
+    public JNLPFile getJNLPFile() {
+        return file;
+    }
+    
+    /**
+     * Returns the cookie associated with this instance
+     */
+    public String getCookieStr() {
+        return cookieStr;
+    }
+
+}
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/IconDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,135 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * The icon element.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.8 $
+ */
+public class IconDesc {
+
+    /** default icon */
+    public static final Object DEFAULT = "default";
+
+    /** selected icon */
+    public static final Object SELECTED = "selected";
+
+    /** disabled icon */
+    public static final Object DISABLED = "disabled";
+
+    /** rollover icon */
+    public static final Object ROLLOVER = "rollover";
+
+    /** splash icon */
+    public static final Object SPLASH = "splash";
+
+
+    /** the location of the icon */
+    private URL location;
+
+    /** the type of icon*/
+    private Object kind;
+
+    /** the width, or -1 if unknown*/
+    private int width;
+
+    /** the height, or -1 if unknown*/
+    private int height;
+
+    /** the depth, or -1 if unknown*/
+    private int depth;
+
+    /** the size, or -1 if unknown*/
+    private int size;
+
+
+    /**
+     * Creates an icon descriptor with the specified information.
+     *
+     * @param location the location of the icon 
+     * @param kind the type of icon
+     * @param width the width, or -1 if unknown
+     * @param height the height, or -1 if unknown
+     * @param depth the depth, or -1 if unknown
+     * @param size the size, or -1 if unknown
+     */
+    IconDesc(URL location, Object kind, int width, int height, int depth, int size) {
+        this.location = location;
+        this.kind = kind;
+        this.width = width;
+        this.height = height;
+        this.depth = depth;
+        this.size = size;
+    }
+
+    /**
+     * Returns the location of the icon.
+     */
+    public URL getLocation() { 
+        return location; 
+    }
+
+    /**
+     * Returns the icon type.
+     */
+    public Object getKind() { 
+        return kind; 
+    }
+
+    /**
+     * Returns the icon width or -1 if not specified in the
+     * JNLPFile.
+     */
+    public int getWidth() { 
+        return width; 
+    }
+
+    /**
+     * Returns the icon height or -1 if not specified in the
+     * JNLPFile.
+     */
+    public int getHeight() { 
+        return height; 
+    }
+
+    /**
+     * Returns the icon size or -1 if not specified in the JNLPFile.
+     */
+    public int getSize() { 
+        return size; 
+    }
+
+    /**
+     * Returns the icon depth or -1 if not specified in the
+     * JNLPFile.
+     */
+    public int getDepth() { 
+        return depth; 
+    }
+
+
+}
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/InformationDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,241 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.awt.Dimension;
+import java.net.*;
+import java.util.*;
+
+/**
+ * The information element.<p>
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.9 $
+ */
+public class InformationDesc {
+
+    // There is an understanding between this class and the parser
+    // that description and icon types are keyed by "icon-"+kind and
+    // "description-"+kind, and that other types are keyed by their
+    // specification name.
+
+    /** one-line description */
+    public static final Object ONE_LINE= "oneline";
+
+    /** short description */
+    public static final Object SHORT= "short";
+
+    /** tooltip description */
+    public static final Object TOOLTIP= "tooltip";
+
+    /** default description */
+    public static final Object DEFAULT = "default";
+
+    /** the locales for the information */
+    private Locale locales[];
+
+    /** the data as list of key,value pairs */
+    private List info;
+
+    /** the JNLPFile this information is for */
+    private JNLPFile jnlpFile;
+
+
+    /**
+     * Create an information element object.
+     *
+     * @param jnlpFile file that the information is for
+     * @param locale the the information is for
+     */
+    public InformationDesc(JNLPFile jnlpFile, Locale locales[]) {
+        this.jnlpFile = jnlpFile;
+        this.locales = locales;
+    }
+
+    /**
+     * Returns the application's title.
+     */
+    public String getTitle() {
+        return (String) getItem("title");
+    }
+
+    /**
+     * Returns the application's vendor.
+     */
+    public String getVendor() {
+        return (String) getItem("vendor");
+    }
+
+    /**
+     * Returns the application's homepage.
+     */
+    public URL getHomepage() {
+        return (URL)getItem("homepage");
+    }
+
+    /**
+     * Returns the default description for the application.
+     */
+    public String getDescription() {
+        String result = getDescription(DEFAULT);
+
+        // try to find any description if default is null
+        if (result == null)
+            result = getDescription(ONE_LINE);
+        if (result == null)
+            result = getDescription(SHORT);
+        if (result == null)
+            result = getDescription(TOOLTIP);
+
+        return result;
+    }
+
+    /**
+     * Returns the application's description of the specified type.
+     *
+     * @param kind one of Information.SHORT, Information.ONE_LINE,
+     * Information.TOOLTIP, Information.DEFAULT
+     */
+    public String getDescription(Object kind) {
+        String result = (String) getItem("description-"+kind);
+        if (result == null)
+            return (String) getItem("description-"+DEFAULT);
+        else
+            return result;
+    }
+
+    /**
+     * Returns the icons specified by the JNLP file.
+     *
+     * @param kind one of IconDesc.SELECTED, IconDesc.DISABLED,
+     * IconDesc.ROLLOVER, IconDesc.SPLASH, IconDesc.DEFAULT
+     * @return an array of zero of more IconDescs of the specified icon type
+     */
+    public IconDesc[] getIcons(Object kind) {
+        List icons = getItems("icon-"+kind);
+
+        return (IconDesc[]) icons.toArray(new IconDesc[icons.size()]);
+    };
+
+    /**
+     * Returns the URL of the icon closest to the specified size and
+     * kind.  This method will not return an icon smaller than the
+     * specified width and height unless there are no other icons
+     * available.
+     *
+     * @param kind the kind of icon to get
+     * @param width desired width of icon
+     * @param height desired height of icon
+     * @return the closest icon by size or null if no icons declared
+     */
+    public URL getIconLocation(Object kind, int width, int height) {
+        IconDesc icons[] = getIcons(kind);
+        if (icons.length == 0)
+            return null;
+
+        IconDesc best = null;
+        for (int i=0; i < icons.length; i++) {
+            if (icons[i].getWidth() >= width &&
+                icons[i].getHeight() >= height) {
+                if (best == null)
+                    best = icons[i];
+
+                if (icons[i].getWidth() <= best.getWidth() && // Use <= so last specified of
+                    icons[i].getHeight() <= best.getHeight()) // equivalent icons is chosen.
+                    best = icons[i];
+            }
+        }
+
+        if (best == null)
+            best = icons[0];
+
+        return best.getLocation();
+    }
+
+    /**
+     * Returns the locales for the information.
+     */
+    public Locale[] getLocales() {
+        return locales;
+    }
+
+    /**
+     * Returns the JNLPFile the information is for.
+     */
+    public JNLPFile getJNLPFile() {
+        return jnlpFile;
+    }
+
+    /**
+     * Returns whether offline execution allowed.
+     */
+    public boolean isOfflineAllowed() {
+        return null != getItem("offline-allowed");
+    }
+
+    /**
+     * Returns whether the resources specified in the JNLP file may
+     * be shared by more than one instance in the same JVM
+     * (JNLP extension).  This is an extension to the JNLP spec and
+     * will always return false for standard JNLP files.
+     */
+    public boolean isSharingAllowed() {
+        return null != getItem("sharing-allowed");
+    }
+
+    /**
+     * Returns the last item matching the specified key.
+     */
+    protected Object getItem(Object key) {
+        List items = getItems(key);
+        if (items.size() == 0)
+            return null;
+        else
+            return items.get( items.size()-1 );
+    }
+
+    /**
+     * Returns all items matching the specified key.
+     */
+    protected List getItems(Object key) {
+        if (info == null)
+            return Collections.EMPTY_LIST;
+
+        List result = new ArrayList();
+        for (int i=0; i < info.size(); i+=2)
+            if (info.get(i).equals(key))
+                result.add( info.get(i+1) );
+
+        return result;
+    }
+
+    /**
+     * Add an information item (description, icon, etc) under a
+     * specified key name.
+     */
+    protected void addItem(String key, Object value) {
+        if (info == null)
+            info = new ArrayList();
+
+        info.add(key);
+        info.add(value);
+    }
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/InstallerDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,54 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * The installer-desc element.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.6 $
+ */
+public class InstallerDesc {
+
+    /** the main class name and package. */
+    private String mainClass;
+
+
+    /**
+     * Creates a installer descriptor.
+     *
+     * @param mainClass main class name and package
+     */
+    public InstallerDesc(String mainClass) {
+        this.mainClass = mainClass;
+    }
+
+    /**
+     * Returns the main class name and package.
+     */
+    public String getMainClass() {
+        return mainClass;
+    }
+
+}
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/JARDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,144 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * The JAR element.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.6 $
+ */
+public class JARDesc {
+
+    /** the location of the JAR file */
+    private URL location;
+
+    /** the required JAR versions, or null */
+    private Version version;
+
+    /** the part name */
+    private String part;
+
+    /** whether to load the JAR on demand */
+    private boolean lazy;
+
+    /** whether the JAR contains the main class */
+    private boolean main;
+
+    /** whether the JAR contains native libraries */
+    private boolean nativeJar;
+    
+    /** whether the JAR can be cached */
+    private boolean cacheable;
+
+    /**
+     * Create a JAR descriptor.
+     *
+     * @param location the location of the JAR file
+     * @param version the required JAR versions, or null
+     * @param part the part name, or null
+     * @param lazy whether to load the JAR on demand
+     * @param main whether the JAR contains the main class
+     * @param nativeJam whether the JAR contains native libraries
+     */
+    public JARDesc(URL location, Version version, String part, boolean lazy, boolean main, boolean nativeJar, boolean cacheable) {
+        this.location = location;
+        this.version = version;
+        this.part = part;
+        this.lazy = lazy;
+        this.main = main;
+        this.nativeJar = nativeJar;
+        this.cacheable = cacheable;
+    }
+
+    /**
+     * Returns the URL of the JAR file.
+     */
+    public URL getLocation() {
+        return location;
+    }
+
+    /**
+     * Returns the required version of the JAR file.
+     */
+    public Version getVersion() {
+        return version;
+    }
+
+    /**
+     * Returns the part name, or null if not specified in the JNLP
+     * file.
+     */
+    public String getPart() {
+        return part;
+    }
+
+    /**
+     * Returns true if the JAR file contains native code
+     * libraries.
+     */
+    public boolean isNative() {
+        return nativeJar;
+    }
+
+    // these both are included in case the spec adds a new value,
+    // where !lazy would no longer imply eager.
+
+    /**
+     * Returns true if the JAR file should be downloaded before
+     * starting the application.
+     */
+    public boolean isEager() {
+        return !lazy;
+    }
+
+    /**
+     * Returns true if the JAR file should be downloaded on demand.
+     */
+    public boolean isLazy() {
+        return lazy;
+    }
+
+    /**
+     * Returns true if the JNLP file defined this JAR as containing
+     * the main class.  If no JARs were defined as the main JAR then
+     * the first JAR should be used to locate the main class.
+     *
+     * @see ResourcesDesc#getMainJAR
+     */
+    public boolean isMain() {
+        return main;
+    }
+    
+    /**
+     * Returns if this jar is cacheable
+     * 
+     * @return Whether or not this jar is cacheable
+     */
+    public boolean isCacheable() {
+        return cacheable;
+    }
+
+}
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,523 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import net.sourceforge.jnlp.cache.*;
+import net.sourceforge.jnlp.runtime.*;
+
+/**
+ * Provides methods to access the information in a Java Network
+ * Launching Protocol (JNLP) file.  The Java Network Launching
+ * Protocol specifies in an XML file the information needed to
+ * load, cache, and run Java code over the network and in a secure
+ * environment.<p>
+ *
+ * This class represents the overall information about a JNLP file
+ * from the jnlp element.  Other information is accessed through
+ * objects that represent the elements of a JNLP file
+ * (information, resources, application-desc, etc).  References to
+ * these objects are obtained by calling the getInformation,
+ * getResources, getSecurity, etc methods.<p>
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.21 $ 
+ */
+public class JNLPFile {
+
+    // todo: save the update policy, then if file was not updated
+    // then do not check resources for being updated.
+    //
+    // todo: make getLaunchInfo return a superclass that all the
+    // launch types implement (can get codebase from it).
+    //
+    // todo: currently does not filter resources by jvm version.
+    //
+    
+    private static String R(String key) { return JNLPRuntime.getMessage(key); }
+
+    /** the location this JNLP file was created from */
+    protected URL sourceLocation = null;
+
+    /** the network location of this JNLP file */
+    protected URL fileLocation;
+
+    /** the URL used to resolve relative URLs in the file */
+    protected URL codeBase;
+    
+    /** cookie string to send alongwith resource requests */
+    protected String cookieStr;
+
+    /** file version */
+    protected Version fileVersion;
+
+    /** spec version */
+    protected Version specVersion;
+
+    /** information */
+    protected List info;
+
+    /** resources */
+    protected List resources;
+
+    /** additional resources not in JNLP file (from command line) */
+    protected ResourcesDesc sharedResources = new ResourcesDesc(this, null, null, null);
+
+    /** the application description */
+    protected Object launchType;
+
+    /** the security descriptor */
+    protected SecurityDesc security;
+
+    /** the default OS */
+    protected Locale defaultLocale = null;
+
+    /** the default arch */
+    protected String defaultOS = null;
+
+    /** the default jvm */
+    protected String defaultArch = null;
+
+    { // initialize defaults if security allows
+        try {
+            defaultLocale = Locale.getDefault();
+            defaultOS = System.getProperty("os.name");
+            defaultArch = System.getProperty("os.arch");
+        }
+        catch (SecurityException ex) {
+            // null values will still work, and app can set defaults later
+        }
+    }
+    
+    /**
+     * Empty stub, allowing child classes to override the constructor
+     */
+    protected JNLPFile() {
+    }
+
+    /**
+     * Create a JNLPFile from a URL.
+     *
+     * @param location the location of the JNLP file
+     * @throws IOException if an IO exception occurred
+     * @throws ParseException if the JNLP file was invalid
+     */
+    public JNLPFile(URL location, String cookieStr) throws IOException, ParseException {
+        this(location, cookieStr, false); // not strict
+    }
+
+    /**
+     * Create a JNLPFile from a URL checking for updates using the
+     * default policy.
+     *
+     * @param location the location of the JNLP file
+     * @param strict whether to enforce the spec when 
+     * @throws IOException if an IO exception occurred
+     * @throws ParseException if the JNLP file was invalid
+     */
+    public JNLPFile(URL location, String cookieStr, boolean strict) throws IOException, ParseException {
+        this(location, cookieStr, strict, JNLPRuntime.getDefaultUpdatePolicy());
+    }
+
+    /**
+     * Create a JNLPFile from a URL checking for updates using the
+     * specified policy.
+     *
+     * @param location the location of the JNLP file
+     * @param strict whether to enforce the spec when 
+     * @param policy the update policy
+     * @throws IOException if an IO exception occurred
+     * @throws ParseException if the JNLP file was invalid
+     */
+    public JNLPFile(URL location, String cookieStr, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
+        Node root = Parser.getRootNode(openURL(location, cookieStr, policy));
+        parse(root, strict, location);
+
+        this.fileLocation = location;
+        this.cookieStr = cookieStr;
+    }
+
+    /**
+     * Create a JNLPFile from an input stream.
+     *
+     * @throws IOException if an IO exception occurred
+     * @throws ParseException if the JNLP file was invalid
+     */
+    public JNLPFile(InputStream input, boolean strict) throws ParseException {
+        parse(Parser.getRootNode(input), strict, null);
+    }
+
+    /**
+     * Create a JNLPFile from a character stream.
+     *
+     * @param input the stream
+     * @param strict whether to enforce the spec when 
+     * @throws IOException if an IO exception occurred
+     * @throws ParseException if the JNLP file was invalid
+     */
+    private JNLPFile(Reader input, boolean strict) throws ParseException {
+        // todo: now that we are using NanoXML we can use a Reader
+        //parse(Parser.getRootNode(input), strict, null);
+    }
+
+
+    /**
+     * Open the jnlp file URL from the cache if there, otherwise
+     * download to the cache.  Called from constructor.
+     */
+    private static InputStream openURL(URL location, String cookieStr, UpdatePolicy policy) throws IOException {
+        if (location == null || policy == null)
+            throw new IllegalArgumentException(R("NullParameter"));
+
+        try {
+            ResourceTracker tracker = new ResourceTracker(false); // no prefetch
+            tracker.addResource(location, cookieStr, null/*version*/, policy);
+
+            return tracker.getInputStream(location);
+        }
+        catch (Exception ex) {
+            throw new IOException(ex.getMessage());
+        }
+    }
+
+    /**
+     * Returns the JNLP specification versions supported.
+     */
+    public static Version getSupportedVersions() {
+        return Parser.getSupportedVersions();
+    }
+
+    /**
+     * Returns the JNLP file's title.  This method returns the same
+     * value as InformationDesc.getTitle().
+     */
+    public String getTitle() {
+        return getInformation().getTitle();
+    }
+
+    /**
+     * Returns the JNLP file's network location as specified in the
+     * JNLP file.
+     */
+    public URL getSourceLocation() {
+        return sourceLocation;
+    }
+
+    /**
+     * Returns the location of the file parsed to create the JNLP
+     * file, or null if it was not created from a URL.
+     */
+    public URL getFileLocation() {
+        return fileLocation;
+    }
+
+    /**
+     * Returns the JNLP file's version.
+     */
+    public Version getFileVersion() {
+        return fileVersion;
+    }
+
+    /**
+     * Returns the specification version required by the file.
+     */
+    public Version getSpecVersion() {
+        return specVersion;
+    }
+
+    /**
+     * Returns the codebase URL for the JNLP file.
+     */
+    public URL getCodeBase() {
+        return codeBase;
+    }
+
+    /**
+     * Returns the cookie string that will be send when resources for this file are requested 
+     */
+    public String getCookieStr() {
+        return cookieStr;
+    }
+    
+    /**
+     * Returns the information section of the JNLP file as viewed
+     * through the default locale.
+     */
+    public InformationDesc getInformation() {
+        return getInformation(defaultLocale);
+    }
+
+    /**
+     * Returns the information section of the JNLP file as viewed
+     * through the specified locale.
+     */
+    public InformationDesc getInformation(final Locale locale) {
+        return new InformationDesc(this, new Locale[] {locale}) {
+            protected List getItems(Object key) {
+                List result = new ArrayList();
+
+                for (int i=0; i < info.size(); i++) {
+                    InformationDesc infoDesc = (InformationDesc) info.get(i);
+
+                    if (localMatches(locale, infoDesc.getLocales()))
+                        if (localMatches(locale, infoDesc.getLocales()))
+                            result.addAll(infoDesc.getItems(key) );
+                }
+
+                return result;
+            }
+        };
+    }
+
+    /**
+     * Returns the security section of the JNLP file.
+     */
+    public SecurityDesc getSecurity() {
+        return security;
+    }
+
+    /**
+     * Returns the resources section of the JNLP file as viewed
+     * through the default locale and the os.name and os.arch
+     * properties.
+     */
+    public ResourcesDesc getResources() {
+        return getResources(defaultLocale, defaultOS, defaultArch);
+    }
+
+    /**
+     * Returns the information section of the JNLP file for the
+     * specified locale, os, and arch.
+     */
+    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}) {
+            public List getResources(Class launchType) {
+                List result = new ArrayList();
+
+                for (int i=0; i < resources.size(); i++) {
+                    ResourcesDesc rescDesc = (ResourcesDesc) resources.get(i);
+
+                    if (localMatches(locale, rescDesc.getLocales())
+                        && stringMatches(os, rescDesc.getOS())
+                        && stringMatches(arch, rescDesc.getArch()))
+                        result.addAll(rescDesc.getResources(launchType) );
+                }
+
+                result.addAll(sharedResources.getResources(launchType));
+
+                return result;
+            }
+
+            public void addResource(Object resource) {
+                // todo: honor the current locale, os, arch values
+                sharedResources.addResource(resource);
+            }
+        };
+    }
+
+    /**
+     * Returns an object of one of the following types: AppletDesc,
+     * ApplicationDesc, InstallerDesc, and ComponentDesc.
+     */
+    public Object getLaunchInfo() {
+        return launchType;
+    }
+
+    /**
+     * Returns the launch information for an applet.
+     *
+     * @throws UnsupportedOperationException if there is no applet information
+     */
+    public AppletDesc getApplet() {
+        if (!isApplet())
+            throw new UnsupportedOperationException(R("JNotApplet"));
+
+        return (AppletDesc) launchType;
+    }
+
+    /**
+     * Returns the launch information for an application.
+     *
+     * @throws UnsupportedOperationException if there is no application information
+     */
+    public ApplicationDesc getApplication() {
+        if (!isApplication())
+            throw new UnsupportedOperationException(R("JNotApplication"));
+
+        return (ApplicationDesc) launchType;
+    }
+
+    /**
+     * Returns the launch information for a component.
+     *
+     * @throws UnsupportedOperationException if there is no component information
+     */
+    public ComponentDesc getComponent() {
+        if (!isComponent())
+            throw new UnsupportedOperationException(R("JNotComponent"));
+
+        return (ComponentDesc) launchType;
+    }
+
+    /**
+     * Returns the launch information for an installer.
+     *
+     * @throws UnsupportedOperationException if there is no installer information
+     */
+    public InstallerDesc getInstaller() {
+        if (!isInstaller())
+            throw new UnsupportedOperationException(R("NotInstaller"));
+
+        return (InstallerDesc) launchType;
+    }
+
+    /** 
+     * Returns whether the lauch descriptor describes an Applet.
+     */
+    public boolean isApplet() {
+        return launchType instanceof AppletDesc;
+    }
+
+    /** 
+     * Returns whether the lauch descriptor describes an Application.
+     */
+    public boolean isApplication() {
+        return launchType instanceof ApplicationDesc;
+    }
+
+    /** 
+     * Returns whether the lauch descriptor describes a Component.
+     */
+    public boolean isComponent() {
+        return launchType instanceof ComponentDesc;
+    }
+
+    /** 
+     * Returns whether the lauch descriptor describes an Installer.
+     */
+    public boolean isInstaller() {
+        return launchType instanceof InstallerDesc;
+    }
+
+    /**
+     * Sets the default view of the JNLP file returned by
+     * getInformation, getResources, etc.  If unset, the defaults
+     * are the properties os.name, os.arch, and the locale returned
+     * by Locale.getDefault().
+     */
+    public void setDefaults(String os, String arch, Locale locale) {
+        defaultOS = os;
+        defaultArch = arch;
+        defaultLocale = locale;
+    }
+
+
+    /**
+     * Returns whether a locale is matched by one of more other
+     * locales.  Only the non-empty language, country, and variant
+     * codes are compared; for example, a requested locale of
+     * Locale("","","") would always return true.
+     *
+     * @param requested the local
+     * @param available the available locales
+     * @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;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns whether the string is a prefix for any of the strings
+     * in the specified array.
+     *
+     * @param prefixStr the prefix string
+     * @param available the strings to test
+     * @return true if prefixStr is a prefix of any strings in
+     * available, or if available is empty or null.
+     */
+    private boolean stringMatches(String prefixStr, String available[]) {
+        if (available == null || available.length == 0)
+            return true;
+
+        for (int i=0; i < available.length; i++)
+            if (available[i] != null && available[i].startsWith(prefixStr))
+                return true;
+
+        return false;
+    }
+
+    /**
+     * Initialize the JNLPFile fields. Private because it's called
+     * from the constructor.
+     *
+     * @param root the root node
+     * @param strict whether to enforce the spec when 
+     * @param location the file location or null
+     */
+    private void parse(Node root, boolean strict, URL location) throws ParseException {
+        try {
+            //if (location != null)
+            //  location = new URL(location, "."); // remove filename
+
+            Parser parser = new Parser(this, location, root, strict, true); // true == allow extensions
+
+            // JNLP tag information
+            specVersion = parser.getSpecVersion();
+            fileVersion = parser.getFileVersion();
+            codeBase = parser.getCodeBase();
+            sourceLocation = parser.getFileLocation();
+
+            info = parser.getInfo(root);
+            resources = parser.getResources(root, false); // false == not a j2se resources section
+            launchType = parser.getLauncher(root);
+            security = parser.getSecurity(root);
+        }
+        catch (ParseException ex) {
+            throw ex;
+        }
+        catch (Exception ex) {
+            if (JNLPRuntime.isDebug())
+                ex.printStackTrace();
+
+            throw new RuntimeException(ex.toString());
+        }
+    }
+
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,93 @@
+package net.sourceforge.jnlp;
+
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.Toolkit;
+import java.io.IOException;
+import java.net.URL;
+
+import javax.imageio.ImageIO;
+import javax.swing.JFrame;
+
+import net.sourceforge.jnlp.cache.ResourceTracker;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+public class JNLPSplashScreen extends JFrame {
+
+    String applicationTitle;
+    String applicationVendor;
+
+    ResourceTracker resourceTracker;
+
+    URL splashImageUrl;
+    Image splashImage;
+
+    public JNLPSplashScreen(ResourceTracker resourceTracker,
+            String applicationTitle, String applicationVendor) {
+
+        // If the JNLP file does not contain any icon images, the splash image
+        // will consist of the application's title and vendor, as taken from the
+        // JNLP file.
+
+        this.resourceTracker = resourceTracker;
+        this.applicationTitle = applicationTitle;
+        this.applicationVendor = applicationVendor;
+
+    }
+
+    public void setSplashImageURL(URL url) {
+        splashImageUrl = url;
+        splashImage = null;
+        try {
+            splashImage = ImageIO.read(resourceTracker
+                    .getCacheFile(splashImageUrl));
+        } catch (IOException e) {
+            if (JNLPRuntime.isDebug()) {
+                System.err.println("Error loading splash image: " + url);
+            }
+            splashImage = null;
+            return;
+        } catch (IllegalArgumentException argumentException) {
+            if (JNLPRuntime.isDebug()) {
+                System.err.println("Error loading splash image: " + url);
+            }
+            splashImage = null;
+            return;
+        }
+
+        correctSize();
+    }
+
+    public boolean isSplashScreenValid() {
+        return (splashImage != null);
+    }
+    
+    private void correctSize() {
+
+        Insets insets = getInsets();
+        int minimumWidth = splashImage.getWidth(null) + insets.left
+                + insets.right;
+        int minimumHeight = splashImage.getHeight(null) + insets.top
+                + insets.bottom;
+        setMinimumSize(new Dimension(minimumWidth, minimumHeight));
+
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        setLocation((screenSize.width - minimumWidth) / 2,
+                (screenSize.height - minimumHeight) / 2);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        if (splashImage == null) {
+            return;
+        }
+
+        correctSize();
+        Graphics2D g2 = (Graphics2D) g;
+        g2.drawImage(splashImage, getInsets().left, getInsets().top, null);
+
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/JREDesc.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,123 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+package net.sourceforge.jnlp;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * The J2SE element.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.5 $
+ */
+public class JREDesc {
+
+    /** the platform version or the product version if location is not null */
+    private Version version;
+
+    /** the location of a JRE product or null */
+    private URL location;
+
+    /** inital heap size */
+    private long initialHeapSize;
+
+    /** maximum head size */
+    private long maximumHeapSize;
+
+    /** list of ResourceDesc objects */
+    private List resources;
+
+
+    /**
+     * Create a JRE descriptor.
+     *
+     * @param version the platform version or the product version
+     * if location is not null
+     * @param location the location of a JRE product or null
+     * @param initialHeapSize inital heap size
+     * @param maximumHeadSize maximum head size
+     * @param resources list of ResourceDesc objects
+     */
+    public JREDesc(Version version, URL location, String initialHeapSize, String maximumHeapSize, List resources) {
+        this.version = version;
+        this.location = location;
+        this.initialHeapSize = heapToLong(initialHeapSize);
+        this.maximumHeapSize = heapToLong(maximumHeapSize);
+        this.resources = resources;
+    }
+
+    /**
+     * Returns the JRE version.  Use isPlatformVersion to
+     * determine if this version corresponds to a platform or
+     * product version.
+     */
+    public Version getVersion() {
+        return version;
+    }
+
+    /**
+     * Returns true if the JRE version is a Java platform version
+     * (java.specification.version property) or false if it is a
+     * product version (java.version property).
+     */
+    public boolean isPlatformVersion() {
+        return getLocation() == null;
+    }
+
+    /**
+     * Returns the JRE version string.
+     */
+    public URL getLocation() {
+        return location;
+    }
+
+    /**
+     * Returns the maximum heap size in bytes.
+     */
+    public long getMaximumHeapSize() {
+        return maximumHeapSize;
+    }
+
+    /**
+     * Returns the initial heap size in bytes.
+     */
+    public long getInitialHeapSize() {
+        return initialHeapSize;
+    }
+
+    /**
+     * Returns the resources defined for this JRE.
+     */
+    public List getResourcesDesc() {
+        return resources;
+    }
+
+    /**
+     * Convert a heap size description string to a long value
+     * indicating the heap min/max size.
+     */
+    static private long heapToLong(String heapSize) {
+        // need to implement for completeness even though not used in netx
+        return -1;
+    }
+
+}
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/LaunchException.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,190 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+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
+ * be created.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.9 $
+ */
+public class LaunchException extends Exception {
+
+    /** the original exception */
+    private Throwable cause = null;
+
+    /** the file being launched */
+    private JNLPFile file;
+
+    /** the category of the exception */
+    private String category;
+
+    /** summary */
+    private String summary;
+
+    /** description of the action that was taking place */
+    private String description;
+
+    /** severity of the warning/error */
+    private String severity;
+
+
+    /**
+     * Creates a LaunchException without detail message.
+     */
+    public LaunchException(JNLPFile file, Exception cause, String severity, String category, String summary, String description) {
+        super(severity + ": " + category  + ": "+ summary);
+
+        this.file = file;
+        this.category = category;
+        this.summary = summary;
+        this.description = description;
+        this.severity = severity;
+
+        // replace with setCause when no longer 1.3 compatible
+        this.cause = cause;
+    }
+
+    /**
+     * Creates a LaunchException with a cause. 
+     */
+    public LaunchException(Throwable cause) {
+        this(cause.getMessage());
+
+        // replace with setCause when no longer 1.3 compatible
+        this.cause = cause;
+    }
+
+    /**
+     * Creates a LaunchException with a cause and detail message
+     */
+    public LaunchException(String message, Throwable cause) {
+        this(message+": "+cause.getMessage());
+
+        // replace with setCause when no longer 1.3 compatible
+        this.cause = cause;
+    }
+
+    /**
+     * Constructs a LaunchException with the specified detail
+     * message.
+     * 
+     * @param message the detail message
+     */
+    public LaunchException(String message) {
+        super(message);
+    }
+
+    /**
+     * Returns the JNLPFile being launched.
+     */
+    public JNLPFile getFile() {
+        return file;
+    }
+
+    /**
+     * Returns the category string, a short description of the
+     * exception suitable for displaying in a window title.
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     * Returns a one-sentence summary of the problem.
+     */
+    public String getSummary() {
+        return summary;
+    }
+
+    /**
+     * Return a description of the exception and the action being
+     * performed when the exception occurred.
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Returns a short description of the severity of the problem.
+     */
+    public String getSeverity() {
+        return severity;
+    }
+
+    /**
+     * 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 result = new ArrayList();
+
+        Reflect r = new Reflect();
+        Throwable cause = this.cause;
+
+        while (cause != null) {
+            result.add(cause);
+            cause = (Throwable) r.invoke(cause, "getCause");
+        }
+
+        return (Throwable[]) 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);
+        }
+    }
+
+}
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/LaunchHandler.java	Thu May 28 10:18:19 2009 +0100
@@ -0,0 +1,68 @@
+// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+// 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+// 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+package net.sourceforge.jnlp;
+
+import net.sourceforge.jnlp.runtime.*;
+
+/**
+ * This optional interface is used to handle conditions that occur
+ * while launching JNLP applications, applets, and installers.
+ *
+ * @author <a href="mailto:jmaxwell@users.sourceforge.net">Jon A. Maxwell (JAM)</a> - initial author
+ * @version $Revision: 1.9 $
+ */
+public interface LaunchHandler {
+
+    /**
+     * Called when the application could not be launched due to a
+     * fatal error, such as the inability to find the main class or
+     * non-parseable XML.
+     */
+    public void launchError(LaunchException exception);
+
+    /**
+     * Called when launching the application can not be launched due
+     * to an error that is not fatal.  For example a JNLP file that
+     * is not strictly correct yet does not necessarily prohibit the
+     * system from attempting to launch the application.
+     *
+     * @return true if the launch should continue, false to abort
+     */
+    public boolean launchWarning(LaunchException warning);
+
+    /**
+     * Called when a security validation error occurs while
+     * launching the application.
+     *
+     * @return true to allow the application to continue, false to stop it.
+     */
+    public boolean validationError(LaunchException security);
+    // this method will probably be replaced when real security
+    // controller is in place.
+
+    /**
+     * Called when an application, applet, or installer has been
+     * launched successfully (the main method or applet start method
+     * returned normally).
+     *
+     * @param application the launched application instance
+     */
+    public void launchCompleted(ApplicationInstance application); 
+
+}
+
+