Remove everything libxml2- and loadsave-related

29 files changed, 18 insertions, 326 deletions

diff --git a/Android.mk b/Android.mk
index 853b4b0a4..d9868cab8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,7 +53,7 @@ gst-configure-real:
 	PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
 	PKG_CONFIG_TOP_BUILD_DIR=/ \
 	$(abspath $(gstreamer_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
-	--prefix=/system --disable-nls --disable-loadsave \
+	--prefix=/system --disable-nls \
 	--disable-valgrind --disable-gtk-doc && \
 	for file in $(GST_BUILT_SOURCES); do \
 		rm -f $$file && \
diff --git a/Makefile.am b/Makefile.am
index 383dfc766..f6ddc4a7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,13 +142,11 @@ include $(top_srcdir)/common/coverage/lcov.mak
 
 # Do not run the check-exports test in case any option which causes the API to
 # change has been used
-if !GST_DISABLE_LOADSAVE
 if !GST_DISABLE_REGISTRY
 if !GST_DISABLE_TRACE
 CHECK_EXPORTS = check-exports
 endif
 endif
-endif
 
 check: $(CHECK_EXPORTS) check-enum-gettypes
 
diff --git a/configure.ac b/configure.ac
index d7f33c50d..2d8ce353d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,16 +78,6 @@ dnl subsystems - can influence other decisions so needs to be high up
 dnl we need to AM_CONDITIONAL them here for automake 1.6.x compatibility
 AG_GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem])
 AM_CONDITIONAL(GST_DISABLE_GST_DEBUG, test "x$GST_DISABLE_GST_DEBUG" = "xyes")
-AG_GST_CHECK_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save])
-AM_CONDITIONAL(GST_DISABLE_LOADSAVE, test "x$GST_DISABLE_LOADSAVE" = "xyes")
-dnl define a substitution to use in docs/gst/gstreamer.types
-if test "x$GST_DISABLE_LOADSAVE" = "xyes"
-then
-  GST_LOADSAVE_DOC_TYPES="%"
-else
-  GST_LOADSAVE_DOC_TYPES=
-fi
-AC_SUBST(GST_LOADSAVE_DOC_TYPES)
 AG_GST_CHECK_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
 AM_CONDITIONAL(GST_DISABLE_PARSE, test "x$GST_DISABLE_PARSE" = "xyes")
 if test "x$GST_DISABLE_PARSE" = xyes; then
@@ -546,18 +536,6 @@ dnl Check for documentation xrefs
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 AC_SUBST(GLIB_PREFIX)
 
-dnl libxml2 is only needed for xml loading/saving of pipelines these days
-if test "x$GST_DISABLE_LOADSAVE" = "xyes"
-then
-  AC_MSG_NOTICE([XML registry and load/save are disabled, not checking for libxml2])
-  GST_DISABLE_XML_DEFINE="#define GST_DISABLE_XML 1"
-else
-  dnl check for libxml2 with minimum req version
-  AG_GST_LIBXML2_CHECK(2.4.9)
-  GST_DISABLE_XML_DEFINE="/* #undef GST_DISABLE_XML */"
-fi
-AC_SUBST(GST_DISABLE_XML_DEFINE)
-
 dnl building of unit test libraries
 AC_ARG_ENABLE(check,
   AC_HELP_STRING([--disable-check], [disable building unit test libraries]),
@@ -629,7 +607,6 @@ AC_DEFINE_UNQUOTED(GST_DATADIR, "$DATADIR", [data dir])
 dnl set location of plugin directory
 AG_GST_SET_PLUGINDIR
 
-dnl FIXME: add LIBXML_PKG here if we use it
 GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-no-export-2.0, gthread-2.0"
 AC_SUBST(GST_PKG_DEPS)
 
@@ -677,13 +654,10 @@ AC_SUBST(GST_OPTION_CXXFLAGS)
 dnl GST_ALL_*
 dnl vars common to for all internal objects (core libs, elements, applications)
 dnl CFLAGS:
-dnl - XML needs to be added because xmlPtr is used in core
 dnl - src and build dirs need to be added because every piece that gets built
 dnl   will need the GStreamer source and generated headers
-dnl LIBS: XML doesn't need to be added because we don't explicitly use symbols
-dnl       from LibXML except for in the core library
-GST_ALL_CXXFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS $GLIB_EXTRA_CFLAGS $XML_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(ERROR_CXXFLAGS)"
-GST_ALL_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS $GLIB_EXTRA_CFLAGS $XML_CFLAGS \$(GST_OPTION_CFLAGS) \$(ERROR_CFLAGS)"
+GST_ALL_CXXFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(ERROR_CXXFLAGS)"
+GST_ALL_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS) \$(ERROR_CFLAGS)"
 
 dnl FIXME: check if LTLIBINTL is needed everywhere
 dnl I presume it is given that it contains the symbols that _() stuff maps to
