--- a/ChangeLog	Tue Jun 22 16:00:26 2010 +0100
+++ b/ChangeLog	Wed Jun 23 00:15:52 2010 +0100
@@ -1,3 +1,41 @@
+2010-06-22 Andrew John Hughes  <ahughes@redhat.com>
+
+	Remove VisualVM support, now maintained at
+	http://icedtea.classpath.org/hg/visualvm
+	* Makefile.am:
+	Remove VisualVM targets, references and aliases.
+	(NETBEANS_PROFILER_URL): Removed.
+	(NETBEANS_PROFILER_SRC_ZIP): Likewise.
+	(NETBEANS_PROFILER_SHA256SUM): Likewise.
+	(VISUALVM_URL): Likewise.
+	(VISUALVM_SRC_ZIP): Likewise.
+	(VISUALVM_SHA256SUM): Likewise.
+	(EXTRA_DIST): Remove visualvm.desktop.
+	(clean-local): Remove clean-visualvm and clean-nbplatform.
+	(.PHONY): Likewise.
+	(download): Don't depend on download-visualvm.stamp
+	(clean-download): Don't depend on clean-download-visualvm
+	(download-visualvm): Removed.
+	(clean-download-visualvm): Likewise.
+	(extract): Don't depend on extract-visualvm.stamp
+	(clean-extract): Don't depend on clean-extract-visualvm.
+	(extract-visualvm): Removed.
+	(clean-extract-visualvm): Likewise.
+	(icedtea-stage2): Don't depend on visualvm.stamp
+	(icedtea-debug-stage2): Likewise.
+	(nbplatform): Removed.
+	(visualvm): Removed.
+	* acinclude.m4:
+	Remove VisualVM-related macros.
+	(FIND_NETBEANS): Removed.
+	(WITH_NETBEANS_PROFILER_ZIP): Removed.
+	(WITH_VISUALVM_ZIP): Removed.
+	* configure.ac:
+	Remove --with-netbeans-home and
+	--enable-visualvm options.  Don't invoke
+	VisualVM macros.
+	* visualvm.desktop: Removed.
+
 2010-06-21 Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/cacao/memory.patch:

--- a/Makefile.am	Tue Jun 22 16:00:26 2010 +0100
+++ b/Makefile.am	Wed Jun 23 00:15:52 2010 +0100
@@ -24,14 +24,6 @@
 CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
 
-NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/145168/
-NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release67.tar.gz
-NETBEANS_PROFILER_SHA256SUM = 611736b4e6dac2f7ddb669a23a474fb052f4141c04dc2ba5888b9e9db61fe59b
-
-VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/145167/
-VISUALVM_SRC_ZIP = visualvm_121-src.tar.gz
-VISUALVM_SHA256SUM = b561207d85da4916e809cc4c104098e1ca979b30192c207b9d6087a31c91b8b0
-
 JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
 JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
 JAXWS_DROP_SHA256SUM = 272756b999e9ae2435da8d58e259562e61126e1c5b1f9421fe65423217cef8fd
