19 files changed, 1083 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b340cd..167636c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,72 @@
 	(unreference, getObject, getIdentifier, contains(Object),
 	contains(int)): Synchronized.
 
+2011-03-31  Omair Majid  <omajid@redhat.com>
+
+	Add unit tests for the parser
+	* Makefile.am: Add TESTS_DIR,TESTS_SRCDIR, NETX_UNIT_TEST_DIR,
+	and NETX_UNIT_TEST_SRCDIR, JUNIT_RUNNER_DIR, JUNIT_RUNNER_SRCDIR, and
+	JUNIT_RUNNER_JAR. Conditionally define RHINO_TESTS and UNIT_TESTS.
+	(clean-local): Use RHINO_TESTS and UNIT_TESTS.
+	(clean-tests): Depend on clean-netx-tests. Delete directory.
+	(junit-runner-source-files.txt, $(JUNIT_RUNNER_JAR)),
+	(next-unit-tests-sources-files.txt stamps/netx-unit-tests-compile.stamp),
+	(run-netx-unit-tests, clean-netx-tests, clean-junit-runner)
+	(clean-netx-unit-tests): New targets.
+	* configure.ac: Add new optional dependency on junit.
+	* tests/junit-runner/CommandLine.java,
+	* tests/junit-runner/LessVerboseTextListener.java,
+	* tests/junit-runner/README,
+	* tests/netx/unit/net/sourceforge/jnlp/ParserBasicTests.java,
+	* tests/netx/unit/net/sourceforge/jnlp/ParserCornerCaseTests.java,
+	* tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXmlTests.java,
+	* tests/netx/unit/net/sourceforge/jnlp/basic.jnlp: New files.
+
+2011-03-30  Omair Majid  <omajid@redhat.com>
+
+	* Makefile.am: Fix comment explaining reasons for setting
+	JDK_UPDATE_VERSION.
+
+2011-03-30  Omair Majid  <omajid@redhat.com>
+
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: Fix typo in
+	RCantRename.
+
+2011-03-30  Omair Majid  <omajid@redhat.com>
+
+	* Makefile.am: Document reason for using bootclasspath.
+
+2011-03-30  Omair Majid  <omajid@redhat.com>
+
+	* netx/javaws.1: Fix FILES section to point to
+	~/.icedtea/deployment.properties.
+
+2011-03-30  Omair Majid  <omajid@redhat.com>
+
+	* netx/net/sourceforge/jnlp/LaunchHandler.java
+	(launchInitialized, launchStarting): New methods.
+	* netx/net/sourceforge/jnlp/DefaultLaunchHandler.java
+	(launchInitialized, launchStarting): New methods. No-op
+	implementation.
+	(printMessage): Make it static.
+	* netx/net/sourceforge/jnlp/GuiLaunchHandler.java: New file.
+	(launchCompleted, launchError, launchStarting, launchInitialized),
+	(launchWarning, validationError): New methods.
+	* netx/net/sourceforge/jnlp/Launcher.java (launchApplication):
+	Invoke handler.launchInitialized and handler.launchStarting instead
+	of showing a splash screen directly.
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: Add
+	ButShowDetails, ButHideDetails and Error.
+	* netx/net/sourceforge/jnlp/runtime/Boot.java (run): Do not exit on
+	error.
+	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+	(initialize): Set handler to GuiLaunchHandler if not running in
+	headless mode.
+	* netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java: New
+	file.
+	(exceptionToString, show): New methods.
+
+>>>>>>> /tmp/ChangeLog~other.ZwCGJe
 2011-03-29  Denis Lila <dlila@redhat.com>
 
 	* netx/net/sourceforge/jnlp/JNLPFile.java
diff --git a/Makefile.am b/Makefile.am
index af348b7..d8bc112 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,17 @@ NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
 NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
 NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
 
+TESTS_SRCDIR=$(abs_top_srcdir)/tests
+TESTS_DIR=$(abs_top_builddir)/tests.build
+
+NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
+NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
+
+JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
+JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
+
+JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
+
 # Build directories
 
 BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
@@ -25,12 +36,19 @@ IT_LANGUAGE_SOURCE_VERSION=6
 IT_CLASS_TARGET_VERSION=6
 IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
 
+#
+# We need the jars in bootclasspath for a couple of reasons
+#  - we use classes (in the sun.applet package) loaded by the bootclassloader
+#    using another classloader to load classes from the same package causes an
+#    IllegalAccessException
+#  - we want full privileges
+#
 JRE='"$(SYSTEM_JDK_DIR)/jre"'
 LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
 PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
 
-# Fake update version to shut up the plugin detector hosted by Oracle.
-# If Oracle ever release a JDK update greater than 50, this needs to be increased.
+# Fake update version to work with the Deployment Toolkit script used by Oracle
+# http://download.oracle.com/javase/tutorial/deployment/deploymentInDepth/depltoolkit_index.html
 JDK_UPDATE_VERSION=50
 
 # Sources list
@@ -73,6 +91,19 @@ JAVADOC_MEM_OPTS=-J-Xmx1024m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160
 endif
 endif
 