@@ -816,7 +790,6 @@ sed \
     -e 's/.* HAVE_CPU_I386$/#define HAVE_CPU_I386 1/' \
     -e 's/.* HAVE_FGETPOS$/#define HAVE_FGETPOS 1/' \
     -e 's/.* HAVE_FSETPOS$/#define HAVE_FSETPOS 1/' \
-    -e 's/.* HAVE_LIBXML2$/#define HAVE_LIBXML2 1/' \
     -e 's/.* HAVE_PROCESS_H$/#define HAVE_PROCESS_H 1/' \
     -e 's/.* HAVE_STDLIB_H$/#define HAVE_STDLIB_H 1/' \
     -e 's/.* HAVE_STRING_H$/#define HAVE_STRING_H 1/' \
@@ -843,7 +816,6 @@ AC_OUTPUT
 
 dnl negate for output
 if test "x${GST_DISABLE_GST_DEBUG}" = "xno"; then enable_gst_debug="yes"; fi
-if test "x${GST_DISABLE_LOADSAVE}" = "xno"; then enable_loadsave="yes"; fi
 if test "x${GST_DISABLE_PARSE}" = "xno"; then enable_parse="yes"; fi
 if test "x${GST_DISABLE_OPTION_PARSING}" = "xno"; then enable_option_parsing="yes"; fi
 if test "x${GST_DISABLE_TRACE}" = "xno"; then enable_trace="yes"; fi
@@ -866,7 +838,6 @@ Configuration
 	Documentation (API)        : ${enable_gtk_doc}
 
 	Debug Logging              : ${enable_gst_debug}
-	Pipeline XML load/save     : ${enable_loadsave}
 	Command-line parser        : ${enable_parse}
 	Option parsing in gst_init : ${enable_option_parsing}
 	Tracing subsystem          : ${enable_trace}
diff --git a/docs/design/part-TODO.txt b/docs/design/part-TODO.txt
index 32ea19050..8d8797794 100644
--- a/docs/design/part-TODO.txt
+++ b/docs/design/part-TODO.txt
@@ -58,8 +58,6 @@ API/ABI
   to let upstream renegotiate a new format just like it did when it started.
   This could, for example, easily be triggered with a RENEGOTIATE event.
 
-- Remove the XML serialisation stuff.
-
 - Remove the result format value in queries.
 
 - Try to minimize the amount of acceptcaps calls when pushing buffers around.
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 1b84f7382..a44ad3dd4 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -515,15 +515,12 @@ gst_element_factory_get_longname
 <SECTION>
 <FILE>gstconfig</FILE>
 GST_DISABLE_GST_DEBUG
-GST_DISABLE_LOADSAVE
 GST_DISABLE_PARSE
 GST_DISABLE_TRACE
 GST_DISABLE_ALLOC_TRACE
 GST_DISABLE_REGISTRY
 GST_DISABLE_PLUGIN
-GST_DISABLE_XML
 <SUBSECTION Private>
-GST_DISABLE_LOADSAVE_REGISTRY
 GST_HAVE_GLIB_2_8
 GST_PTR_FORMAT
 GST_SEGMENT_FORMAT
diff --git a/gst/Makefile.am b/gst/Makefile.am
index e9299f10f..8988efe78 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -130,7 +130,6 @@ libgstreamer_@GST_MAJORMINOR@_la_LIBADD =		\
 	$(GST_PARSE_LA)					\
 	$(GST_ALL_LIBS)					\
 	$(WIN32_LIBS)					\
-	$(XML_LIBS)					\
 	$(LIBM)
 
 libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS =		\
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index acbeab9d1..7af2496c4 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -54,14 +54,11 @@
 
 #if 0
 #define GST_DISABLE_GST_DEBUG 1
-#define GST_DISABLE_LOADSAVE 1
 #define GST_DISABLE_PARSE 1
 #define GST_DISABLE_TRACE 1
 #define GST_DISABLE_ALLOC_TRACE 1
 #define GST_DISABLE_REGISTRY 1
 #define GST_DISABLE_PLUGIN 1
