--- a/ChangeLog	Tue May 03 14:44:03 2011 +0100
+++ b/ChangeLog	Tue May 03 14:44:49 2011 +0100
@@ -5,6 +5,13 @@
 	7038711 which fixes build on RHEL5.
 	(JDK_SHA256SUM): Likewise.
 
+2011-05-02  Omair Majid  <omajid@redhat.com>
+
+	Remove obsolete information about the plugin and netx
+	* INSTALL,
+	* README: Remove references to plugin and webstart.
+	* configure.ac: Do not check for plugin.
+
 2011-04-29  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/boot/icedtea-dyn.patch:

--- a/INSTALL	Tue May 03 14:44:03 2011 +0100
+++ b/INSTALL	Tue May 03 14:44:49 2011 +0100
@@ -30,7 +30,6 @@
 libpng-devel
 libjpeg-devel >= 6b
 zlib-devel
-xulrunner-devel (can be disabled using --disable-plugin)
 rhino (can be disabled using --without-rhino)
 libffi (for --enable-zero or on archs other than x86/x86_64/sparc)
 pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java)
@@ -172,8 +171,6 @@
 * --enable-cacao: Replace HotSpot with the CACAO VM.
 * --enable-shark: Build the Shark LLVM-based JIT.
 * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
-* --disable-plugin: Don't build the browser plugin.
-* --disable-npplugin: Build the old unsupported plugin rather than NPPlugin.
 * --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
 * --with-rhino: Include Javascript support using Rhino.
 * --with-additional-vms=vm-list: Additional VMs to build using the system described
@@ -268,23 +265,6 @@
 --enable-shark to configure.  Please note that Shark is still in
 development and builds are still likely to fail at present.
 
-The Browser Plugin
-==================
-
-IcedTea7 contains a Free Software browser plugin based on NPRuntime
-called NPPlugin.  By default, this will be built, and it can be turned
-off using the -disable-plugin option.
-
-A test suite is supplied for the browser plugin.  It can be built
-using 'make plugin-tests' and run by loading the HTML page specified
-into a browser with the plugin installed.
-
-For debugging, the environment variable ICEDTEAPLUGIN_DEBUG should be
-set to 'true'.  This will produce output on the console from the C++
-side, and output from the Java side in $HOME/.icedteaplugin/java.stdout
-and $HOME/.icedteaplugin/java.stderr.  It also starts the debug server
-on port 8787.
-
 Support for Different Versions of HotSpot
 =========================================
 

--- a/README	Tue May 03 14:44:03 2011 +0100
+++ b/README	Tue May 03 14:44:49 2011 +0100
@@ -5,10 +5,8 @@
 openjdk.java.net using Free Software tools and dependencies.
 
 IcedTea addresses two problems: it eliminates the build requirement on
-proprietary build tools and it provides implementations of Java Web
-Start and the browser plugin which are missing from OpenJDK.  It also
-provides support for additional architectures via Zero/Shark or the
-CACAO VM.
+proprietary build tools and provides additional patches and features
+(such as Javascript support via Rhino) not available in OpenJDK.
 
 IcedTea also provides build scripts and patches that fix a number of issues
 which are as yet unresolved upstream.
@@ -42,10 +40,7 @@
 subject to minor adjustments, major revisions, or even outright
 removal between now and the time that the Java SE 7 Platform
 Specification is finalized.  Please take these facts into account
-before depending upon IcedTea.  IcedTea provides autotools support, a
-portable interpreter (Zero) and LLVM-based JIT (Shark) for other
-architectures beyond x86/x86_64/SPARC, plugin support and Web Start
-support.
+before depending upon IcedTea.
 
 A Note About License Headers
 ----------------------------
@@ -56,29 +51,6 @@
  - We are assuming that these files are owned by Sun:
    openjdk/jdk/src/share/classes/**/resources/*.properties
 
-Web Browser Plugin support
-===========================
-
-IcedTea adds a browser plugin to OpenJDK.  The current version is a
-rewrite, developed to support recent Mozilla API changes. It can be
-enabled with the option --enable-plugin, and is based on
-gcjwebplugin.
-
-NetX
-====
-
-NetX provides a drop-in replacement for javaws (Java Web Start). Since
-upstream NetX is dormant, we will be hosting and modifying the sources
-in the IcedTea repository, particularly in the netx/net/sourceforge/jnlp
-directory.
-
-The NetX sources are built into rt.jar using the same method as
-CORBA, JAXWS, JAXP and langtools.
-
-IcedTea's NetX currently supports verification of signed jars, trusted
-certificate storing, system certificate store checking, and provides
-the services specified by the jnlp API.
-
 The Zero Assembler and Shark Ports
 ==================================
 

--- a/configure.ac	Tue May 03 14:44:03 2011 +0100
+++ b/configure.ac	Tue May 03 14:44:49 2011 +0100
@@ -59,14 +59,6 @@
 AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
 AC_SUBST(XVFB_RUN_CMD)
 
-AC_MSG_CHECKING([whether to build the browser plugin])
-AC_ARG_ENABLE([plugin],
-              [AS_HELP_STRING([--disable-plugin],
-                              [Disable compilation of browser plugin])],
-              [enable_plugin="${enableval}"], [enable_plugin="yes"])
-AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
-AC_MSG_RESULT(${enable_plugin})
-
 AC_MSG_CHECKING([whether to include PulseAudio support])
 AC_ARG_ENABLE([pulse-java],
               [AS_HELP_STRING([--enable-pulse-java],