+if WITH_RHINO
+  RHINO_TESTS=check-pac-functions
+else
+  RHINO_TESTS=
+endif
+
+if WITH_JUNIT
+  JUNIT_TESTS=run-netx-unit-tests
+else
+  JUNIT_TESTS=
+endif
+
+
 PLUGIN_VERSION = IcedTea-Web $(FULL_VERSION)
 
 EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
@@ -92,7 +123,7 @@ edit_launcher_script = sed \
 all-local: stamps/netx-dist.stamp extra-lib/about.jar stamps/plugin.stamp launcher.build/javaws \
  javaws.desktop stamps/docs.stamp launcher.build/itweb-settings itweb-settings.desktop
 
-check-local: check-pac-functions
+check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
 
 clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstrap-directory \
  clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-tests
@@ -102,7 +133,8 @@ clean-local: clean-netx clean-plugin clean-liveconnect clean-extra clean-bootstr
 
 .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
  clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs \
- clean-tests check-local clean-launchers
+ clean-tests check-local clean-launchers check-pac-functions run-netx-unit-tests clean-netx-tests \
+ clean-junit-runner clean-netx-unit-tests
 
 install-exec-local:
 	${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir)
@@ -390,11 +422,67 @@ clean-plugin-docs:
 # check
 # ==========================
 
+clean-tests: clean-netx-tests
+	if [ -e $(TESTS_DIR) ]; then \
+		rmdir $(TESTS_DIR) ; \
+	fi
+
 check-pac-functions: stamps/bootstrap-directory.stamp
 	./jrunscript $(abs_top_srcdir)/tests/netx/pac/pac-funcs-test.js \
 	  $$(readlink -f $(abs_top_srcdir)/netx/net/sourceforge/jnlp/runtime/pac-funcs.js)
 
-clean-tests:
+junit-runner-source-files.txt:
+	find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@
+
+$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt
+	mkdir -p $(JUNIT_RUNNER_DIR) && \
+	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+	  -d $(JUNIT_RUNNER_DIR) \
+	  -classpath $(JUNIT_JAR) \
+	  @junit-runner-source-files.txt && \
+	$(BOOT_DIR)/bin/jar cf $@  -C $(JUNIT_RUNNER_DIR) .
+
+netx-unit-tests-source-files.txt:
+	find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort > $@
+
+stamps/netx-unit-tests-compile.stamp: stamps/netx.stamp \
+ netx-unit-tests-source-files.txt
+	mkdir -p $(NETX_UNIT_TEST_DIR) && \
+	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+	 -d $(NETX_UNIT_TEST_DIR) \
+	 -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar \
+	 @netx-unit-tests-source-files.txt && \
+	mkdir -p stamps && \
+	touch $@
+
+run-netx-unit-tests: stamps/netx-unit-tests-compile.stamp \
+ $(JUNIT_RUNNER_JAR)
+	cp {$(NETX_UNIT_TEST_SRCDIR),$(NETX_UNIT_TEST_DIR)}/net/sourceforge/jnlp/basic.jnlp
+	cd $(NETX_UNIT_TEST_DIR) ; \
+	class_names= ; \
+	for test in `find -type f` ; do \
+	  class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
+	  class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
+	  class_names="$$class_names $$class_name" ; \
+	done ; \
+	echo $$class_names ; \
+	CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \
+	  $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
+
+clean-netx-tests: clean-netx-unit-tests clean-junit-runner
+	if [ -e $(TESTS_DIR)/netx ]; then \
+	  rmdir $(TESTS_DIR)/netx ; \
+	fi
+
+clean-junit-runner:
+	rm -f junit-runner-source-files.txt
+	rm -rf $(JUNIT_RUNNER_DIR)
+	rm -f $(JUNIT_RUNNER_JAR)
+
+clean-netx-unit-tests:
+	rm -f netx-unit-tests-source-files.txt
+	rm -rf $(NETX_UNIT_TEST_DIR)
+	rm -f stamps/netx-unit-tests-compile.stamp
 
 # plugin tests
 
diff --git a/configure.ac b/configure.ac
index 850b293..a0950e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,8 @@ IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
 
 IT_FIND_OPTIONAL_JAR([rhino], RHINO,
     [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar])
+IT_FIND_OPTIONAL_JAR([junit], JUNIT,
+    [/usr/share/java/junit4.jar])
 
 AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript])
 AC_CONFIG_FILES([build.properties])
diff --git a/netx/javaws.1 b/netx/javaws.1
index dcda508..5070d60 100644
--- a/netx/javaws.1
+++ b/netx/javaws.1
@@ -101,7 +101,7 @@ of 80m, use -J-Xmx80m.
 Print a help message and exit.
 
 .SH FILES
-~/.netxrc specifies the location of the base directory
+~/.icedtea/deployment.properties specifies the settings used by javaws
 
 .SH BUGS
 There arent any known bugs. If you come across one, please file it at