-#define GST_DISABLE_XML 1
-#define GST_DISABLE_LOADSAVE_REGISTRY 1
 #define GST_HAVE_GLIB_2_8 1
 #endif
 
@@ -82,14 +79,6 @@
 @GST_DISABLE_GST_DEBUG_DEFINE@
 
 /**
- * GST_DISABLE_LOADSAVE:
- *
- * Configures the inclusion of the plugin graph xml-serialisation
- * (was used in 0.8 by gst-editor)
- */
-@GST_DISABLE_LOADSAVE_DEFINE@
-
-/**
  * GST_DISABLE_PARSE:
  *
  * Configures the inclusion of the gst-lauch parser
@@ -121,14 +110,6 @@
  */
 @GST_DISABLE_REGISTRY_DEFINE@
 
-/**
- * GST_DISABLE_XML:
- *
- * Configures the use libxml2. This setting is derived from the settings of
- * %GST_DISABLE_LOADSAVE and %GST_DISABLE_REGISTRY (in the xml registry case).
- */
-@GST_DISABLE_XML_DEFINE@
-
 /* FIXME: test and document these! */
 /* Configures the use of external plugins */
 @GST_DISABLE_PLUGIN_DEFINE@
@@ -187,15 +168,6 @@
 /* whether or not the CPU supports unaligned access */
 @GST_HAVE_UNALIGNED_ACCESS_DEFINE@
 