@@ -731,7 +723,7 @@
 	$(top_srcdir)/patches/security/*.patch \
 	$(top_srcdir)/patches/xrender/*.patch \
 	tools-copy contrib ports extra overlays \
-	javaws.png javaws.desktop visualvm.desktop \
+	javaws.png javaws.desktop \
 	jconsole.desktop policytool.desktop \
 	$(JTREG_SRCS) \
 	HACKING $(PULSEAUDIO_SRCS) fsg.sh \
@@ -754,8 +746,7 @@
 
 clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \
  clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
- clean-extra clean-netx clean-visualvm clean-nbplatform \
- clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
+ clean-extra clean-netx clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
  clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
  clean-extract clean-generated clean-plugin clean-liveconnect clean-native-ecj \
  clean-hgforest clean-icedtea-stage2 clean-icedtea-debug-stage2 clean-icedtea-stage1 \
@@ -781,9 +772,8 @@
 	clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \
 	clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
 	clean-icedtea icedtea-stage2 clean-icedtea-boot \
-	clean-visualvm clean-nbplatform clean-rt clean-plugin hotspot \
-	hotspot-helper clean-extra clean-jtreg clean-jtreg-reports clean-netx \
-	clean-drops
+	clean-rt clean-plugin hotspot hotspot-helper clean-extra clean-jtreg \
+	clean-jtreg-reports clean-netx clean-drops
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -829,12 +819,11 @@
 # Download OpenJDK sources.
 
 stamps/download.stamp: stamps/download-drops.stamp stamps/download-openjdk.stamp \
- stamps/download-cacao.stamp stamps/download-visualvm.stamp
+ stamps/download-cacao.stamp
 	mkdir -p stamps
 	touch $@
 
-clean-download: clean-drops clean-download-openjdk clean-download-cacao \
- clean-download-visualvm
+clean-download: clean-drops clean-download-openjdk clean-download-cacao
 	rm -f stamps/download.stamp
 
 stamps/download-jaxp-drop.stamp:
@@ -1126,60 +1115,12 @@
 	rm -f $(CACAO_SRC_ZIP)
 	rm -f stamps/download-cacao.stamp
 
-stamps/download-visualvm.stamp:
-if WITH_VISUALVM
-if USE_ALT_NETBEANS_PROFILER_ZIP
-	ln -sf $(ALT_NETBEANS_PROFILER_ZIP) $(NETBEANS_PROFILER_SRC_ZIP)
-endif
-	if ! echo "$(NETBEANS_PROFILER_SHA256SUM)  $(NETBEANS_PROFILER_SRC_ZIP)" \
-	 | $(SHA256SUM) --check ; \
-	then \
-	 if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
-	 then \
-	  mv $(NETBEANS_PROFILER_SRC_ZIP) $(NETBEANS_PROFILER_SRC_ZIP).old ; \
-	 fi ; \
-	 $(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
-	  -O $(NETBEANS_PROFILER_SRC_ZIP) ; \
-	 if ! echo "$(NETBEANS_PROFILER_SHA256SUM)  $(NETBEANS_PROFILER_SRC_ZIP)" \
-	   | $(SHA256SUM) --check ; \
-	 then echo "ERROR: Bad download of NetBeans profiler zip"; false; \
-	 fi; \
-	fi
-
-if USE_ALT_VISUALVM_ZIP
-	ln -sf $(ALT_VISUALVM_ZIP) $(VISUALVM_SRC_ZIP)
-endif
-	if ! echo "$(VISUALVM_SHA256SUM)  $(VISUALVM_SRC_ZIP)" \
-         | $(SHA256SUM) --check ; \
-        then \
-         if [ $(VISUALVM_SRC_ZIP) ] ; \
-         then \
-          mv $(VISUALVM_SRC_ZIP) $(VISUALVM_SRC_ZIP).old ; \
-         fi ; \
-         $(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) \
-          -O $(VISUALVM_SRC_ZIP) ; \
-	 if ! echo "$(VISUALVM_SHA256SUM)  $(VISUALVM_SRC_ZIP)" \
-	   | $(SHA256SUM) --check ; \
-	 then echo "ERROR: Bad download of VisualVM zip"; false; \
-	 fi; \
-        fi
-endif
+stamps/extract.stamp: stamps/extract-openjdk.stamp \
+ stamps/extract-cacao.stamp stamps/extract-jaxws.stamp
 	mkdir -p stamps
 	touch $@
 
-clean-download-visualvm:
-	rm -f $(VISUALVM_SRC_ZIP)
-	rm -f $(NETBEANS_PROFILER_SRC_ZIP)
-	rm -f stamps/download-visualvm.stamp
-
-stamps/extract.stamp: stamps/extract-openjdk.stamp \
- stamps/extract-visualvm.stamp stamps/extract-cacao.stamp \
- stamps/extract-jaxws.stamp
-	mkdir -p stamps
-	touch $@
-
-clean-extract: clean-extract-openjdk clean-extract-visualvm \
- clean-extract-cacao clean-extract-jaxws
+clean-extract: clean-extract-openjdk clean-extract-cacao clean-extract-jaxws
 	rm -f stamps/extract.stamp
 
 stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp
@@ -1297,30 +1238,6 @@
 	rm -rf openjdk
 	rm -f stamps/extract-openjdk.stamp
 
-stamps/extract-visualvm.stamp: stamps/download-visualvm.stamp
-if WITH_VISUALVM
-	set -e ; \
-	if ! test -d netbeans ; \
-	then \
-	  mkdir netbeans ; \
-	  $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
-	fi
-
-	set -e ; \
-	if ! test -d visualvm ; \
-	then \
-	  $(TAR) xf $(VISUALVM_SRC_ZIP) ; \
-	fi
-endif
-	mkdir -p stamps
-	touch $@
-
-clean-extract-visualvm:
-if WITH_VISUALVM
-	rm -rf netbeans visualvm
-endif
-	rm -f stamps/extract-visualvm.stamp
-
 stamps/extract-cacao.stamp: stamps/download-cacao.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
@@ -1942,7 +1859,7 @@
 	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
 
 stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
- stamps/add-zero.stamp stamps/visualvm.stamp
+ stamps/add-zero.stamp
 	mkdir -p stamps
 	touch $@
 
@@ -1950,8 +1867,7 @@
 	rm -f stamps/icedtea-stage2.stamp
 
 stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
- stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \
- stamps/visualvm.stamp
+ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp
 	mkdir -p stamps
 	touch $@
 
@@ -2252,75 +2168,6 @@
 	mkdir -p stamps
 	touch stamps/rewrite-rhino.stamp
 
-# VisualVM
-
-stamps/nbplatform.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) stamps/extract-visualvm.stamp
-if WITH_VISUALVM
-	cd netbeans ; \
-        rm nbbuild/external/binaries-list ; \
-	mkdir -p ./nbbuild/netbeans_visualvm/ ; \
-	ln -s $(SYSTEM_NETBEANS_DIR)/platform9/ ./nbbuild/netbeans_visualvm/platform9 ; \
-	ln -s $(SYSTEM_NETBEANS_DIR)/apisupport1/ ./nbbuild/netbeans_visualvm/apisupport1 ; \
-	ln -s $(SYSTEM_NETBEANS_DIR)/harness/ ./nbbuild/netbeans_visualvm/harness ; \
-	if ! (uname -a | grep x86_64) ; then \
-	  mkdir -p lib.profiler/release/lib/deployed/jdk15/linux ; \
-	  mkdir -p lib.profiler/release/lib/deployed/jdk16/linux ; \
-	  buildscript=./buildnative-linux-15.sh ; \
-	else \
-	  mkdir -p lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \
-	  mkdir -p lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \
-	  buildscript=./buildnative-linux64-15.sh ; \
-	fi ; \
-	cd lib.profiler/native/build ; \
-	JAVA_HOME_15=$(ICEDTEA_HOME) JAVA_HOME_16=$(ICEDTEA_HOME) \
-	  $$buildscript ; \
-	cd ../../.. ; \
-        JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \
-            -f nbbuild/build.xml bootstrap ; \
-	for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler ; do \
-	  JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091020 \
-            -Dnetbeans.dest.dir=$(abs_top_builddir)/netbeans/nbbuild/netbeans_visualvm \
-	    -f $$dir/build.xml ; \
-	done 
-endif
-	mkdir -p stamps
-	touch $@
-
-clean-nbplatform:
-	rm -rf netbeans
-	rm -f stamps/nbplatform.stamp
-
-stamps/visualvm.stamp: stamps/icedtea.stamp stamps/nbplatform.stamp
-if WITH_VISUALVM
-	cd visualvm ; \
-	ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans_visualvm netbeans ; \
-	JAVA_HOME=$(ICEDTEA_HOME) $(ANT) build
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
-	  visualvm/launcher/visualvm >> \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
-	chmod a+x $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/jvisualvm ; \
-	cp visualvm/launcher/visualvm.conf \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
-	echo visualvm >> \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
-	echo profiler3 >> \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc/visualvm.clusters ; \
-	cp -r visualvm/build/cluster/* \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans_visualvm/platform9 \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm ; \
-	cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm	
-endif
-	mkdir -p stamps
-	touch $@
-
-clean-visualvm:
-	rm -rf visualvm
-	rm -f stamps/visualvm.stamp
-
 # CACAO
 
 stamps/cacao.stamp: stamps/rt.stamp
@@ -2686,16 +2533,12 @@
 
 download-openjdk: stamps/download-openjdk.stamp
 
-download-visualvm: stamps/download-visualvm.stamp
-
 extract: stamps/extract.stamp
 
 extract-cacao: stamps/extract-cacao.stamp
 
 extract-openjdk: stamps/extract-openjdk.stamp
 
-extract-visualvm: stamps/extract-visualvm.stamp
-
 generated: stamps/generated.stamp
 
 hotspot-ports: stamps/ports.stamp
@@ -2747,5 +2590,3 @@
 rt: stamps/rt.stamp
 
 rt-class-files: stamps/rt-class-files.stamp
-
-visualvm: stamps/visualvm.stamp

--- a/acinclude.m4	Tue Jun 22 16:00:26 2010 +0100
+++ b/acinclude.m4	Wed Jun 23 00:15:52 2010 +0100
@@ -649,38 +649,6 @@
   AC_SUBST(XERCES2_JAR)
 ])
 
-AC_DEFUN([FIND_NETBEANS],
-[
-  AC_MSG_CHECKING([if the location of NetBeans is specified])
-  AC_ARG_WITH([netbeans],
-              [AS_HELP_STRING(--with-netbeans,specify location of netbeans)],
-  [
-    if test "x${withval}" = "xyes"; then
-      NETBEANS=no
-    else
-      NETBEANS="${withval}"
-    fi
-  ],
-  [
-    NETBEANS=no
-  ])
-  AC_MSG_RESULT(${NETBEANS})
-  if ! test -f "${NETBEANS}"; then
-    if test "x${NETBEANS}" = "xno"; then
-      NETBEANS=
-    else
-      AC_PATH_PROG(NETBEANS, "${NETBEANS}")
-    fi
-  fi
-  if test -z "${NETBEANS}"; then
-    AC_PATH_PROG(NETBEANS, "netbeans")
-  fi
-  if test -z "${NETBEANS}"; then
-    AC_MSG_ERROR("NetBeans was not found.")
-  fi
-  AC_SUBST(NETBEANS)
-])
-
 AC_DEFUN([FIND_RHINO_JAR],
 [
   AC_MSG_CHECKING([whether to include Javascript support via Rhino])
@@ -1652,38 +1620,6 @@
 AC_PROVIDE([$0])dnl
 ])
 
-AC_DEFUN([WITH_NETBEANS_PROFILER_ZIP],
-[
-  AC_MSG_CHECKING(for a NetBeans profiler zip)
-  AC_ARG_WITH([netbeans-profiler-zip],
-              [AS_HELP_STRING(--with-netbeans-profiler-zip,specify the location of the NetBeans profiler zip)],
-  [
-    ALT_NETBEANS_PROFILER_ZIP=${withval}
-  ],
-  [ 
-    ALT_NETBEANS_PROFILER_ZIP="not specified"
-  ])
-  AC_MSG_RESULT(${ALT_NETBEANS_PROFILER_ZIP})
-  AM_CONDITIONAL(USE_ALT_NETBEANS_PROFILER_ZIP, test "x$ALT_NETBEANS_PROFILER_ZIP" != "xnot specified")
-  AC_SUBST(ALT_NETBEANS_PROFILER_ZIP)
-])
-
-AC_DEFUN([WITH_VISUALVM_ZIP],
-[
-  AC_MSG_CHECKING(for a VisualVM zip)
-  AC_ARG_WITH([visualvm-zip],
-              [AS_HELP_STRING(--with-visualvm-zip,specify the location of the VisualVM zip)],
-  [
-    ALT_VISUALVM_ZIP=${withval}
-  ],
-  [ 
-    ALT_VISUALVM_ZIP="not specified"
-  ])
-  AC_MSG_RESULT(${ALT_VISUALVM_ZIP})
-  AM_CONDITIONAL(USE_ALT_VISUALVM_ZIP, test "x$ALT_VISUALVM_ZIP" != "xnot specified")
-  AC_SUBST(ALT_VISUALVM_ZIP)
-])
-
 AC_DEFUN_ONCE([IT_GET_PKGVERSION],
 [
 AC_MSG_CHECKING([for distribution package version])

--- a/configure.ac	Tue Jun 22 16:00:26 2010 +0100
+++ b/configure.ac	Wed Jun 23 00:15:52 2010 +0100
@@ -51,32 +51,6 @@
 IT_CP_SUPPORTS_REFLINK
 IT_CAN_HARDLINK_TO_SOURCE_TREE
 
-AC_MSG_CHECKING([for a NetBeans installation])
-AC_ARG_WITH([netbeans-home],
-           [AS_HELP_STRING([--with-netbeans-home],
-                            [NetBeans home directory (default is /usr/share/netbeans)])],
-            [
-              if test "x${withval}" = x
-              then
-                SYSTEM_NETBEANS_DIR=/usr/share/netbeans
-              else
-                SYSTEM_NETBEANS_DIR=${withval}
-              fi
-            ],
-            [
-              SYSTEM_NETBEANS_DIR=/usr/share/netbeans
-            ])
-AC_MSG_RESULT([${SYSTEM_NETBEANS_DIR}])
-AC_SUBST(SYSTEM_NETBEANS_DIR)
-
-AC_MSG_CHECKING([whether to build VisualVM])
-AC_ARG_ENABLE([visualvm],
-              [AS_HELP_STRING([--enable-visualvm],
-                                         [Enable compilation of visualvm.])],
-              [enable_visualvm="${enableval}"], [enable_visualvm="no"])
-AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes")
-AC_MSG_RESULT(${enable_visualvm})
-
 AC_MSG_CHECKING([whether to build the LiveConnect plugin])
 AC_ARG_ENABLE([plugin],
               [AS_HELP_STRING([--disable-plugin],
@@ -188,8 +162,6 @@
 WITH_JAXP_DROP_ZIP
 WITH_JAF_DROP_ZIP
 WITH_JAXWS_DROP_ZIP
-WITH_NETBEANS_PROFILER_ZIP
-WITH_VISUALVM_ZIP
 
 AC_CHECK_ENABLE_CACAO
 AC_CHECK_WITH_CACAO_HOME
@@ -219,16 +191,6 @@
 dnl Plugin
 IT_CHECK_XULRUNNER_VERSION
 
-if test "x${enable_visualvm}" = "xyes"
-then
-  FIND_NETBEANS
-fi
-
-if test "x${enable_visualvm}" = "xyes"
-then
-  FIND_NETBEANS
-fi
-
 dnl pkgconfig cannot be used to find these headers and libraries.
 AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
 	,[AC_MSG_ERROR("CUPS headers were not found -

--- a/visualvm.desktop	Tue Jun 22 16:00:26 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK VisualVM
-Comment=Integrates commandline JDK tools and profiling capabilites.
-Exec=/usr/bin/jvisualvm
-Icon=java
-Terminal=false
-Type=Application
-Categories=Development;Java;
-Version=1.0