diff --git a/netx/net/sourceforge/jnlp/DefaultLaunchHandler.java b/netx/net/sourceforge/jnlp/DefaultLaunchHandler.java
index 29faba4..d52681f 100644
--- a/netx/net/sourceforge/jnlp/DefaultLaunchHandler.java
+++ b/netx/net/sourceforge/jnlp/DefaultLaunchHandler.java
@@ -76,7 +76,7 @@ public class DefaultLaunchHandler implements LaunchHandler {
     /**
      * Print a message to stdout.
      */
-    protected void printMessage(LaunchException ex) {
+    protected static void printMessage(LaunchException ex) {
         StringBuffer result = new StringBuffer();
         result.append("netx: ");
         result.append(ex.getCategory());
@@ -103,4 +103,20 @@ public class DefaultLaunchHandler implements LaunchHandler {
         }
     }
 
+    /**
+     * Do nothing on when initializing
+     */
+    @Override
+    public void launchInitialized(JNLPFile file) {
+        // do nothing
+    }
+
+    /**
+     * Do nothing when starting
+     */
+    @Override
+    public void launchStarting(ApplicationInstance application) {
+        // do nothing
+    }
+
 }
diff --git a/netx/net/sourceforge/jnlp/GuiLaunchHandler.java b/netx/net/sourceforge/jnlp/GuiLaunchHandler.java
new file mode 100644
index 0000000..28a2013
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/GuiLaunchHandler.java
@@ -0,0 +1,123 @@
+/* GuiLaunchHandler.java
+   Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package net.sourceforge.jnlp;
+
+import java.net.URL;
+
+import javax.swing.SwingUtilities;
+
+import net.sourceforge.jnlp.cache.ResourceTracker;
+import net.sourceforge.jnlp.cache.UpdatePolicy;
+import net.sourceforge.jnlp.runtime.ApplicationInstance;
+import net.sourceforge.jnlp.util.BasicExceptionDialog;
+
+/**
+ * A {@link LaunchHandler} that gives feedback to the user using GUI elements
+ * including splash screens and exception dialogs.
+ */
+public class GuiLaunchHandler implements LaunchHandler {
+
+    private JNLPSplashScreen splashScreen = null;
+    private UpdatePolicy policy = UpdatePolicy.ALWAYS;
+
+    @Override
+    public void launchCompleted(ApplicationInstance application) {
+        // do nothing
+    }
+
+    @Override
+    public void launchError(final LaunchException exception) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                BasicExceptionDialog.show(exception);
+            }
+        });
+    }
+
+    @Override
+    public void launchStarting(ApplicationInstance application) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                if (splashScreen != null) {
+                    if (splashScreen.isSplashScreenValid()) {
+                        splashScreen.setVisible(false);
+                    }
+                    splashScreen.dispose();
+                }
+            }
+        });
+    }
+
+    @Override
+    public void launchInitialized(final JNLPFile file) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                final int preferredWidth = 500;
+                final int preferredHeight = 400;
+
+                URL splashImageURL = file.getInformation().getIconLocation(
+                        IconDesc.SPLASH, preferredWidth, preferredHeight);
+                if (splashImageURL != null) {
+                    ResourceTracker resourceTracker = new ResourceTracker(true);
+                    resourceTracker.addResource(splashImageURL, file.getFileVersion(), null, policy);
+                    splashScreen = new JNLPSplashScreen(resourceTracker, null, null);
+                    splashScreen.setSplashImageURL(splashImageURL);
+                    if (splashScreen.isSplashScreenValid()) {
+                        splashScreen.setVisible(true);
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    public boolean launchWarning(LaunchException warning) {
+        DefaultLaunchHandler.printMessage(warning);
+        return true;
+    }
+
+    @Override
+    public boolean validationError(LaunchException security) {
+        DefaultLaunchHandler.printMessage(security);
+        return true;
+    }
+
+}
diff --git a/netx/net/sourceforge/jnlp/LaunchHandler.java b/netx/net/sourceforge/jnlp/LaunchHandler.java
index a0b106b..f12dcf6 100644
--- a/netx/net/sourceforge/jnlp/LaunchHandler.java
+++ b/netx/net/sourceforge/jnlp/LaunchHandler.java
@@ -56,6 +56,24 @@ public interface LaunchHandler {
     // controller is in place.
 
     /**
+     * Called when an application, applet or installer has been determined.
+     * We have some very basic information about the application at this point,
+     * but do not have everything required. This is a nice point to show the
+     * splash screen.
+     *
+     * @param application the application instance that is starting
+     */
+    public void launchInitialized(JNLPFile file);
+
+    /**
+     * Called when an application, applet or installer is ready to start.
+     * Good point to hide the splash screen.
+     *
+     * @param application the application instance that is ready
+     */
+    public void launchStarting(ApplicationInstance application);
+
+    /**
      * Called when an application, applet, or installer has been
      * launched successfully (the main method or applet start method
      * returned normally).
diff --git a/netx/net/sourceforge/jnlp/Launcher.java b/netx/net/sourceforge/jnlp/Launcher.java
index 531e282..ea0afc4 100644
--- a/netx/net/sourceforge/jnlp/Launcher.java
+++ b/netx/net/sourceforge/jnlp/Launcher.java
@@ -396,20 +396,7 @@ public class Launcher {
                 return null;
             }
 
-            final int preferredWidth = 500;
-            final int preferredHeight = 400;
-            JNLPSplashScreen splashScreen = null;
-            URL splashImageURL = file.getInformation().getIconLocation(
-                    IconDesc.SPLASH, preferredWidth, preferredHeight);
-            if (splashImageURL != null) {
-                ResourceTracker resourceTracker = new ResourceTracker(true);
-                resourceTracker.addResource(splashImageURL, file.getFileVersion(), null, updatePolicy);
-                splashScreen = new JNLPSplashScreen(resourceTracker, null, null);
-                splashScreen.setSplashImageURL(splashImageURL);
-                if (splashScreen.isSplashScreenValid()) {
-                    splashScreen.setVisible(true);
-                }
-            }
+            handler.launchInitialized(file);
 
             ApplicationInstance app = createApplication(file);
             app.initialize();
@@ -446,12 +433,7 @@ public class Launcher {
 
             setContextClassLoaderForAllThreads(app.getThreadGroup(), app.getClassLoader());
 
-            if (splashScreen != null) {
-                if (splashScreen.isSplashScreenValid()) {
-                    splashScreen.setVisible(false);
-                }
-                splashScreen.dispose();
-            }
+            handler.launchStarting(app);
 
             main.setAccessible(true);
             main.invoke(null, new Object[] { args });
diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties
index 1f95723..fb273c7 100644
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties
@@ -14,9 +14,13 @@ ButProceed=Proceed
 ButRun=Run
 ButApply=Apply
 ButDone=Done
+ButShowDetails=Show Details
+ButHideDetails=Hide Details
+
 AFileOnTheMachine=a file on the machine
 AlwaysAllowAction=Always allow this action
 Usage=Usage:
+Error=Error
 
 Continue=Do you want to continue?
 Field=Field
@@ -143,7 +147,7 @@ RGetRPermFailed=Acquiring read permissions on file {0} failed
 RGetWPermFailed=Acquiring write permissions on file {0} failed
 RGetXPermFailed=Acquiring execute permissions on file {0} failed
 RCantCreateDir=Cant create directory {0}
-RCantRename=Cant rename {0} to {0}
+RCantRename=Cant rename {0} to {1}
 RDenyStopped=Stopped applications have no permissions.
 RExitNoApp=Can not exit the JVM because the current application cannot be determined.
 RNoLockDir=Unable to create locks directory ({0})
diff --git a/netx/net/sourceforge/jnlp/runtime/Boot.java b/netx/net/sourceforge/jnlp/runtime/Boot.java
index 1db5296..e86644c 100644
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java
@@ -190,7 +190,7 @@ public final class Boot implements PrivilegedAction<Void> {
         }
 
         try {
-            new Launcher().launch(getFile());
+            new Launcher(false).launch(getFile());
         } catch (LaunchException ex) {
             // default handler prints this
         } catch (Exception ex) {
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
index f48d3ad..75b9ec5 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
@@ -187,8 +187,13 @@ public class JNLPRuntime {
         if (!headless && indicator == null)
             indicator = new DefaultDownloadIndicator();
 
-        if (handler == null)
-            handler = new DefaultLaunchHandler();
+        if (handler == null) {
+            if (headless) {
+                handler = new DefaultLaunchHandler();
+            } else {
+                handler = new GuiLaunchHandler();
+            }
+        }
 
         ServiceManager.setServiceManagerStub(new XServiceManagerStub()); // ignored if we're running under Web Start
 
diff --git a/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java b/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java
new file mode 100644
index 0000000..bf3d250
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/util/BasicExceptionDialog.java
@@ -0,0 +1,129 @@
+/* BasicExceptionDialog.java
+   Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package net.sourceforge.jnlp.util;
+
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+/**
+ * A dialog that displays some basic information about an exception
+ */
+public class BasicExceptionDialog {
+
+    private static String exceptionToString(Exception exception) {
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter);
+        exception.printStackTrace(printWriter);
+        return stringWriter.toString();
+    }
+
+    /**
+     * Must be invoked from the Swing EDT.
+     *
+     * @param exception the exception to indicate
+     */
+    public static void show(Exception exception) {
+        String detailsText = exceptionToString(exception);
+
+        final JPanel mainPanel = new JPanel(new BorderLayout());
+        mainPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+
+        JOptionPane optionPane = new JOptionPane(mainPanel, JOptionPane.ERROR_MESSAGE);
+        final JDialog errorDialog = optionPane.createDialog(R("Error"));
+
+        final JPanel quickInfoPanel = new JPanel();
+        BoxLayout layout = new BoxLayout(quickInfoPanel, BoxLayout.Y_AXIS);
+        quickInfoPanel.setLayout(layout);
+        mainPanel.add(quickInfoPanel, BorderLayout.PAGE_START);
+
+        JLabel errorLabel = new JLabel(exception.getMessage());
+        errorLabel.setAlignmentY(JComponent.LEFT_ALIGNMENT);
+        quickInfoPanel.add(errorLabel);
+
+        final JButton viewDetails = new JButton(R("ButShowDetails"));
+        viewDetails.setAlignmentY(JComponent.LEFT_ALIGNMENT);
+        viewDetails.setActionCommand("show");
+        quickInfoPanel.add(viewDetails);
+
+        JTextArea textArea = new JTextArea();
+        textArea.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+        textArea.setEditable(false);
+        textArea.setText(detailsText);
+        final JScrollPane scrollPane = new JScrollPane(textArea);
+        scrollPane.setPreferredSize(new Dimension(100, 200));
+
+        viewDetails.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (viewDetails.getActionCommand().equals("show")) {
+                    mainPanel.add(scrollPane, BorderLayout.CENTER);
+                    viewDetails.setActionCommand("hide");
+                    viewDetails.setText(R("ButHideDetails"));
+                    errorDialog.pack();
+                } else {
+                    mainPanel.remove(scrollPane);
+                    viewDetails.setActionCommand("show");
+                    viewDetails.setText(R("ButShowDetails"));
+                    errorDialog.pack();
+                }
+            }
+        });
+
+        errorDialog.pack();
+        errorDialog.setResizable(true);
+        errorDialog.setVisible(true);
+        errorDialog.dispose();
+    }
+}
diff --git a/tests/junit-runner/CommandLine.java b/tests/junit-runner/CommandLine.java
new file mode 100644
index 0000000..96ddc24
--- /dev/null
+++ b/tests/junit-runner/CommandLine.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2011 Red Hat, Inc.
+ * Based on code from JUnit
+ *
+ * This file is made available under the terms of the Common Public License
+ * v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.internal.JUnitSystem;
+import org.junit.internal.RealSystem;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+public class CommandLine extends JUnitCore {
+
+    public static void main(String... args) {
+        runMainAndExit(new RealSystem(), args);
+    }
+
+    public static void runMainAndExit(JUnitSystem system, String... args) {
+        new CommandLine().runMain(system, args);
+        system.exit(0);
+    }
+
+    @Override
+    public Result runMain(JUnitSystem system, String... args) {
+        List<Class<?>> classes = new ArrayList<Class<?>>();
+        List<Failure> missingClasses = new ArrayList<Failure>();
+        for (String each : args) {
+            try {
+                classes.add(Class.forName(each));
+            } catch (ClassNotFoundException e) {
+                system.out().println("ERROR: Could not find class: " + each);
+            }
+        }
+        RunListener listener = new LessVerboseTextListener(system);
+        addListener(listener);
+        Result result = run(classes.toArray(new Class[0]));
+        for (Failure each : missingClasses) {
+            result.getFailures().add(each);
+        }
+        return result;
+    }
+
+}
diff --git a/tests/junit-runner/LessVerboseTextListener.java b/tests/junit-runner/LessVerboseTextListener.java
new file mode 100644
index 0000000..0470931
--- /dev/null
+++ b/tests/junit-runner/LessVerboseTextListener.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2011 Red Hat, Inc.
+ *
+ * This file is made available under the terms of the Common Public License
+ * v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ */
+import java.io.PrintStream;
+
+import org.junit.internal.JUnitSystem;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+public class LessVerboseTextListener extends RunListener {
+
+    private PrintStream writer;
+    private boolean testFailed = false;
+
+    public LessVerboseTextListener(JUnitSystem system) {
+        writer= system.out();
+    }
+
+    @Override
+    public void testStarted(Description description) throws Exception {
+        testFailed = false;
+    }
+
+    @Override
+    public void testFailure(Failure failure) {
+        testFailed = true;
+        writer.println("FAILED: " + failure.getTestHeader() + " " + failure.getMessage());
+    }
+
+    @Override
+    public void testFinished(org.junit.runner.Description description) throws Exception {
+        if (!testFailed) {
+            writer.println("Passed: " + description.getClassName() + "." + description.getMethodName());
+        }
+    }
+
+    @Override
+    public void testRunFinished(Result result) throws Exception {
+        int passed = result.getRunCount() - result.getFailureCount() - result.getIgnoreCount();
+        int failed = result.getFailureCount();
+        int ignored = result.getIgnoreCount();
+        writer.println("Test results: passed: " + passed + "; failed: " + failed + "; ignored: " + ignored);
+    }
+
+}
diff --git a/tests/junit-runner/README b/tests/junit-runner/README
new file mode 100644
index 0000000..9c9d40c
--- /dev/null
+++ b/tests/junit-runner/README
@@ -0,0 +1,3 @@
+junit-runner is used to run tests instead of the standard runner
+org.junit.runner.JUnitCore.  It provides output similar to that used by JTreg,
+which is useful for automated comparison.
diff --git a/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java b/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java
new file mode 100644
index 0000000..5fe6764
--- /dev/null
+++ b/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java
@@ -0,0 +1,282 @@
+/* ParserBasic.java
+   Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Test that the parser works with basic jnlp files */
+public class ParserBasic {
+
+    private static Node root;
+    private static Parser parser;
+
+    @BeforeClass
+    public static void setUp() throws ParseException {
+        ClassLoader cl = ParserBasic.class.getClassLoader();
+        if (cl == null) {
+            cl = ClassLoader.getSystemClassLoader();
+        }
+        InputStream jnlpStream = cl.getResourceAsStream("net/sourceforge/jnlp/basic.jnlp");
+        root = Parser.getRootNode(jnlpStream);
+        parser = new Parser(null, null, root, false, false);
+    }
+
+    @Test
+    public void testJNLP() {
+        Assert.assertEquals("1.0", parser.getSpecVersion().toString());
+        Assert.assertEquals("http://localhost/", parser.getCodeBase().toString());
+        Assert.assertEquals("http://localhost/jnlp.jnlp", parser.getFileLocation().toString());
+    }
+
+    @Test
+    public void testInformation() throws ParseException {
+        List<InformationDesc> infos = parser.getInfo(root);
+        Assert.assertNotNull(infos);
+        Assert.assertEquals(1, infos.size());
+        InformationDesc info = infos.get(0);
+        Assert.assertNotNull(info);
+    }
+
+    @Test
+    public void testInformationTitle() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+        Assert.assertEquals("Large JNLP", info.getTitle());
+    }
+
+    @Test
+    public void testInformationVendor() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+        Assert.assertEquals("The IcedTea Project", info.getVendor());
+    }
+
+    @Test
+    public void testInformationHomePage() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+        Assert.assertEquals("http://homepage/", info.getHomepage().toString());
+    }
+
+    @Test
+    public void testInformationDescription() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+        Assert.assertEquals("one-line", info.getDescription("one-line"));
+        Assert.assertEquals("short", info.getDescription("short"));
+        Assert.assertEquals("tooltip", info.getDescription("tooltip"));
+    }
+
+    @Test
+    public void testInformationOfflineAllowed() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+        Assert.assertEquals(true, info.isOfflineAllowed());
+
+    }
+
+    @Test
+    public void testInformationIcon() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+
+        IconDesc[] icons = info.getIcons(IconDesc.DEFAULT);
+        Assert.assertNotNull(icons);
+        Assert.assertEquals(1, icons.length);
+        IconDesc icon = icons[0];
+        Assert.assertNotNull(icon);
+        Assert.assertEquals("http://localhost/icon.png", icon.getLocation().toString());
+        icons = info.getIcons(IconDesc.SPLASH);
+        Assert.assertNotNull(icons);
+        Assert.assertEquals(1, icons.length);
+        icon = icons[0];
+        Assert.assertNotNull(icon);
+        Assert.assertEquals("http://localhost/splash.png", icon.getLocation().toString());
+
+    }
+
+    @Test
+    public void testInformationShortcut() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+
+        ShortcutDesc shortcut = info.getShortcut();
+        Assert.assertNotNull(shortcut);
+        Assert.assertTrue(shortcut.isOnline());
+        Assert.assertTrue(shortcut.onDesktop());
+        MenuDesc menu = shortcut.getMenu();
+        Assert.assertNotNull(menu);
+        Assert.assertEquals("submenu", menu.getSubMenu());
+    }
+
+    @Test
+    public void testInformationAssociation() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+        AssociationDesc[] associations = info.getAssociations();
+        Assert.assertNotNull(associations);
+        Assert.assertEquals(1, associations.length);
+        AssociationDesc association = associations[0];
+        Assert.assertNotNull(association);
+        String[] extensions = association.getExtensions();
+        Assert.assertNotNull(extensions);
+        Assert.assertEquals(1, extensions.length);
+        String extension = extensions[0];
+        Assert.assertNotNull(extension);
+        Assert.assertEquals("*.foo", extension);
+        String mimeType = association.getMimeType();
+        Assert.assertNotNull(mimeType);
+        Assert.assertEquals("foo/bar", mimeType);
+    }
+
+    @Test
+    public void testInformationRelatedContent() throws ParseException {
+        InformationDesc info = parser.getInfo(root).get(0);
+
+        RelatedContentDesc[] relatedContents = info.getRelatedContents();
+        Assert.assertNotNull(relatedContents);
+        Assert.assertEquals(1, relatedContents.length);
+        RelatedContentDesc relatedContent = relatedContents[0];
+        Assert.assertNotNull(relatedContent);
+        Assert.assertEquals("related-content title", relatedContent.getTitle());
+        Assert.assertNotNull(relatedContent.getLocation());
+        Assert.assertEquals("http://related-content/", relatedContent.getLocation().toString());
+        Assert.assertEquals("decription of related-content", relatedContent.getDescription());
+        IconDesc relatedIcon = relatedContent.getIcon();
+        Assert.assertNotNull(relatedIcon.getLocation());
+        Assert.assertEquals("http://localhost/related-content-icon.png", relatedIcon.getLocation().toString());
+
+    }
+
+    @Test
+    public void testSecurity() throws ParseException {
+        SecurityDesc security = parser.getSecurity(root);
+        Assert.assertNotNull(security);
+        Assert.assertEquals(SecurityDesc.ALL_PERMISSIONS, security.getSecurityType());
+    }
+
+    @Test
+    public void testResources() throws ParseException {
+        List<ResourcesDesc> allResources = parser.getResources(root, false);
+        Assert.assertNotNull(allResources);
+        Assert.assertEquals(1, allResources.size());
+        ResourcesDesc resources = allResources.get(0);
+        Assert.assertNotNull(resources);
+    }
+
+    @Test
+    public void testResourcesJava() throws ParseException {
+        ResourcesDesc resources = parser.getResources(root, false).get(0);
+        JREDesc[] jres = resources.getJREs();
+        Assert.assertNotNull(jres);
+        Assert.assertEquals(1, jres.length);
+        JREDesc jre = jres[0];
+        Assert.assertNotNull(jre);
+        Assert.assertEquals("1.3+", jre.getVersion().toString());
+        Assert.assertEquals("http://java-url/", jre.getLocation().toString());
+        Assert.assertEquals("64m", jre.getInitialHeapSize());
+        Assert.assertEquals("128m", jre.getMaximumHeapSize());
+    }
+
+    @Test
+    public void testResourcesJar() throws ParseException {
+        ResourcesDesc resources = parser.getResources(root, false).get(0);
+
+        boolean foundNative = false;
+        boolean foundEager = false;
+        boolean foundLazy = false;
+
+        JARDesc[] jars = resources.getJARs();
+        Assert.assertEquals(3, jars.length);
+        for (int i = 0; i < jars.length; i++) {
+            if (jars[i].isNative()) {
+                foundNative = true;
+                Assert.assertEquals("http://localhost/native.jar", jars[i].getLocation().toString());
+            } else if (jars[i].isEager()) {
+                foundEager = true;
+                Assert.assertEquals("http://localhost/eager.jar", jars[i].getLocation().toString());
+            } else if (jars[i].isLazy()) {
+                foundLazy = true;
+                Assert.assertEquals("http://localhost/lazy.jar", jars[i].getLocation().toString());
+            } else {
+                Assert.assertFalse(true);
+            }
+        }
+
+        Assert.assertTrue(foundNative);
+        Assert.assertTrue(foundLazy);
+        Assert.assertTrue(foundEager);
+    }
+
+    @Test
+    public void testResourcesExtensions() throws ParseException {
+        ResourcesDesc resources = parser.getResources(root, false).get(0);
+
+        ExtensionDesc[] extensions = resources.getExtensions();
+        Assert.assertNotNull(extensions);
+        Assert.assertEquals(1, extensions.length);
+        ExtensionDesc extension = extensions[0];
+        Assert.assertNotNull(extension);
+        Assert.assertEquals("http://extension/", extension.getLocation().toString());
+        Assert.assertEquals("extension", extension.getName());
+        Assert.assertEquals("0.1.1", extension.getVersion().toString());
+    }
+
+    @Test
+    public void testResourcesProperty() throws ParseException {
+        ResourcesDesc resources = parser.getResources(root, false).get(0);
+
+        PropertyDesc[] properties = resources.getProperties();
+        Assert.assertNotNull(properties);
+        Assert.assertEquals(1, properties.length);
+
+        PropertyDesc property = properties[0];
+        Assert.assertNotNull(property);
+        Assert.assertEquals("key", property.getKey());
+        Assert.assertEquals("value", property.getValue());
+    }
+
+    @Test
+    public void testApplication() throws ParseException {
+        ApplicationDesc app = (ApplicationDesc) parser.getLauncher(root);
+        Assert.assertNotNull(app);
+        Assert.assertEquals("MainClass", app.getMainClass());
+        Assert.assertArrayEquals(new String[] { "arg1", "arg2" }, app.getArguments());
+    }
+
+}
diff --git a/tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java b/tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java
new file mode 100644
index 0000000..886faed
--- /dev/null
+++ b/tests/netx/unit/net/sourceforge/jnlp/ParserCornerCases.java
@@ -0,0 +1,91 @@
+/* ParserCornerCases.java
+   Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp;
+
+import java.io.ByteArrayInputStream;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/** Test various corner cases of the parser */
+public class ParserCornerCases {
+    @Test
+    public void testUnsupportedSpecNumber() throws ParseException {
+        String malformedJnlp = "<?xml?><jnlp spec='11.11'></jnlp>";
+        Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+        Parser parser = new Parser(null, null, root, false, false);
+        Assert.assertEquals("11.11", parser.getSpecVersion().toString());
+    }
+
+    @Test
+    public void testApplicationAndComponent() throws ParseException {
+        String malformedJnlp = "<?xml?><jnlp><application-desc/><component-desc/></jnlp>";
+        Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+        Parser parser = new Parser(null, null, root, false, false);
+        Assert.assertNotNull(parser.getLauncher(root));
+    }
+
+    @Test
+    public void testCommentInElements() throws ParseException {
+        String malformedJnlp = "<?xml?><jnlp spec='1.0' <!-- comment -->> </jnlp>";
+        Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+        Parser p = new Parser(null, null, root, false, false);
+        Assert.assertEquals("1.0", p.getSpecVersion().toString());
+    }
+
+    @Test
+    public void testCommentInAttributes() throws ParseException {
+        String malformedJnlp = "<?xml?><jnlp spec='<!-- something -->'></jnlp>";
+        Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+        Parser p = new Parser(null, null, root, false, false);
+        Assert.assertEquals("<!-- something -->", p.getSpecVersion().toString());
+    }
+
+    @Test
+    public void testNestedComments() throws ParseException {
+        String malformedJnlp = "<?xml?>" +
+                "<jnlp><information><description>" +
+                "<!-- outer <!-- inner --> -->" +
+                "</description></information></jnlp>";
+        Node root = Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+        Parser p = new Parser(null, null, root, false, false);
+        Assert.assertEquals(" -->", p.getInfo(root).get(0).getDescription());
+    }
+}
diff --git a/tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java b/tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java
new file mode 100644
index 0000000..fe377d2
--- /dev/null
+++ b/tests/netx/unit/net/sourceforge/jnlp/ParserMalformedXml.java
@@ -0,0 +1,94 @@
+/* ParserMalformedXml.java
+   Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Test how well the parser deals with malformed xml */
+public class ParserMalformedXml {
+
+    private static String originalJnlp = null;
+
+    @BeforeClass
+    public static void setUp() throws IOException {
+        ClassLoader cl = ParserMalformedXml.class.getClassLoader();
+        if (cl == null) {
+            cl = ClassLoader.getSystemClassLoader();
+        }
+        InputStream is = cl.getResourceAsStream("net/sourceforge/jnlp/basic.jnlp");
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+        StringBuilder jnlpBuilder = new StringBuilder();
+        String line;
+        while ( (line = reader.readLine()) != null) {
+            jnlpBuilder.append(line).append("\n");
+        }
+        originalJnlp = jnlpBuilder.toString();
+    }
+
+    @Test
+    public void testMissingXmlDecleration() throws ParseException {
+        String malformedJnlp = originalJnlp.replaceFirst("<\\?xml.*\\?>", "");
+        Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+    }
+
+    @Test
+    public void testMalformedArguments() throws ParseException {
+        String malformedJnlp = originalJnlp.replace("arg2</argument", "arg2<argument");
+        Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+    }
+
+    @Test
+    public void testTagNotClosed() throws ParseException {
+        String malformedJnlp = originalJnlp.replace("</jnlp>", "<jnlp>");
+        Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+    }
+
+    @Test
+    public void testUnquotedAttributes() throws ParseException {
+        String malformedJnlp = originalJnlp.replace("'jnlp.jnlp'", "jnlp.jnlp");
+        Parser.getRootNode(new ByteArrayInputStream(malformedJnlp.getBytes()));
+    }
+
+}
diff --git a/tests/netx/unit/net/sourceforge/jnlp/basic.jnlp b/tests/netx/unit/net/sourceforge/jnlp/basic.jnlp
new file mode 100644
index 0000000..8fabda8
--- /dev/null
+++ b/tests/netx/unit/net/sourceforge/jnlp/basic.jnlp
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- this is a sample jnlp file -->
+<jnlp spec='1.0'
+    codebase='http://localhost/'
+    href='jnlp.jnlp'>
+  <information>
+    <!-- this is the information section -->
+    <title>Large JNLP</title>
+    <vendor>The IcedTea Project</vendor>
+    <homepage href='http://homepage/' />
+    <description kind='one-line'>one-line</description>
+    <description kind='short'>short</description>
+    <description kind='tooltip'>tooltip</description>
+    <icon href='icon.png' />
+    <icon href='splash.png' kind='splash' />
+    <offline-allowed />
+    <shortcut online='true'>
+      <desktop/>
+      <menu submenu='submenu'/>
+    </shortcut>
+    <association extensions='*.foo' mime-type='foo/bar'/>
+    <related-content href='http://related-content/'>
+      <title>related-content <!-- or something -->title</title>
+      <description>decription of related-content</description>
+      <icon href='related-content-icon.png' />
+    </related-content>
+  </information>
+  <security>
+    <all-permissions/>
+  </security>
+  <resources>
+    <!-- the resources section describes things needed -->
+    <java version='1.3+' href='http://java-url/'
+        initial-heap-size='64m'
+        max-heap-size='128m' />
+    <jar href='eager.jar' download='eager'/>
+    <jar href='lazy.jar' download='lazy'/>
+    <nativelib href='native.jar'/>
+    <extension name='extension' version='0.1.1' href='http://extension/'/>
+    <property name='key' value='value'/>
+  </resources>
+  <application-desc main-class='MainClass'>
+    <argument>arg1</argument>
+    <argument>arg2</argument>
+  </application-desc>
+</jnlp>
+