-/***** Deal with XML stuff, we have to handle both loadsave and registry *****/
-/* FIXME: move include to where we need it */
-/*#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )*/
-#ifndef GST_DISABLE_XML
-#else
-  /* FIXME: 0.11 (replace by GST_DISABLE_XML) */
-# define GST_DISABLE_LOADSAVE_REGISTRY
-#endif
-
 /**
  * GST_EXPORT:
  *
diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am
index 7e834048f..5a7e4bc47 100644
--- a/gst/parse/Makefile.am
+++ b/gst/parse/Makefile.am
@@ -16,7 +16,7 @@ CLEANFILES += grammar.tab.c lex._gst_parse_yy.c
 
 # can't use GST_ALL_CFLAGS here because that'd pull in -Werror
 libgstparse_la_CFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-	$(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_OPTION_CFLAGS)
+	$(GLIB_CFLAGS) $(GST_OPTION_CFLAGS)
 libgstparse_la_LIBADD = $(GST_ALL_LIBS)
 
 noinst_HEADERS = grammar.tab.h types.h
diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index e4076157f..56cad24d4 100644
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -2,7 +2,6 @@
 %define		majorminor	@GST_MAJORMINOR@
 
 %define 	_glib2		@GLIB_REQ@
-%define 	_libxml2	@LIBXML2_REQ@
 
 Name: 		%{gstreamer}
 Version: 	@VERSION@
@@ -18,7 +17,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	gstreamer-tools >= %{version}
 
 BuildRequires: 	glib2-devel >= %{_glib2}
-BuildRequires: 	libxml2-devel >= %{_libxml2}
 BuildRequires: 	bison
 BuildRequires: 	flex
 BuildRequires: 	m4
@@ -58,7 +56,6 @@ Group: 		Development/Libraries
 
 Requires: 	%{name} = %{version}-%{release}
 Requires: 	glib2-devel >= %{_glib2}
-Requires: 	libxml2-devel >= %{_libxml2}
 Requires:	check-devel
 
 %description devel
@@ -144,12 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gst-inspect-%{majorminor}
 %{_bindir}/gst-launch-%{majorminor}
 %{_bindir}/gst-typefind-%{majorminor}
-%{_bindir}/gst-xmllaunch-%{majorminor}
 %{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
 %doc %{_mandir}/man1/gst-inspect-%{majorminor}.*
 %doc %{_mandir}/man1/gst-launch-%{majorminor}.*
 %doc %{_mandir}/man1/gst-typefind-%{majorminor}.*
-%doc %{_mandir}/man1/gst-xmllaunch-%{majorminor}.*
 %doc %{_datadir}/doc/gstreamer-%{majorminor}/manual
 %doc %{_datadir}/doc/gstreamer-%{majorminor}/pwg
 %doc %{_datadir}/doc/gstreamer-%{majorminor}/faq/
@@ -169,7 +164,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gst-inspect
 %{_bindir}/gst-launch
 %{_bindir}/gst-typefind
-%{_bindir}/gst-xmllaunch
 
 %files devel
 %defattr(-, root, root, -)
diff --git a/pkgconfig/gstreamer-uninstalled.pc.in b/pkgconfig/gstreamer-uninstalled.pc.in
index 7ee1407a3..481f81ffa 100644
--- a/pkgconfig/gstreamer-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-uninstalled.pc.in
@@ -12,7 +12,7 @@ typelibdir=@abs_top_builddir@/gst
 Name: GStreamer Uninstalled
 Description: Streaming media framework, Not Installed
 Version: @VERSION@
-Requires: @GST_PKG_DEPS@@LIBXML_PKG@
+Requires: @GST_PKG_DEPS@
 Libs: @abs_top_builddir@/gst/libgstreamer-@GST_MAJORMINOR@.la
 # FIXME: the libs dir doesn't really belong here
 Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/libs -I@abs_top_builddir@ -I@abs_top_builddir@/libs
diff --git a/pkgconfig/gstreamer.pc.in b/pkgconfig/gstreamer.pc.in
index ad4554dcc..36fb2f4be 100644
--- a/pkgconfig/gstreamer.pc.in
+++ b/pkgconfig/gstreamer.pc.in
@@ -11,7 +11,7 @@ typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer
 Description: Streaming media framework
-Requires: @GST_PKG_DEPS@@LIBXML_PKG@
+Requires: @GST_PKG_DEPS@
 Version: @VERSION@
 Libs: -L${libdir} -lgstreamer-@GST_MAJORMINOR@
 Cflags: -I${includedir}
diff --git a/plugins/indexers/Makefile.am b/plugins/indexers/Makefile.am
index 12206712f..a6615dd09 100644
--- a/plugins/indexers/Makefile.am
+++ b/plugins/indexers/Makefile.am
@@ -1,24 +1,12 @@
 plugin_LTLIBRARIES = libgstcoreindexers.la
 
-# file index uses xml
-if HAVE_MMAP
-if GST_DISABLE_LOADSAVE
-GST_LOADSAVE_SRC =
-GST_FILEINDEX_LIBS =
-else
-GST_LOADSAVE_SRC = gstfileindex.c
-GST_FILEINDEX_LIBS = $(XML_LIBS)
-endif
-else
-GST_LOADSAVE_SRC =
-GST_FILEINDEX_LIBS =
-endif
+# FIXME 0.11: gstfileindex.c used libxml and mmap, rewrite using something else or remove
 
 noinst_HEADERS =		\
 	gstindexers.h
 
 libgstcoreindexers_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
-libgstcoreindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
+libgstcoreindexers_la_SOURCES = gstindexers.c gstmemindex.c
 libgstcoreindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
 libgstcoreindexers_la_LIBADD = $(GST_OBJ_LIBS) $(GST_FILEINDEX_LIBS)
 libgstcoreindexers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/plugins/indexers/gstindexers.c b/plugins/indexers/gstindexers.c
index 9513f6741..f317c320d 100644
--- a/plugins/indexers/gstindexers.c
+++ b/plugins/indexers/gstindexers.c
@@ -29,9 +29,9 @@ plugin_init (GstPlugin * plugin)
   gboolean res = TRUE;
 
   res &= gst_mem_index_plugin_init (plugin);
-#if defined(HAVE_MMAP) && !defined(GST_DISABLE_LOADSAVE)
-  res &= gst_file_index_plugin_init (plugin);
-#endif
+
+  /* FIXME 0.11: fix or remove GstFileIndex, which used mmap and libxml */
+  /* res &= gst_file_index_plugin_init (plugin); */
 
   return res;
 }
diff --git a/plugins/indexers/gstindexers.h b/plugins/indexers/gstindexers.h
index 03e8e464e..8180f8f2e 100644
--- a/plugins/indexers/gstindexers.h
+++ b/plugins/indexers/gstindexers.h
@@ -25,9 +25,7 @@ G_BEGIN_DECLS
 
 gboolean gst_mem_index_plugin_init (GstPlugin * plugin);
 
-#ifndef GST_DISABLE_LOADSAVE
-gboolean gst_file_index_plugin_init (GstPlugin * plugin);
-#endif
+/* gboolean gst_file_index_plugin_init (GstPlugin * plugin); */
 
 
 G_END_DECLS
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 0ebe34fdd..341e0bdfb 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -36,14 +36,12 @@ endif
 # Do not run the abi test in case any option which causes the API to change has
 # been used
 if FALSE
-if !GST_DISABLE_LOADSAVE
 if !GST_DISABLE_REGISTRY
 if !GST_DISABLE_TRACE
 ABI_CHECKS = gst/gstabi
 endif
 endif
 endif
-endif
 
 if FALSE
 LIBSABI_CHECKS = libs/libsabi
diff --git a/tests/check/gst/.gitignore b/tests/check/gst/.gitignore
index 2a5cec68f..6cacd55ad 100644
--- a/tests/check/gst/.gitignore
+++ b/tests/check/gst/.gitignore
@@ -41,4 +41,3 @@ gstquery
 gsttask
 *.check.xml
 gstinfo
-gstxml
diff --git a/tests/check/gst/gstxml.c b/tests/check/gst/gstxml.c
deleted file mode 100644
index ed38d2278..000000000
--- a/tests/check/gst/gstxml.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* GStreamer
- * Copyright (C) 2006 Tim-Philipp Müller <tim centricular net>
- *
- * gstxml.c: Unit test for GstXML
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-
-#include <gst/check/gstcheck.h>
-#include <string.h>
-
-#define XML_PIPELINE                                             \
-  "<?xml version=\"1.0\"?>"                                      \
-  "<gstreamer xmlns:gst=\"http://gstreamer.net/gst-core/1.0/\">" \
-  "  <gst:element>"                                              \
-  "    <gst:name>test-pipeline</gst:name>"                       \
-  "    <gst:type>pipeline</gst:type>"                            \
-  "    <gst:param>"                                              \
-  "      <gst:name>name</gst:name>"                              \
-  "      <gst:value>test-pipeline</gst:value>"                   \
-  "    </gst:param>"                                             \
-  "  </gst:element>"                                             \
-  "</gstreamer>"
-
-
-GST_START_TEST (test_pipeline_from_xml)
-{
-  GstElement *element;
-  GstXML *xml;
-  GList *elements;
-
-  xml = gst_xml_new ();
-  fail_unless (xml != NULL);
-  ASSERT_OBJECT_REFCOUNT (xml, "GstXML object after creating it", 1);
-
-  fail_unless (gst_xml_parse_memory (xml, (guchar *) XML_PIPELINE,
-          strlen (XML_PIPELINE), NULL));
-
-  elements = gst_xml_get_topelements (xml);
-  fail_unless (elements != NULL);
-  fail_unless (g_list_length (elements) == 1);
-
-  element = GST_ELEMENT (elements->data);
-  fail_unless (element != NULL);
-  fail_unless (GST_IS_PIPELINE (element));
-  fail_unless_equals_string (GST_OBJECT_NAME (element), "test-pipeline");
-
-  ASSERT_OBJECT_REFCOUNT (element, "pipeline owned by GstXML", 1);
-  gst_object_ref (element);
-  ASSERT_OBJECT_REFCOUNT (element, "pipeline after we obtained a ref", 2);
-
-  gst_object_unref (xml);
-
-  ASSERT_OBJECT_REFCOUNT (element, "pipeline after GstXML was unrefed", 1);
-  gst_object_unref (element);
-}
-
-GST_END_TEST;
-
-static Suite *
-gst_xml_suite (void)
-{
-  Suite *s = suite_create ("GstXML");
-  TCase *tc_chain = tcase_create ("xml");
-
-  tcase_set_timeout (tc_chain, 20);
-
-  suite_add_tcase (s, tc_chain);
-  tcase_add_test (tc_chain, test_pipeline_from_xml);
-  return s;
-}
-
-GST_CHECK_MAIN (gst_xml);
diff --git a/tests/check/gst/struct_arm.h b/tests/check/gst/struct_arm.h
index 23ac70ed8..3d3e133d5 100644
--- a/tests/check/gst/struct_arm.h
+++ b/tests/check/gst/struct_arm.h
@@ -67,9 +67,5 @@ GstCheckABIStruct list[] = {
   {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 152},
   {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 44},
   {"GstValueTable", sizeof (GstValueTable), 32},
-#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)
-  {"GstXML", sizeof (GstXML), 64},
-  {"GstXMLClass", sizeof (GstXMLClass), 144},
-#endif
   {NULL, 0, 0}
 };
diff --git a/tests/check/gst/struct_hppa.h b/tests/check/gst/struct_hppa.h
index f59fe07e4..b17824432 100644
--- a/tests/check/gst/struct_hppa.h
+++ b/tests/check/gst/struct_hppa.h
@@ -66,9 +66,5 @@ static GstCheckABIStruct list[] = {
   {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 152},
   {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 44},
   {"GstValueTable", sizeof (GstValueTable), 32},
-#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)
-  {"GstXML", sizeof (GstXML), 64},
-  {"GstXMLClass", sizeof (GstXMLClass), 144},
-#endif
   {NULL, 0, 0}
 };
diff --git a/tests/check/gst/struct_i386.h b/tests/check/gst/struct_i386.h
index 06de6fd1a..744b7f2f7 100644
--- a/tests/check/gst/struct_i386.h
+++ b/tests/check/gst/struct_i386.h
@@ -66,9 +66,5 @@ static GstCheckABIStruct list[] = {
  {"GstTypeFindFactoryClass", sizeof(GstTypeFindFactoryClass), 152},
  {"GstURIHandlerInterface", sizeof(GstURIHandlerInterface), 44},
  {"GstValueTable", sizeof(GstValueTable), 32},
-#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)
- {"GstXML", sizeof(GstXML), 64},
- {"GstXMLClass", sizeof(GstXMLClass), 144},
-#endif
  {NULL, 0, 0}
 };
diff --git a/tests/check/gst/struct_ppc32.h b/tests/check/gst/struct_ppc32.h
index f59fe07e4..b17824432 100644
--- a/tests/check/gst/struct_ppc32.h
+++ b/tests/check/gst/struct_ppc32.h
@@ -66,9 +66,5 @@ static GstCheckABIStruct list[] = {
   {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 152},
   {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 44},
   {"GstValueTable", sizeof (GstValueTable), 32},
-#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)
-  {"GstXML", sizeof (GstXML), 64},
-  {"GstXMLClass", sizeof (GstXMLClass), 144},
-#endif
   {NULL, 0, 0}
 };
diff --git a/tests/check/gst/struct_ppc64.h b/tests/check/gst/struct_ppc64.h
index 4bb20fa9e..259f90264 100644
--- a/tests/check/gst/struct_ppc64.h
+++ b/tests/check/gst/struct_ppc64.h
@@ -66,9 +66,5 @@ static GstCheckABIStruct list[] = {
   {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 304} ,
   {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 88} ,
   {"GstValueTable", sizeof (GstValueTable), 64} ,
-#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)
-  {"GstXML", sizeof (GstXML), 128} ,
-  {"GstXMLClass", sizeof (GstXMLClass), 288} ,
-#endif
   {NULL, 0, 0}
 };
diff --git a/tests/check/gst/struct_sparc.h b/tests/check/gst/struct_sparc.h
index 23ac70ed8..3d3e133d5 100644
--- a/tests/check/gst/struct_sparc.h
+++ b/tests/check/gst/struct_sparc.h
@@ -67,9 +67,5 @@ GstCheckABIStruct list[] = {
   {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 152},
   {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 44},
   {"GstValueTable", sizeof (GstValueTable), 32},
-#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)
-  {"GstXML", sizeof (GstXML), 64},
-  {"GstXMLClass", sizeof (GstXMLClass), 144},
-#endif
   {NULL, 0, 0}
 };
diff --git a/tests/check/gst/struct_x86_64.h b/tests/check/gst/struct_x86_64.h
index e03509043..51f010b4e 100644
--- a/tests/check/gst/struct_x86_64.h
+++ b/tests/check/gst/struct_x86_64.h
@@ -80,9 +80,5 @@ static GstCheckABIStruct list[] = {
   {"GstTypeNameData", sizeof (GstTypeNameData), 16},
   {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 88},
   {"GstValueTable", sizeof (GstValueTable), 64},
-#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)
-  {"GstXML", sizeof (GstXML), 128} ,
-  {"GstXMLClass", sizeof (GstXMLClass), 288} ,
-#endif
   {NULL, 0, 0}
 };
diff --git a/tests/examples/manual/Makefile.am b/tests/examples/manual/Makefile.am
index d06e0d6a6..d180a9489 100644
--- a/tests/examples/manual/Makefile.am
+++ b/tests/examples/manual/Makefile.am
@@ -37,8 +37,7 @@ EXAMPLES = \
 	typefind \
 	fakesrc \
 	playbin \
-	decodebin \
-	$(GST_LOADSAVE_SRC)
+	decodebin
 
 BUILT_SOURCES = \
 	elementmake.c elementcreate.c elementget.c elementlink.c elementfactory.c \
diff --git a/tools/.gitignore b/tools/.gitignore
index 648e217fd..19293a95c 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -6,7 +6,6 @@ Makefile.in
 *.la
 .deps
 .libs
-*.xml
 *.bb
 *.bbg
 *.da
@@ -15,13 +14,11 @@ Makefile.in
 gst-inspect
 gst-launch
 gst-typefind
-gst-xmllaunch
 gst-inspect.1
 gst-launch.1
 gst-typefind.1
-gst-xmllaunch.1
 
 gst-inspect-?.?*
 gst-launch-?.?*
 gst-typefind-?.?*
-gst-xmllaunch-?.?*
+
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f966156c5..61e8fb588 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,14 +1,5 @@
 ### assemble a list of programs we want to build and install
 
-if GST_DISABLE_LOADSAVE
-GST_LOADSAVE_SRC = 
-GST_LOADSAVE_SRC_V = 
-else
-GST_LOADSAVE_SRC = gst-xmllaunch
-GST_LOADSAVE_SRC_V = \
-	gst-xmllaunch-@GST_MAJORMINOR@
-endif
-
 if GST_DISABLE_PARSE
 GST_PARSE_SRC = 
 GST_PARSE_SRC_V = 
@@ -27,17 +18,10 @@ GST_OTHER_SRC_V = \
 
 ### so all of the programs we want to build
 bin_PROGRAMS = \
-	$(GST_LOADSAVE_SRC) $(GST_LOADSAVE_SRC_V) \
 	$(GST_PARSE_SRC) $(GST_PARSE_SRC_V) \
 	$(GST_OTHER_SRC) $(GST_OTHER_SRC_V)
 
 # make sure each versioned tool has the right source file and flags
-if !GST_DISABLE_LOADSAVE
-gst_xmllaunch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
-gst_xmllaunch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) -UGST_DISABLE_DEPRECATED
-gst_xmllaunch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
-endif
-
 if !GST_DISABLE_PARSE
 gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
 gst_launch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) -UGST_DISABLE_DEPRECATED
@@ -52,10 +36,6 @@ gst_typefind_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
 gst_typefind_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
 
 # make sure each unversioned tool comes from gst-run.c
-if !GST_DISABLE_LOADSAVE
-gst_xmllaunch_SOURCES = gst-run.c
-endif
-
 if !GST_DISABLE_PARSE
 gst_launch_SOURCES = gst-run.c
 endif
@@ -85,13 +65,6 @@ Android.mk: Makefile.am
 	> $@
 
 ### man pages we want to install
-if GST_DISABLE_LOADSAVE
-GST_LOADSAVE_MAN=
-else
-GST_LOADSAVE_MAN = \
-	gst-xmllaunch-@GST_MAJORMINOR@.1
-endif
-
 if GST_DISABLE_PARSE
 GST_PARSE_MAN=
 else
@@ -104,7 +77,7 @@ GST_OTHER_MAN = \
 	gst-inspect-@GST_MAJORMINOR@.1 \
 	gst-typefind-@GST_MAJORMINOR@.1
 
-manpages = $(GST_LOADSAVE_MAN) $(GST_PARSE_MAN) $(GST_OTHER_MAN)
+manpages = $(GST_PARSE_MAN) $(GST_OTHER_MAN)
 
 CLEANFILES = $(manpages) *.gcno *.gcda
 man_MANS = $(manpages)
@@ -119,7 +92,6 @@ EXTRA_DIST = \
 	gst-inspect.1.in \
 	gst-launch.1.in \
 	gst-typefind.1.in \
-	gst-xmllaunch.1.in \
 	gst-plot-timeline.py
 
 %-@GST_MAJORMINOR@.1: %.1.in
@@ -127,7 +99,6 @@ EXTRA_DIST = \
 		-e s,gst-inspect,gst-inspect-@GST_MAJORMINOR@,g \
 		-e s,gst-launch,gst-launch-@GST_MAJORMINOR@,g \
 		-e s,gst-typefind,gst-typefind-@GST_MAJORMINOR@,g \
-		-e s,gst-xmllaunch,gst-xmllaunch-@GST_MAJORMINOR@,g \
 		-e s,GST_MAJORMINOR,@GST_MAJORMINOR@,g \
 		$< >$@
 
diff --git a/tools/gst-launch.1.in b/tools/gst-launch.1.in
index 4027b50ed..e6702f4be 100644
--- a/tools/gst-launch.1.in
+++ b/tools/gst-launch.1.in
@@ -48,9 +48,6 @@ shut down forcefully via Control-C.
 Gather and print index statistics. This is mostly useful for playback or
 recording pipelines.
 .TP 8
-.B  \-o FILE, \-\-output=FILE
-Save XML representation of pipeline to FILE and exit (DEPRECATED, DO NOT USE)
-.TP 8
 .B  \-f, \-\-no\-fault
 Do not install a fault handler
 .TP 8
@@ -414,7 +411,7 @@ When set to a filesystem path, store dot files of pipeline graphs there.
 .TP
 \fBGST_REGISTRY\fR
 Path of the plugin registry file. Default is
-~/.gstreamer-GST_MAJORMINOR/registry-CPU.xml where CPU is the machine/cpu type
+~/.gstreamer-GST_MAJORMINOR/registry-CPU.bin where CPU is the machine/cpu type
 GStreamer was compiled for, e.g. 'i486', 'i686', 'x86-64', 'ppc', etc. (check
 the output of "uname -i" and "uname -m" for details).
 .TP
@@ -451,8 +448,8 @@ a stack trace in the usual way.
 .
 .SH FILES
 .TP 8
-~/.gstreamer-GST_MAJORMINOR/registry-*.xml
-The xml plugin database; can be deleted at any time, will be re-created
+~/.gstreamer-GST_MAJORMINOR/registry-*.bin
+The plugin cache; can be deleted at any time, will be re-created
 automatically when it does not exist yet or plugins change.
 .
 .SH "SEE ALSO"
diff --git a/tools/gst-xmllaunch.1.in b/tools/gst-xmllaunch.1.in
deleted file mode 100644
index 9bf901254..000000000
--- a/tools/gst-xmllaunch.1.in
+++ /dev/null
@@ -1,69 +0,0 @@
-.TH "GStreamer" "1" "March 2001"
-.SH "NAME"
-gst\-xmllaunch \- build and run a GStreamer pipeline from an XML serialization
-.SH "SYNOPSIS"
-\fBgst\-xmllaunch\fR \fI[OPTION...]\fR XML\-FILE [ ELEMENT.PROPERTY=VALUE ... ]
-.SH "DESCRIPTION"
-.LP 
-\fIgst\-xmllaunch\fP is a tool that is used to build and run a basic
-\fIGStreamer\fP pipeline, loading it from an XML description. You can
-produce the XML description using gst-launch(1) with the -o option or by
-calling gst_xml_write_file() in your own app.
-
-A simple commandline looks like:
-
- gst\-xmllaunch my\-pipeline.xml filesrc0.location=music.mp3
-
-This sets the location property of the element named filesrc0 to the value
-"music.mp3". See gst\-launch(1) for syntax on setting element names, and
-gst\-inspect to see what properties various elements have.
-
-You can pass "-" as the XML\-FILE to read from stdin.
-
-XML\-FILE can be a URI as well, thanks to the wizardry of libxml. I'm not really
-sure what all is supported, it seems http works just fine though.
-
-.
-.SH "WARNING"
-\fIgst\-xmllaunch\fP is deprecated and broken for all but the most simple
-pipelines. It will most likely be removed in future. Don't use it.
-.
-.SH "OPTIONS"
-.l
-\fIgst\-xmllaunch\fP accepts the following options:
-.TP 8
-.B  \-\-help
-Print help synopsis and available FLAGS
-.TP 8
-.B  \-\-silent
-Do not output status information
-.TP 8
-.B  \-\-exclude=TYPE, \-XTYPE
-Do not output status information of TYPE
-.TP 8
-.B  \-\-output=FILE, \-oFILE
-Save XML representation of pipeline to FILE and exit
-.TP 8
-.B  \-\-gst\-info\-mask=FLAGS
-\fIGStreamer\fP info flags to set (list with \-\-help)
-.TP 8
-.B  \-\-gst\-debug\-mask=FLAGS
-\fIGStreamer\fP debugging flags to set (list with \-\-help)
-.TP 8
-.B  \-\-gst\-mask=FLAGS
-\fIGStreamer\fP info and debugging flags to set (list with \-\-help)
-.TP 8
-.B  \-\-gst\-plugin\-spew
-\fIGStreamer\fP info flags to set
-Enable printout of errors while loading \fIGStreamer\fP plugins
-.TP 8
-.B  \-\-gst\-plugin\-path=PATH
-Add directories separated with ':' to the plugin search path
-.
-.SH "SEE ALSO"
-.BR gst\-feedback (1),
-.BR gst\-inspect (1),
-.BR gst\-launch (1),
-.BR gst\-typefind (1)
-.SH "AUTHOR"
-The GStreamer team at http://gstreamer.freedesktop.org/