Bug 683416 - B: Remove files formerly used for standalone Necko and standalone Transformiix XSLT; r=khuey
authorEd Morley <bmo@edmorley.co.uk>
Thu, 01 Sep 2011 17:44:28 +0100
changeset 76399 0c97e9647100cd33a73725b06e66c175f06b3a69
parent 76398 df264cbf7b9cbbdba635420da8d9e64529b77ca2
child 76400 962b157801a617de3a24c8b1139751d6d2bd83e5
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewerskhuey
bugs683416
milestone9.0a1
Bug 683416 - B: Remove files formerly used for standalone Necko and standalone Transformiix XSLT; r=khuey
content/xslt/build.mk
content/xslt/confvars.sh
content/xslt/src/base/txSimpleErrorObserver.cpp
content/xslt/src/base/txStringUtils.cpp
content/xslt/src/main/Makefile.in
content/xslt/src/main/testXalan.cpp
content/xslt/src/main/transformiix.cpp
content/xslt/src/main/txTestExpr.cpp
content/xslt/src/main/txXSLTMarkDriver.cpp
content/xslt/src/xml/txAttr.cpp
content/xslt/src/xml/txDocument.cpp
content/xslt/src/xml/txElement.cpp
content/xslt/src/xml/txNodeDefinition.cpp
content/xslt/src/xml/txProcessingInstruction.cpp
content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp
content/xslt/src/xslt/txHTMLOutput.cpp
content/xslt/src/xslt/txHTMLOutput.h
content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
content/xslt/src/xslt/txStandaloneStylesheetCompiler.h
content/xslt/src/xslt/txStandaloneXSLTProcessor.cpp
content/xslt/src/xslt/txStandaloneXSLTProcessor.h
content/xslt/src/xslt/txTextOutput.cpp
content/xslt/src/xslt/txTextOutput.h
content/xslt/src/xslt/txXMLOutput.cpp
content/xslt/src/xslt/txXMLOutput.h
netwerk/build.mk
netwerk/confvars.sh
deleted file mode 100644
--- a/content/xslt/build.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla build system.
-#
-# The Initial Developer of the Original Code is
-# the Mozilla Foundation <http://www.mozilla.org/>.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-include $(topsrcdir)/config/nspr/build.mk
-include $(topsrcdir)/xpcom/build.mk
-
-TIERS += app
-
-tier_app_dirs += \
-	parser/expat \
-	content/xslt/src \
-	$(NULL)
deleted file mode 100755
--- a/content/xslt/confvars.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Build System
-#
-# The Initial Developer of the Original Code is
-# Ben Turner <mozilla@songbirdnest.com>
-#
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-MOZ_APP_NAME=mozilla
-MOZ_EXTENSIONS_DEFAULT=""
-MOZ_XSLT_STANDALONE=1
-MOZ_APP_VERSION=$MOZILLA_VERSION
deleted file mode 100644
--- a/content/xslt/src/base/txSimpleErrorObserver.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * The MITRE Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Keith Visco <kvisco@ziplink.net> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txErrorObserver.h"
-#include "nsString.h"
-
-/**
- * Creates a new SimpleErrorObserver.
- * All errors will be printed to the console (cout).
-**/
-SimpleErrorObserver::SimpleErrorObserver() {
-#ifdef TX_EXE
-    errStream = &cout;
-#endif
-    hideWarnings = MB_FALSE;
-} //-- SimpleErrorObserver
-
-/**
- * Creates a new SimpleErrorObserver.
- * All errors will be printed to the given ostream.
-**/
-SimpleErrorObserver::SimpleErrorObserver(ostream& errStream) {
-    this->errStream = &errStream;
-    hideWarnings = MB_FALSE;
-} //-- SimpleErrorObserver
-
-/**
- *  Notifies this Error observer of a new error using the given error level
-**/
-void SimpleErrorObserver::receiveError(const nsAString& errorMessage,
-                                       nsresult aRes)
-{
-#ifdef TX_EXE
-    if (NS_FAILED(aRes)) {
-        *errStream << "error: ";
-    }
-
-    *errStream << NS_LossyConvertUTF16toASCII(errorMessage).get() << endl;
-    errStream->flush();
-#endif
-}
-
-void SimpleErrorObserver::suppressWarnings(MBool suppress) {
-    this->hideWarnings = suppress;
-} //-- suppressWarnings
deleted file mode 100644
--- a/content/xslt/src/base/txStringUtils.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Axel Hecht <axel@pike.org>
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txStringUtils.h"
-#include "nsDependentString.h"
-
-int
-txCaseInsensitiveStringComparator::operator()(const char_type* lhs,
-                                              const char_type* rhs,
-                                              PRUint32 aLength ) const
-{
-  PRUnichar thisChar, otherChar;
-  PRUint32 compLoop = 0;
-  while (compLoop < aLength) {
-    thisChar = lhs[compLoop];
-    if ((thisChar >= 'A') && (thisChar <= 'Z')) {
-      thisChar += 32;
-    }
-    otherChar = rhs[compLoop];
-    if ((otherChar >= 'A') && (otherChar <= 'Z')) {
-      otherChar += 32;
-    }
-    if (thisChar != otherChar) {
-      return thisChar - otherChar;
-    }
-    ++compLoop;
-  }
-  return 0;
-
-}
-
-int
-txCaseInsensitiveStringComparator::operator()(char_type lhs,
-                                              char_type rhs) const
-{
-  if (lhs >= 'A' && lhs <= 'Z') {
-    lhs += 32;
-  }
-  if (rhs >= 'A' && rhs <= 'Z') {
-    rhs += 32;
-  }
-  return lhs - rhs;
-} 
-
-/**
- * A character sink for case conversion.
- */
-class ConvertToLowerCase
-{
-public:
-  typedef PRUnichar value_type;
-
-  void write( const PRUnichar* aSource, PRUint32 aSourceLength)
-  {
-    PRUnichar* cp = const_cast<PRUnichar*>(aSource);
-    const PRUnichar* end = aSource + aSourceLength;
-    while (cp != end) {
-      PRUnichar ch = *cp;
-      if ((ch >= 'A') && (ch <= 'Z'))
-        *cp = ch + ('a' - 'A');
-      ++cp;
-    }
-  }
-};
-
-void TX_ToLowerCase(nsAString& aString)
-{
-  nsAString::iterator fromBegin, fromEnd;
-  ConvertToLowerCase converter;
-  copy_string(aString.BeginWriting(fromBegin), aString.EndWriting(fromEnd),
-              converter);
-}
-
-/**
- * A character sink for copying with case conversion.
- */
-class CopyToLowerCase
-{
-public:
-  typedef PRUnichar value_type;
-
-  CopyToLowerCase(nsAString::iterator& aDestIter) : mIter(aDestIter)
-  {
-  }
-
-  void write(const PRUnichar* aSource, PRUint32 aSourceLength)
-  {
-    PRUint32 len = NS_MIN(PRUint32(mIter.size_forward()), aSourceLength);
-    PRUnichar* cp = mIter.get();
-    const PRUnichar* end = aSource + len;
-    while (aSource != end) {
-      PRUnichar ch = *aSource;
-      if ((ch >= 'A') && (ch <= 'Z'))
-        *cp = ch + ('a' - 'A');
-      else
-        *cp = ch;
-      ++aSource;
-      ++cp;
-    }
-    mIter.advance(len);
-  }
-
-protected:
-  nsAString::iterator& mIter;
-};
-
-void TX_ToLowerCase(const nsAString& aSource, nsAString& aDest)
-{
-  nsAString::const_iterator fromBegin, fromEnd;
-  nsAString::iterator toBegin;
-  if (!EnsureStringLength(aDest, aSource.Length()))
-    return; // XXX no way to signal out-of-memory
-  CopyToLowerCase converter(aDest.BeginWriting(toBegin));
-  copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd),
-              converter);
-}
deleted file mode 100644
--- a/content/xslt/src/main/Makefile.in
+++ /dev/null
@@ -1,80 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is TransforMiiX XSLT processor code.
-#
-# The Initial Developer of the Original Code is
-# Axel Hecht.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Axel Hecht <axel@pike.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH           = ../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MOZILLA_INTERNAL_API = 1
-SIMPLE_PROGRAMS = transformiix$(BIN_SUFFIX) testXalan$(BIN_SUFFIX) \
-                  txTestExpr$(BIN_SUFFIX)
-ifdef MARK_INC
-SIMPLE_PROGRAMS += txXSLTMarkDriver$(BIN_SUFFIX)
-endif
-
-
-CPP_PROG_LINK          = 1
-
-TX_LIBS = \
-	txxslt_s \
-	txxpath_s \
-	txxml_s \
-	txbase_s \
-	mozexpat_s \
-	$(NULL)
-
-LIBS = \
-	$(addprefix $(DIST)/lib/$(LIB_PREFIX),$(addsuffix .$(LIB_SUFFIX),$(TX_LIBS))) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
-ifdef MOZ_JPROF
-LIBS         += -ljprof
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES += \
-	-I$(srcdir)/../base \
-	-I$(srcdir)/../xml \
-  -I$(srcdir)/../xpath \
-	-I$(srcdir)/../xslt \
-	$(MARK_INC) \
-	$(NULL)
deleted file mode 100644
--- a/content/xslt/src/main/testXalan.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Axel Hecht.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Axel Hecht <axel@pike.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txStandaloneXSLTProcessor.h"
-#include "nsXPCOM.h"
-#include <fstream.h>
-#include "nsDoubleHashtable.h"
-#include "nsIComponentManager.h"
-#include "nsILocalFile.h"
-#include "nsISimpleEnumerator.h"
-#include "nsString.h"
-#include "prenv.h"
-#include "prsystem.h"
-#include "nsDirectoryServiceUtils.h"
-#include "nsDirectoryServiceDefs.h"
-
-#ifdef NS_TRACE_MALLOC
-#include "nsTraceMalloc.h"
-#endif
-#ifdef MOZ_JPROF
-#include "jprof.h"
-#endif
-
-/**
- * Prints the command line help screen to the console
- */
-void printHelp()
-{
-  cerr << "testXalan [-o output-file] [category]*" << endl << endl;
-  cerr << "Options:";
-  cerr << endl << endl;
-  cerr << "\t-o  specify output file (default: write to stdout)";
-  cerr << endl << endl;
-  cerr << "\t Specify XALAN_DIR in your environement." << endl;
-  cerr << endl;
-}
-
-/**
- * Helper class to report success and failure to RDF
- */
-class txRDFOut
-{
-public:
-    explicit txRDFOut(ostream* aOut)
-        : mOut(aOut), mSuccess(0), mFail(0), mParent(nsnull)
-    {
-    }
-    explicit txRDFOut(const nsACString& aName, txRDFOut* aParent)
-        : mName(aName), mOut(aParent->mOut), mSuccess(0), mFail(0),
-          mParent(aParent)
-    {
-    }
-    ~txRDFOut()
-    {
-        *mOut << "  <RDF:Description about=\"urn:x-buster:conf" <<
-            mName.get() <<
-            "\">\n" <<
-            "    <NC:orig_succCount NC:parseType=\"Integer\">" <<
-            mSuccess <<
-            "</NC:orig_succCount>\n" <<
-            "    <NC:orig_failCount NC:parseType=\"Integer\">" <<
-            mFail <<
-            "</NC:orig_failCount>\n" <<
-            "  </RDF:Description>" << endl;
-    }
-
-    void feed(const nsACString& aTest, PRBool aSuccess)
-    {
-        *mOut << "  <RDF:Description about=\"urn:x-buster:" <<
-            PromiseFlatCString(aTest).get() <<
-            "\"\n                   NC:orig_succ=\"";
-        if (aSuccess) {
-            *mOut << "yes";
-            succeeded();
-        }
-        else {
-            *mOut << "no";
-            failed();
-        }
-        *mOut << "\" />\n";
-    }
-
-    void succeeded()
-    {
-        if (mParent)
-            mParent->succeeded();
-        ++mSuccess;
-    }
-    void failed()
-    {
-        if (mParent)
-            mParent->failed();
-        ++mFail;
-    }
-private:
-    nsCAutoString mName;
-    ostream* mOut;
-    PRUint32 mSuccess, mFail;
-    txRDFOut* mParent;
-};
-
-static void
-readToString(istream& aIstream, nsACString& aString)
-{
-    static char buffer[1024];
-    int read = 0;
-    do {
-        aIstream.read(buffer, 1024);
-        read = aIstream.gcount();
-        aString.Append(Substring(buffer, buffer + read));
-    } while (!aIstream.eof());
-}
-
-/**
- * Get the XALAN_DIR environment variable and return a nsIFile for
- * the conf and the conf-gold subdirectory. Create a TEMP file, too.
- * Return an error if either does not exist.
- */
-static nsresult
-setupXalan(const char* aPath, nsIFile** aConf, nsIFile** aConfGold,
-           nsIFile** aTemp)
-{
-    nsresult rv;
-    nsCOMPtr<nsILocalFile> conf(do_CreateInstance(NS_LOCAL_FILE_CONTRACTID,
-                                                  &rv));
-    NS_ENSURE_SUCCESS(rv, rv);
-    nsCOMPtr <nsIFile> tmpFile;
-    rv = NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(tmpFile));
-    NS_ENSURE_SUCCESS(rv, rv);
-    tmpFile->Append(NS_LITERAL_STRING("xalan.out"));
-    rv = tmpFile->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
-    rv = conf->InitWithNativePath(nsDependentCString(aPath));
-    NS_ENSURE_SUCCESS(rv, rv);
-    nsCOMPtr<nsIFile> gold;
-    rv = conf->Clone(getter_AddRefs(gold));
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = conf->Append(NS_LITERAL_STRING("conf"));
-    NS_ENSURE_SUCCESS(rv, rv);
-    PRBool isDir;
-    rv = conf->IsDirectory(&isDir);
-    if (NS_FAILED(rv) || !isDir) {
-        return NS_ERROR_FILE_NOT_DIRECTORY;
-    }
-    rv = gold->Append(NS_LITERAL_STRING("conf-gold"));
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = gold->IsDirectory(&isDir);
-    if (NS_FAILED(rv) || !isDir || !conf || !gold) {
-        return NS_ERROR_FILE_NOT_DIRECTORY;
-    }
-    // got conf and conf-gold subdirectories
-    *aConf = conf;
-    NS_ADDREF(*aConf);
-    *aConfGold = gold;
-    NS_ADDREF(*aConfGold);
-    *aTemp = tmpFile;
-    NS_ADDREF(*aTemp);
-    return NS_OK;
-}
-
-/**
- * Run a category of Xalan tests
- */
-void runCategory(nsIFile* aConfCat, nsIFile* aGoldCat, nsIFile* aRefTmp,
-                 txRDFOut* aOut)
-{
-    nsresult rv;
-    //clone the nsIFiles, so that we can return easily
-    nsCOMPtr<nsIFile> conf, gold;
-    aConfCat->Clone(getter_AddRefs(conf));
-    aGoldCat->Clone(getter_AddRefs(gold));
-    nsCAutoString catName, refTmp;
-    conf->GetNativeLeafName(catName);
-    aRefTmp->GetNativePath(refTmp);
-    txRDFOut results(catName, aOut);
-    nsCOMPtr<nsISimpleEnumerator> tests;
-    rv = conf->GetDirectoryEntries(getter_AddRefs(tests));
-    if (NS_FAILED(rv))
-        return;
-    PRBool hasMore, isFile;
-    nsCAutoString leaf;
-    NS_NAMED_LITERAL_CSTRING(xsl, ".xsl");
-    while (NS_SUCCEEDED(tests->HasMoreElements(&hasMore)) && hasMore) {
-        nsCOMPtr<nsILocalFile> test;
-        tests->GetNext(getter_AddRefs(test));
-        test->GetNativeLeafName(leaf);
-        if (xsl.Equals(Substring(leaf, leaf.Length()-4, 4))) {
-            // we have a stylesheet, let's look for source and reference
-            nsAFlatCString::char_iterator start, ext;
-            leaf.BeginWriting(start);
-            leaf.EndWriting(ext);
-            ext -= 2;
-            // overwrite extension with .xml
-            *ext = 'm'; // this one was easy
-            nsCOMPtr<nsIFile> source;
-            conf->Clone(getter_AddRefs(source));
-            rv = source->AppendNative(leaf);
-            if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(source->IsFile(&isFile)) &&
-                isFile) {
-                nsCOMPtr<nsIFile> reference;
-                gold->Clone(getter_AddRefs(reference));
-                // overwrite extension with .out
-                --ext;
-                nsCharTraits<char>::copy(ext, "out", 3);
-                rv = reference->AppendNative(leaf);
-                if (NS_SUCCEEDED(rv) &&
-                    NS_SUCCEEDED(reference->IsFile(&isFile)) &&
-                    isFile) {
-                    nsCAutoString src, style, refPath;
-                    test->GetNativePath(style);
-                    source->GetNativePath(src);
-                    reference->GetNativePath(refPath);
-                    if (PR_GetDirectorySeparator() =='\\') {
-                        src.ReplaceChar('\\','/');
-                        style.ReplaceChar('\\','/');
-                        refPath.ReplaceChar('\\','/');
-                    }
-                    SimpleErrorObserver obs;
-                    txStandaloneXSLTProcessor proc;
-                    fstream result(refTmp.get(),
-                                   ios::in | ios::out | ios::trunc);
-                    rv = proc.transform(src, style, result, obs);
-                    PRBool success = PR_FALSE;
-                    if (NS_SUCCEEDED(rv)) {
-                        result.flush();
-                        PRInt64 resultSize, refSize;
-                        aRefTmp->GetFileSize(&resultSize);
-                        reference->GetFileSize(&refSize);
-                        result.seekg(0);
-                        int toread = (int)resultSize;
-                        nsCString resContent, refContent;
-                        resContent.SetCapacity(toread);
-                        readToString(result, resContent);
-                        result.close();
-                        ifstream refStream(refPath.get());
-                        toread = (int)refSize;
-                        refContent.SetCapacity(toread);
-                        readToString(refStream, refContent);
-                        refStream.close();
-                        success = resContent.Equals(refContent);
-                    }
-                    ext--;
-                    results.feed(Substring(start, ext), success);
-                }
-            }
-        }
-    }
-}
-/**
- * The Xalan testcases app
- */
-int main(int argc, char** argv)
-{
-#ifdef NS_TRACE_MALLOC
-    NS_TraceMallocStartupArgs(argc, argv);
-#endif
-#ifdef MOZ_JPROF
-    setupProfilingStuff();
-#endif
-    char* xalan = PR_GetEnv("XALAN_DIR");
-    if (!xalan) {
-        printHelp();
-        return 1;
-    }
-    nsresult rv;
-    rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsIFile> conf, gold, resFile;
-    rv = setupXalan(xalan, getter_AddRefs(conf), getter_AddRefs(gold),
-                    getter_AddRefs(resFile));
-    if (NS_FAILED(rv)) {
-        NS_ShutdownXPCOM(nsnull);
-        printHelp();
-        return -1;
-    }
-
-    //-- handle output stream
-    ostream* resultOutput = &cout;
-    ofstream resultFileStream;
-
-    int argn = 1;
-    // skip -- gnu style options
-    while (argn < argc) {
-        nsDependentCString opt(argv[argn]);
-        if (!Substring(opt, 0, 2).EqualsLiteral("--")) {
-            break;
-        }
-        ++argn;
-    }
-    if (argn < argc) {
-        nsDependentCString opt(argv[argn]);
-        if (Substring(opt, 0, 2).EqualsLiteral("-o")) {
-            if (opt.Length() > 2) {
-                const nsAFlatCString& fname = 
-                    PromiseFlatCString(Substring(opt, 2, opt.Length()-2));
-                resultFileStream.open(fname.get(), ios::out);
-            }
-            else {
-                ++argn;
-                if (argn < argc) {
-                    resultFileStream.open(argv[argn], ios::out);
-                }
-            }
-            if (!resultFileStream) {
-                cerr << "error opening output file" << endl;
-                PRBool exists;
-                if (NS_SUCCEEDED(resFile->Exists(&exists)) && exists)
-                    resFile->Remove(PR_FALSE);
-                NS_ShutdownXPCOM(nsnull);
-                return -1;
-            }
-            ++argn;
-            resultOutput = &resultFileStream;
-        }
-    }
-
-    if (!txXSLTProcessor::init()) {
-        PRBool exists;
-        if (NS_SUCCEEDED(resFile->Exists(&exists)) && exists)
-            resFile->Remove(PR_FALSE);
-        NS_ShutdownXPCOM(nsnull);
-        return 1;
-    }
-
-    *resultOutput << "<?xml version=\"1.0\"?>\n" << 
-        "<RDF:RDF xmlns:NC=\"http://home.netscape.com/NC-rdf#\"\n" <<
-        "         xmlns:RDF=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">" << endl;
-
-    txRDFOut* rdfOut = new txRDFOut(resultOutput);
-    nsCOMPtr<nsIFile> tempFile;
-    if (argn < argc) {
-        // categories are specified
-        while (argn < argc) {
-            nsDependentCString cat(argv[argn++]);
-            rv = conf->AppendNative(cat);
-            if (NS_SUCCEEDED(rv)) {
-                rv = gold->AppendNative(cat);
-                if (NS_SUCCEEDED(rv)) {
-                    runCategory(conf, gold, resFile, rdfOut);
-                    rv = gold->GetParent(getter_AddRefs(tempFile));
-                    NS_ASSERTION(NS_SUCCEEDED(rv), "can't go back?");
-                    gold = tempFile;
-                }
-                rv = conf->GetParent(getter_AddRefs(tempFile));
-                NS_ASSERTION(NS_SUCCEEDED(rv), "can't go back?");
-                conf = tempFile;
-            }
-        }
-    }
-    else {
-        // no category specified, do everything
-        nsCOMPtr<nsISimpleEnumerator> cats;
-        rv = conf->GetDirectoryEntries(getter_AddRefs(cats));
-        PRBool hasMore, isDir;
-        nsCAutoString leaf;
-        while (NS_SUCCEEDED(cats->HasMoreElements(&hasMore)) && hasMore) {
-            nsCOMPtr<nsILocalFile> cat;
-            cats->GetNext(getter_AddRefs(cat));
-            rv = cat->IsDirectory(&isDir);
-            if (NS_SUCCEEDED(rv) && isDir) {
-                rv = cat->GetNativeLeafName(leaf);
-                if (NS_SUCCEEDED(rv) && 
-                    !leaf.EqualsLiteral("CVS")) {
-                    rv = gold->AppendNative(leaf);
-                    if (NS_SUCCEEDED(rv)) {
-                        runCategory(cat, gold, resFile, rdfOut);
-                        rv = gold->GetParent(getter_AddRefs(tempFile));
-                        gold = tempFile;
-                    }
-                }
-            }
-        }
-    }
-    delete rdfOut;
-    rdfOut = nsnull;
-    *resultOutput << "</RDF:RDF>" << endl;
-    PRBool exists;
-    if (NS_SUCCEEDED(resFile->Exists(&exists)) && exists)
-        resFile->Remove(PR_FALSE);
-    resultFileStream.close();
-    txXSLTProcessor::shutdown();
-    rv = NS_ShutdownXPCOM(nsnull);
-#ifdef NS_TRACE_MALLOC
-    NS_TraceMallocShutdown();
-#endif
-    NS_ENSURE_SUCCESS(rv, rv);
-    return 0;
-}
deleted file mode 100644
--- a/content/xslt/src/main/transformiix.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * The MITRE Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txStandaloneXSLTProcessor.h"
-#include "nsXPCOM.h"
-#include <fstream.h>
-#include "nsDoubleHashtable.h"
-#include "nsTArray.h"
-#ifdef MOZ_JPROF
-#include "jprof.h"
-#endif
-
-/**
- * Prints the command line help screen to the console
- */
-void printHelp()
-{
-  cerr << "transfrmx [-h] [-i xml-file] [-s xslt-file] [-o output-file]" << endl << endl;
-  cerr << "Options:";
-  cerr << endl << endl;
-  cerr << "\t-i  specify XML file to process" << endl;
-  cerr << "\t-s  specify XSLT file to use for processing (default: use stylesheet" << endl
-       << "\t\tspecified in XML file)" << endl;
-  cerr << "\t-o  specify output file (default: write to stdout)" << endl;
-  cerr << "\t-h  this help screen" << endl;
-  cerr << endl;
-  cerr << "You may use '-' in place of the output-file to explicitly specify" << endl;
-  cerr << "standard output." << endl;
-  cerr << endl;
-}
-
-/**
- * Prints the command line usage information to the console
- */
-void printUsage()
-{
-  cerr << "transfrmx [-h] [-i xml-file] [-s xslt-file] [-o output-file]" << endl << endl;
-  cerr << "For more infomation use the -h flag" << endl;
-}
-
-class txOptionEntry : public PLDHashCStringEntry
-{
-public:
-    txOptionEntry(const void* aKey) : PLDHashCStringEntry(aKey)
-    {
-    }
-    nsTArray<nsCString> mValues;
-};
-
-DECL_DHASH_WRAPPER(txOptions, txOptionEntry, nsACString&)
-DHASH_WRAPPER(txOptions, txOptionEntry, nsACString&)
-
-/**
- * Parses the command line
- */
-void parseCommandLine(int argc, char** argv, txOptions& aOptions)
-{
-    nsCAutoString flag;
-
-    for (int i = 1; i < argc; ++i) {
-        nsDependentCString arg(argv[i]);
-        if (*argv[i] == '-' && arg.Length() > 1) {
-            // clean up previous flag
-            if (!flag.IsEmpty()) {
-                aOptions.AddEntry(flag);
-                flag.Truncate();
-            }
-
-            // get next flag
-            flag = Substring(arg, 1, arg.Length() - 1);
-        }
-        else {
-            txOptionEntry* option = aOptions.AddEntry(flag);
-            if (option) {
-                option->mValues.AppendElement(nsCString(arg));
-            }
-            flag.Truncate();
-        }
-    }
-
-    if (!flag.IsEmpty()) {
-        aOptions.AddEntry(flag);
-    }
-}
-
-/**
- * The TransforMiiX command line interface
- */
-int main(int argc, char** argv)
-{
-    using namespace std;
-    nsresult rv;
-#ifdef MOZ_JPROF
-    setupProfilingStuff();
-#endif
-    rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (!txXSLTProcessor::init())
-        return 1;
-
-    txOptions options;
-    if (NS_FAILED(options.Init(4))) {
-        return 1;
-    }
-    parseCommandLine(argc, argv, options);
-
-    if (!options.GetEntry(NS_LITERAL_CSTRING("q"))) {
-        NS_NAMED_LITERAL_CSTRING(copyright, "(C) 1999 The MITRE Corporation, Keith Visco, and contributors");
-        cerr << "TransforMiiX ";
-        cerr << MOZILLA_VERSION << endl;
-        cerr << copyright.get() << endl;
-        //-- print banner line
-        PRUint32 fillSize = copyright.Length() + 1;
-        PRUint32 counter;
-        for (counter = 0; counter < fillSize; ++counter)
-            cerr << '-';
-        cerr << endl << endl;
-    }
-
-    if (options.GetEntry(NS_LITERAL_CSTRING("h"))) {
-        printHelp();
-        return 0;
-    }
-
-    //-- handle output stream
-    ostream* resultOutput = &cout;
-    ofstream resultFileStream;
-
-    txOptionEntry* option = options.GetEntry(NS_LITERAL_CSTRING("o"));
-    if (option &&
-        option->mValues.Length() > 0 &&
-        !option->mValues[0].EqualsLiteral("-")) {
-        resultFileStream.open(option->mValues[0].get(), ios::out);
-        if (!resultFileStream) {
-            cerr << "error opening output file: ";
-            cerr << option->mValues[0].get() << endl;
-            return -1;
-        }
-        resultOutput = &resultFileStream;
-    }
-
-    option = options.GetEntry(NS_LITERAL_CSTRING("i"));
-    if (!option || option->mValues.Length() == 0) {
-        cerr << "you must specify at least a source XML path" << endl;
-        printUsage();
-        return -1;
-    }
-
-    SimpleErrorObserver obs;
-    txStandaloneXSLTProcessor proc;
-
-    txOptionEntry* styleOption = options.GetEntry(NS_LITERAL_CSTRING("s"));
-    if (!styleOption || styleOption->mValues.Length() == 0) {
-        rv = proc.transform(option->mValues[0], *resultOutput, obs);
-    }
-    else {
-        // XXX TODO: Handle multiple stylesheets
-        rv = proc.transform(option->mValues[0], styleOption->mValues[0],
-                            *resultOutput, obs);
-    }
-
-    if (NS_FAILED(rv)) {
-        cerr << "transformation failed with " << hex << rv << endl;
-    }
-
-    resultFileStream.close();
-    txXSLTProcessor::shutdown();
-    rv = NS_ShutdownXPCOM(nsnull);
-    NS_ENSURE_SUCCESS(rv, rv);
-    return 0;
-}
deleted file mode 100644
--- a/content/xslt/src/main/txTestExpr.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Axel Hecht.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Axel Hecht <axel@pike.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsXPCOM.h"
-#include "txStandaloneXSLTProcessor.h"
-#include "nsString.h"
-#include "nsTArray.h"
-#include "txExprParser.h"
-#include "txIXPathContext.h"
-
-/**
- * A ExprParser test exe
- */
-
-static const char* kTokens[] = {"(", "concat", "(", "foo", ",", "'", "bar",
-                                "'",")", "//", ".", "[", "preceding-sibling",
-                                "::", "bar", "]", "/", "*", "[", "23", "]",
-                                "|", "node", "(", ")", ")", "<", "3"};
-static const PRUint8 kCount = sizeof(kTokens)/sizeof(char*);
-
-class ParseContextImpl : public txIParseContext
-{
-public:
-    nsresult
-    resolveNamespacePrefix(nsIAtom* aPrefix, PRInt32& aID)
-    {
-        return NS_ERROR_FAILURE;
-    }
-    nsresult
-    resolveFunctionCall(nsIAtom* aName, PRInt32 aID, FunctionCall** aFunction)
-    {
-        return NS_ERROR_XPATH_UNKNOWN_FUNCTION;
-    }
-    PRBool
-    caseInsensitiveNameTests()
-    {
-        return PR_FALSE;
-    }
-    void
-    SetErrorOffset(PRUint32 aOffset)
-    {
-        mOff = aOffset;
-    }
-    PRUint32 mOff;
-};
-
-static void doTest(const nsASingleFragmentString& aExpr)
-{
-    ParseContextImpl ct;
-    nsAutoPtr<Expr> expression;
-    cout << NS_LossyConvertUTF16toASCII(aExpr).get() << endl;
-    ct.mOff = 0;
-    nsresult rv = txExprParser::createExpr(aExpr, &ct,
-                                           getter_Transfers(expression));
-
-    cout << "createExpr returned " << ios::hex << rv  << ios::dec;
-    cout << " at " << ct.mOff << endl;
-    if (NS_FAILED(rv)) {
-        NS_LossyConvertUTF16toASCII cstring(aExpr);
-        cout << NS_LossyConvertUTF16toASCII(StringHead(aExpr, ct.mOff)).get();
-        cout << " ^ ";
-        cout << NS_LossyConvertUTF16toASCII(StringTail(aExpr, aExpr.Length()-ct.mOff)).get();
-        cout << endl << endl;
-    }
-#ifdef TX_TO_STRING
-    else {
-        nsAutoString expr;
-        expression->toString(expr);
-        cout << "parsed expression: ";
-        cout << NS_LossyConvertUTF16toASCII(expr).get() << endl << endl;
-    }
-#endif
-}
-
-int main(int argc, char** argv)
-{
-    using namespace std;
-    nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    if (!txXSLTProcessor::init())
-        return 1;
-
-    nsAutoString exprOrig, expr;
-    nsTArray<nsString> exprHead, exprTail;
-    PRUint8 i, dropStart, dropEnd;
-    exprHead.AppendElement(NS_ConvertASCIItoUTF16(kTokens[0]));
-    exprTail.AppendiElement(NS_ConvertASCIItoUTF16(kTokens[kCount - 1]));
-    for (i = 2; i < kCount; ++i) {
-        exprHead.AppendElement(exprHead[i - 2] +
-                              NS_ConvertASCIItoUTF16(kTokens[i - 1]));
-        exprTail.AppendElement(NS_ConvertASCIItoUTF16(kTokens[kCount - i]) +
-                              exprTail[i - 2]);
-    }
-    exprOrig = NS_ConvertASCIItoUTF16(kTokens[0]) + exprTail[kCount - 2];
-    cout << NS_LossyConvertUTF16toASCII(exprOrig).get() << endl << endl;
-    for (dropStart = 0; dropStart < kCount - 2; ++dropStart) {
-        doTest(exprTail[kCount - 2 - dropStart]);
-        for (dropEnd = kCount - 3 - dropStart; dropEnd > 0; --dropEnd) {
-            expr = exprHead[dropStart] + exprTail[dropEnd];
-            doTest(expr);
-        }
-        doTest(exprHead[dropStart]);
-    }
-    doTest(exprHead[kCount - 2]);
-
-    txXSLTProcessor::shutdown();
-    rv = NS_ShutdownXPCOM(nsnull);
-    NS_ENSURE_SUCCESS(rv, rv);
-    return 0;
-}
deleted file mode 100644
--- a/content/xslt/src/main/txXSLTMarkDriver.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Axel Hecht <axel@pike.org> (Original Author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/**
- * Driver for running XSLTMark on standalone
- *
- * See http://www.datapower.com/XSLTMark/
- */
-
-#include "txStandaloneStylesheetCompiler.h"
-#include "txStandaloneXSLTProcessor.h"
-#include "nsXPCOM.h"
-#include "xmExternalDriver.hpp"
-#ifdef MOZ_JPROF
-#include "jprof.h"
-#endif
-
-class txDriverProcessor : public txStandaloneXSLTProcessor,
-                          public xmExternalDriver
-{
-public:
-    txDriverProcessor() : mXML(0), mOut(0)
-    {
-    }
-
-    int loadStylesheet (char * filename)
-    {
-        txParsedURL url;
-        url.init(NS_ConvertASCIItoUTF16(filename));
-        nsresult rv =
-            TX_CompileStylesheetPath(url, getter_AddRefs(mStylesheet));
-        return NS_SUCCEEDED(rv) ? 0 : 1;
-    }
-    int setInputDocument (char * filename)
-    {
-        delete mXML;
-        mXML = parsePath(nsDependentCString(filename), mObserver);
-        return mXML ? 0 : 1;
-    }
-    int openOutput (char * outputFilename)
-    {
-        mOut = new ofstream(outputFilename);
-        return mXML ? 0 : 1;
-    }
-    int runTransform ()
-    {
-        if (!mXML || !mStylesheet || !mOut)
-            return 1;
-        nsresult rv = transform(*mXML, mStylesheet, *mOut, mObserver);
-        return NS_FAILED(rv);
-    }
-    int closeOutput ()
-    {
-        if (mOut)
-            mOut->close();
-        delete mOut;
-        mOut = 0;
-        return 0;
-    }
-    int terminate()
-    {
-        delete mXML;
-        mXML = 0;
-        if (mOut && mOut->is_open())
-            mOut->close();
-        delete mOut;
-        mOut = 0;
-        mStylesheet = 0;
-        return 0;
-    }
-    ~txDriverProcessor()
-    {
-        delete mXML;
-        delete mOut;
-    }
-private:
-    txXPathNode *mXML;
-    nsRefPtr<txStylesheet> mStylesheet;
-    SimpleErrorObserver mObserver;
-    ofstream* mOut;
-};
-
-int main (int argc, char ** argv)
-{
-    txDriverProcessor driver;
-#ifdef MOZ_JPROF
-    setupProfilingStuff();
-#endif
-    NS_InitXPCOM2(nsnull, nsnull, nsnull);
-    if (!txDriverProcessor::init())
-        return 1;
-    driver.main (argc, argv);
-    txDriverProcessor::shutdown();
-    NS_ShutdownXPCOM(nsnull);
-    return 0;
-}
deleted file mode 100644
--- a/content/xslt/src/xml/txAttr.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * The MITRE Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Tom Kneeland (3/29/99)
-//
-//  Implementation of the Document Object Model Level 1 Core
-//    Implementation of the Attr class
-//
-
-#include "txDOM.h"
-#include "txAtoms.h"
-#include "txXMLUtils.h"
-
-Attr::Attr(nsIAtom *aPrefix, nsIAtom *aLocalName, PRInt32 aNamespaceID,
-           Element *aOwnerElement, const nsAString &aValue) :
-    NodeDefinition(Node::ATTRIBUTE_NODE, aLocalName, aValue,
-                   aOwnerElement->getOwnerDocument()),
-    mPrefix(aPrefix),
-    mNamespaceID(aNamespaceID),
-    mOwnerElement(aOwnerElement)
-{
-}
-
-//
-//Not implemented anymore, return null as an error.
-//
-Node* Attr::appendChild(Node* newChild)
-{
-  NS_ERROR("not implemented");
-  return nsnull;
-}
-
-nsresult
-Attr::getNodeName(nsAString& aName) const
-{
-  if (mPrefix) {
-    mPrefix->ToString(aName);
-    aName.Append(PRUnichar(':'));
-  }
-  else {
-    aName.Truncate();
-  }
-
-  const char* ASCIIAtom;
-  mLocalName->GetUTF8String(&ASCIIAtom);
-  AppendUTF8toUTF16(ASCIIAtom, aName);
-
-  return NS_OK;
-}
-
-//
-//Return the attributes local (unprefixed) name atom.
-//
-MBool Attr::getLocalName(nsIAtom** aLocalName)
-{
-  if (!aLocalName)
-    return MB_FALSE;
-  *aLocalName = mLocalName;
-  NS_ADDREF(*aLocalName);
-  return MB_TRUE;
-}
-
-//
-//Return the namespace the attribute belongs to. If the attribute doesn't
-//have a prefix it doesn't belong to any namespace per the namespace spec,
-//and is handled in the constructor.
-//
-PRInt32 Attr::getNamespaceID()
-{
-  return mNamespaceID;
-}
-
-//
-//Return the attributes owning element
-//
-Node* Attr::getXPathParent()
-{
-  return mOwnerElement;
-}
deleted file mode 100644
--- a/content/xslt/src/xml/txDocument.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * The MITRE Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Tom Kneeland (3/29/99)
-//
-//  Implementation of the Document Object Model Level 1 Core
-//    Implementation of the Document class
-//
-// Modification History:
-// Who  When        What
-// TK   03/29/99    Created
-// LF   08/06/1999  Removed Default argument initializer from
-//                  Document() constructor
-// LF   08/06/1999  fixed typo: defalut to default
-//
-
-#include "txDOM.h"
-#include "txAtoms.h"
-
-//
-//Construct a Document.  Currently no parameters are required, but the the
-//node constructor is called to identify the node type.
-//
-Document::Document() :
-  NodeDefinition(Node::DOCUMENT_NODE, txXMLAtoms::document, EmptyString(),
-                 nsnull),
-  documentElement(nsnull)
-{
-  mIDMap.Init(0);
-}
-
-//
-//Return the one and only element for this document
-//
-Element* Document::getDocumentElement()
-{
-  return documentElement;
-}
-
-Element*
-Document::createElementNS(nsIAtom *aPrefix, nsIAtom *aLocalName,
-                          PRInt32 aNamespaceID)
-{
-  return new Element(aPrefix, aLocalName, aNamespaceID, this);
-}
-
-//
-//Construct a text node with the given data
-//
-Node* Document::createTextNode(const nsAString& theData)
-{
-  return new NodeDefinition(Node::TEXT_NODE, txXMLAtoms::text, theData, this);
-}
-
-//
-//Construct a comment node with the given data
-//
-Node* Document::createComment(const nsAString& theData)
-{
-  return new NodeDefinition(Node::COMMENT_NODE, txXMLAtoms::comment, theData,
-                            this);
-}
-
-//
-//Construct a ProcessingInstruction node with the given targe and data.
-//
-ProcessingInstruction*
-  Document::createProcessingInstruction(nsIAtom *aTarget,
-                                        const nsAString& data)
-{
-  return new ProcessingInstruction(aTarget, data, this);
-}
-
-//
-//Return an Element by ID, introduced by DOM2
-//
-DHASH_WRAPPER(txIDMap, txIDEntry, nsAString&)
-
-Element* Document::getElementById(const nsAString& aID)
-{
-  txIDEntry* entry = mIDMap.GetEntry(aID);
-  if (entry)
-    return entry->mElement;
-  return nsnull;
-}
-
-/**
- * private setter for element ID
- */
-PRBool
-Document::setElementID(const nsAString& aID, Element* aElement)
-{
-  txIDEntry* id = mIDMap.AddEntry(aID);
-  // make sure IDs are unique
-  if (id->mElement) {
-    return PR_FALSE;
-  }
-  id->mElement = aElement;
-  id->mElement->setIDValue(aID);
-  return PR_TRUE;
-}
-
-Node* Document::appendChild(Node* newChild)
-{
-  unsigned short nodeType = newChild->getNodeType();
-
-  // Convert to a NodeDefinition Pointer
-  NodeDefinition* pNewChild = (NodeDefinition*)newChild;
-
-  if (pNewChild->parentNode == this)
-    {
-      pNewChild = implRemoveChild(pNewChild);
-      if (nodeType == Node::ELEMENT_NODE)
-        documentElement = nsnull;
-    }
-
-  switch (nodeType)
-    {
-      case Node::PROCESSING_INSTRUCTION_NODE :
-      case Node::COMMENT_NODE :
-      case Node::DOCUMENT_TYPE_NODE :
-        return implAppendChild(pNewChild);
-
-      case Node::ELEMENT_NODE :
-        if (!documentElement)
-          {
-            Node* returnVal = implAppendChild(pNewChild);
-            documentElement = (Element*)pNewChild;
-            return returnVal;
-          }
-
-      default:
-        break;
-    }
-
-  return nsnull;
-}
-
-nsresult Document::getBaseURI(nsAString& aURI)
-{
-  aURI = documentBaseURI;
-  return NS_OK;
-}
deleted file mode 100644
--- a/content/xslt/src/xml/txElement.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * The MITRE Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Tom Kneeland (3/29/99)
-//
-//  Implementation of the Document Object Model Level 1 Core
-//    Implementation of the Element class
-//
-
-#include "txDOM.h"
-#include "txAtoms.h"
-#include "txXMLUtils.h"
-
-Element::Element(nsIAtom *aPrefix, nsIAtom *aLocalName, PRInt32 aNamespaceID,
-                 Document* aOwner) :
-  NodeDefinition(Node::ELEMENT_NODE, aLocalName, EmptyString(), aOwner),
-  mPrefix(aPrefix),
-  mNamespaceID(aNamespaceID)
-{
-}
-
-Node* Element::appendChild(Node* newChild)
-{
-  switch (newChild->getNodeType())
-    {
-      case Node::ELEMENT_NODE :
-      case Node::TEXT_NODE :
-      case Node::COMMENT_NODE :
-      case Node::PROCESSING_INSTRUCTION_NODE :
-        {
-          // Remove the "newChild" if it is already a child of this node
-          NodeDefinition* pNewChild = (NodeDefinition*)newChild;
-          if (pNewChild->getParentNode() == this)
-            pNewChild = implRemoveChild(pNewChild);
-
-          return implAppendChild(pNewChild);
-        }
-
-      default:
-        break;
-    }
-
-  return nsnull;
-}
-
-nsresult
-Element::getNodeName(nsAString& aName) const
-{
-  if (mPrefix) {
-    mPrefix->ToString(aName);
-    aName.Append(PRUnichar(':'));
-  }
-  else {
-    aName.Truncate();
-  }
-
-  const char* ASCIIAtom;
-  mLocalName->GetUTF8String(&ASCIIAtom);
-  AppendUTF8toUTF16(ASCIIAtom, aName);
-
-  return NS_OK;
-}
-
-//
-//Return the elements local (unprefixed) name.
-//
-MBool Element::getLocalName(nsIAtom** aLocalName)
-{
-  if (!aLocalName)
-    return MB_FALSE;
-  *aLocalName = mLocalName;
-  NS_ADDREF(*aLocalName);
-  return MB_TRUE;
-}
-
-//
-//Return the namespace the elements belongs to.
-//
-PRInt32 Element::getNamespaceID()
-{
-  return mNamespaceID;
-}
-
-nsresult
-Element::appendAttributeNS(nsIAtom *aPrefix, nsIAtom *aLocalName,
-                           PRInt32 aNamespaceID, const nsAString& aValue)
-{
-  nsAutoPtr<Attr> newAttribute;
-  newAttribute = new Attr(aPrefix, aLocalName, aNamespaceID, this, aValue);
-  if (!newAttribute) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  if (mFirstAttribute) {
-    Attr *lastAttribute = mFirstAttribute;
-    while (lastAttribute->mNextAttribute) {
-      lastAttribute = lastAttribute->mNextAttribute;
-    }
-    lastAttribute->mNextAttribute = newAttribute;
-  }
-  else {
-    mFirstAttribute = newAttribute;
-  }
-
-  return NS_OK;
-}
-
-//
-// Return true if the attribute specified by localname and nsID
-// exists, and sets aValue to the value of the attribute.
-// Return false, if the attribute does not exist.
-//
-MBool Element::getAttr(nsIAtom* aLocalName, PRInt32 aNSID,
-                       nsAString& aValue)
-{
-  aValue.Truncate();
-  Attr *attribute = mFirstAttribute;
-  while (attribute) {
-    if (attribute->equals(aLocalName, aNSID)) {
-      attribute->getNodeValue(aValue);
-
-      return PR_TRUE;
-    }
-
-    attribute = attribute->mNextAttribute;
-  }
-
-  return PR_FALSE;
-}
-
-//
-// Return true if the attribute specified by localname and nsID
-// exists. Return false otherwise.
-//
-MBool Element::hasAttr(nsIAtom* aLocalName, PRInt32 aNSID)
-{
-  Attr *attribute = mFirstAttribute;
-  while (attribute) {
-    if (attribute->equals(aLocalName, aNSID)) {
-      return PR_TRUE;
-    }
-
-    attribute = attribute->mNextAttribute;
-  }
-
-  return PR_FALSE;
-}
-
-/**
- * ID accessors. Getter used for id() patterns, private setter for parser
- */
-PRBool
-Element::getIDValue(nsAString& aValue)
-{
-  if (mIDValue.IsEmpty()) {
-    return PR_FALSE;
-  }
-  aValue = mIDValue;
-  return PR_TRUE;
-}
-
-void
-Element::setIDValue(const nsAString& aValue)
-{
-  mIDValue = aValue;
-}
deleted file mode 100644
--- a/content/xslt/src/xml/txNodeDefinition.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * The MITRE Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Tom Kneeland (3/29/99)
-//
-//  Implementation of the Document Object Model Level 1 Core
-//    Implementation of the NodeDefinition Class
-//
-// Modification History:
-// Who  When      What
-// TK   03/29/99  Created
-//
-
-#include "txDOM.h"
-#include "nsTArray.h"
-#include "txURIUtils.h"
-#include "txAtoms.h"
-#include <string.h>
-
-NodeDefinition::NodeDefinition(NodeType type, nsIAtom *aLocalName,
-                               const nsAString& value, Document* owner) :
-    mLocalName(aLocalName),
-    nodeValue(value),
-    nodeType(type),
-    parentNode(nsnull),
-    previousSibling(nsnull),
-    nextSibling(nsnull),
-    ownerDocument(owner),
-    length(0),
-    firstChild(nsnull),
-    lastChild(nsnull),
-    mOrderInfo(nsnull)
-{
-}
-
-//
-// This node is being destroyed, so loop through and destroy all the children.
-//
-NodeDefinition::~NodeDefinition()
-{
-  NodeDefinition* pCurrent = firstChild;
-  NodeDefinition* pDestroyer;
-
-  while (pCurrent)
-    {
-      pDestroyer = pCurrent;
-      pCurrent = pCurrent->nextSibling;
-      delete pDestroyer;
-    }
-
-  delete mOrderInfo;
-}
-
-nsresult NodeDefinition::getNodeName(nsAString& aName) const
-{
-  mLocalName->ToString(aName);
-  return NS_OK;
-}
-
-nsresult NodeDefinition::getNodeValue(nsAString& aValue)
-{
-  aValue = nodeValue;
-  return NS_OK;
-}
-
-unsigned short NodeDefinition::getNodeType() const
-{
-  return nodeType;
-}
-
-Node* NodeDefinition::getParentNode() const
-{
-  return parentNode;
-}
-
-Node* NodeDefinition::getFirstChild() const
-{
-  return firstChild;
-}
-
-Node* NodeDefinition::getLastChild() const
-{
-  return lastChild;
-}
-
-Node* NodeDefinition::getPreviousSibling() const
-{
-  return previousSibling;
-}
-
-Node* NodeDefinition::getNextSibling() const
-{
-  return nextSibling;
-}
-
-Document* NodeDefinition::getOwnerDocument() const
-{
-  return ownerDocument;
-}
-
-Node* NodeDefinition::appendChild(Node* newChild)
-{
-  return nsnull;
-}
-
-NodeDefinition* NodeDefinition::implAppendChild(NodeDefinition* newChild)
-{
-  // The new child should not be a child of any other node
-  if (!newChild->previousSibling && !newChild->nextSibling &&
-      !newChild->parentNode)
-    {
-      newChild->previousSibling = lastChild;
-
-      if (lastChild)
-        lastChild->nextSibling = newChild;
-
-      lastChild = newChild;
-
-      newChild->parentNode = this;
-
-      if (!newChild->previousSibling)
-        firstChild = newChild;
-
-      ++length;
-
-      return newChild;
-    }
-
-  return nsnull;
-}
-
-NodeDefinition* NodeDefinition::implRemoveChild(NodeDefinition* oldChild)
-{
-  if (oldChild != firstChild)
-    oldChild->previousSibling->nextSibling = oldChild->nextSibling;
-  else
-    firstChild = oldChild->nextSibling;
-
-  if (oldChild != lastChild)
-    oldChild->nextSibling->previousSibling = oldChild->previousSibling;
-  else
-    lastChild = oldChild->previousSibling;
-
-  oldChild->nextSibling = nsnull;
-  oldChild->previousSibling = nsnull;
-  oldChild->parentNode = nsnull;
-
-  --length;
-
-  return oldChild;
-}
-
-MBool NodeDefinition::hasChildNodes() const
-{
-  if (firstChild)
-    return MB_TRUE;
-  else
-    return MB_FALSE;
-}
-
-MBool NodeDefinition::getLocalName(nsIAtom** aLocalName)
-{
-  if (!aLocalName)
-    return MB_FALSE;
-  *aLocalName = 0;
-  return MB_TRUE;
-}
-
-nsresult NodeDefinition::getNamespaceURI(nsAString& aNSURI)
-{
-  return txStandaloneNamespaceManager::getNamespaceURI(getNamespaceID(),
-                                                       aNSURI);
-}
-
-PRInt32 NodeDefinition::getNamespaceID()
-{
-  return kNameSpaceID_None;
-}
-
-Node* NodeDefinition::getXPathParent()
-{
-  return parentNode;
-}
-
-//
-// Returns the base URI of the node. Acccounts for xml:base
-// attributes.
-//
-// @return base URI for the node
-//
-nsresult NodeDefinition::getBaseURI(nsAString& aURI)
-{
-  Node* node = this;
-  nsTArray<nsString> baseUrls;
-  nsAutoString url;
-
-  while (node) {
-    switch (node->getNodeType()) {
-      case Node::ELEMENT_NODE :
-        if (((Element*)node)->getAttr(txXMLAtoms::base, kNameSpaceID_XML,
-                                      url))
-          baseUrls.AppendElement(url);
-        break;
-
-      case Node::DOCUMENT_NODE :
-        node->getBaseURI(url);
-        baseUrls.AppendElement(url);
-        break;
-    
-      default:
-        break;
-    }
-    node = node->getXPathParent();
-  }
-
-  PRUint32 count = baseUrls.Length();
-  if (count) {
-    aURI = baseUrls[--count];
-
-    while (count > 0) {
-      nsAutoString dest;
-      URIUtils::resolveHref(baseUrls[--count], aURI, dest);
-      aURI = dest;
-    }
-  }
-  
-  return NS_OK;
-} // getBaseURI
-
-/*
- * Compares document position of this node relative to another node
- */
-PRInt32 NodeDefinition::compareDocumentPosition(Node* aOther)
-{
-  OrderInfo* myOrder = getOrderInfo();
-  OrderInfo* otherOrder = ((NodeDefinition*)aOther)->getOrderInfo();
-  if (!myOrder || !otherOrder)
-      return -1;
-
-  if (myOrder->mRoot == otherOrder->mRoot) {
-    int c = 0;
-    while (c < myOrder->mSize && c < otherOrder->mSize) {
-      if (myOrder->mOrder[c] < otherOrder->mOrder[c])
-        return -1;
-      if (myOrder->mOrder[c] > otherOrder->mOrder[c])
-        return 1;
-      ++c;
-    }
-    if (c < myOrder->mSize)
-      return 1;
-    if (c < otherOrder->mSize)
-      return -1;
-    return 0;
-  }
-
-  if (myOrder->mRoot < otherOrder->mRoot)
-    return -1;
-
-  return 1;
-}
-
-/*
- * Get order information for node
- */
-NodeDefinition::OrderInfo* NodeDefinition::getOrderInfo()
-{
-  if (mOrderInfo)
-    return mOrderInfo;
-
-  mOrderInfo = new OrderInfo;
-  if (!mOrderInfo)
-    return 0;
-
-  Node* parent = getXPathParent();
-  if (!parent) {
-    mOrderInfo->mOrder = 0;
-    mOrderInfo->mSize = 0;
-    mOrderInfo->mRoot = this;
-    return mOrderInfo;
-  }
-
-  OrderInfo* parentOrder = ((NodeDefinition*)parent)->getOrderInfo();
-  mOrderInfo->mSize = parentOrder->mSize + 1;
-  mOrderInfo->mRoot = parentOrder->mRoot;
-  mOrderInfo->mOrder = new PRUint32[mOrderInfo->mSize];
-  if (!mOrderInfo->mOrder) {
-    delete mOrderInfo;
-    mOrderInfo = 0;
-    return 0;
-  }
-  memcpy(mOrderInfo->mOrder,
-         parentOrder->mOrder,
-         parentOrder->mSize * sizeof(PRUint32*));
-
-  // Get childnumber of this node
-  int lastElem = parentOrder->mSize;
-  switch (getNodeType()) {
-    case Node::ATTRIBUTE_NODE:
-    {
-      NS_ASSERTION(parent->getNodeType() == Node::ELEMENT_NODE,
-                   "parent to attribute is not an element");
-
-      Element* elem = (Element*)parent;
-      Attr *attribute = elem->getFirstAttribute();
-      PRUint32 i = 0;
-      while (attribute) {
-        if (attribute == this) {
-          mOrderInfo->mOrder[lastElem] = i + kTxAttrIndexOffset;
-          return mOrderInfo;
-        }
-        attribute = attribute->getNextAttribute();
-        ++i;
-      }
-      break;
-    }
-    // XXX Namespace: need to take care of namespace nodes here
-    default:
-    {
-      PRUint32 i = 0;
-      Node * child = parent->getFirstChild();
-      while (child) {
-        if (child == this) {
-          mOrderInfo->mOrder[lastElem] = i + kTxChildIndexOffset;
-          return mOrderInfo;
-        }
-        ++i;
-        child = child->getNextSibling();
-      }
-      break;
-    }
-  }
-
-  NS_ERROR("unable to get childnumber");
-  mOrderInfo->mOrder[lastElem] = 0;
-  return mOrderInfo;
-}
-
-/*
- * OrderInfo destructor
- */
-NodeDefinition::OrderInfo::~OrderInfo()
-{
-    delete [] mOrder;
-}
deleted file mode 100644
--- a/content/xslt/src/xml/txProcessingInstruction.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * The MITRE Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Tom Kneeland (3/29/99)
-//
-//  Implementation of the Document Object Model Level 1 Core
-//    Implementation of the ProcessingInstruction class
-//
-// Modification History:
-// Who  When      What
-// TK   03/29/99  Created
-//
-
-#include "txDOM.h"
-#include "nsIAtom.h"
-
-//
-//Construct a text object with the specified document owner and data
-//
-ProcessingInstruction::ProcessingInstruction(nsIAtom *theTarget,
-                                             const nsAString& theData,
-                                             Document* owner) :
-  NodeDefinition(Node::PROCESSING_INSTRUCTION_NODE, theTarget, theData, owner)
-{
-}
-
-//
-//ProcessingInstruction nodes can not have any children, so just return null
-//from all child manipulation functions.
-//
-
-MBool ProcessingInstruction::getLocalName(nsIAtom** aLocalName)
-{
-  if (!aLocalName)
-    return MB_FALSE;
-  *aLocalName = mLocalName;
-  NS_ADDREF(*aLocalName);
-  return MB_TRUE;
-}
deleted file mode 100644
--- a/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *   Axel Hecht <axel@pike.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txXPathTreeWalker.h"
-#include "nsPrintfCString.h"
-#include "nsReadableUtils.h"
-#include "nsString.h"
-#include "txXMLUtils.h"
-
-txXPathTreeWalker::txXPathTreeWalker(const txXPathTreeWalker& aOther)
-    : mPosition(aOther.mPosition)
-{
-}
-
-txXPathTreeWalker::txXPathTreeWalker(const txXPathNode& aNode)
-    : mPosition(aNode)
-{
-}
-
-#define INNER mPosition.mInner
-
-void
-txXPathTreeWalker::moveToRoot()
-{
-    if (INNER->nodeType != Node::DOCUMENT_NODE) {
-        INNER = INNER->ownerDocument;
-    }
-}
-
-PRBool
-txXPathTreeWalker::moveToElementById(const nsAString& aID)
-{
-    Document* document;
-    if (INNER->nodeType == Node::DOCUMENT_NODE) {
-        document = static_cast<Document*>(INNER);
-    }
-    else {
-        document = INNER->ownerDocument;
-    }
-
-    Element* element =
-        document->getElementById(aID);
-    if (!element) {
-        return PR_FALSE;
-    }
-
-    INNER = element;
-
-    return PR_TRUE;
-}
-
-PRBool
-txXPathTreeWalker::moveToFirstAttribute()
-{
-    if (INNER->nodeType != Node::ELEMENT_NODE) {
-        return PR_FALSE;
-    }
-
-    Element* element = static_cast<Element*>(INNER);
-    Attr *attribute = element->getFirstAttribute();
-    while (attribute) {
-        if (attribute->getNamespaceID() != kNameSpaceID_XMLNS) {
-            INNER = attribute;
-
-            return PR_TRUE;
-        }
-
-        attribute = attribute->getNextAttribute();
-    }
-
-    return PR_FALSE;
-}
-
-PRBool
-txXPathTreeWalker::moveToNextAttribute()
-{
-    // XXX an assertion should be enough here with the current code
-    if (INNER->nodeType != Node::ATTRIBUTE_NODE) {
-        return PR_FALSE;
-    }
-
-    Element* element = static_cast<Element*>(INNER->getXPathParent());
-    Attr *attribute = element->getFirstAttribute();
-    while (attribute != INNER) {
-        attribute = attribute->getNextAttribute();
-    }
-    NS_ASSERTION(attribute, "Attr not attribute of it's owner?");
-
-    attribute = attribute->getNextAttribute();
-
-    while (attribute) {
-        if (attribute->getNamespaceID() != kNameSpaceID_XMLNS) {
-            INNER = attribute;
-
-            return PR_TRUE;
-        }
-
-        attribute = attribute->getNextAttribute();
-    }
-
-    return PR_FALSE;
-}
-
-PRBool
-txXPathTreeWalker::moveToNamedAttribute(nsIAtom* aLocalName, PRInt32 aNSID)
-{
-    if (INNER->nodeType != Node::ELEMENT_NODE) {
-        return PR_FALSE;
-    }
-
-    Element* element = static_cast<Element*>(INNER);
-    NamedNodeMap* attrs = element->getAttributes();
-    NodeListDefinition::ListItem* item = attrs->firstItem;
-    // find requested attribute
-    nsCOMPtr<nsIAtom> localName;
-    while (item && (item->node->getNamespaceID() != aNSID ||
-                    !item->node->getLocalName(getter_AddRefs(localName)) || 
-                    localName != aLocalName) {
-        item = item->next;
-    }
-    if (!item) {
-        return PR_FALSE;
-    }
-
-    INNER = static_cast<NodeDefinition*>(item->node);
-    return PR_TRUE;
-}
-
-PRBool
-txXPathTreeWalker::moveToFirstChild()
-{
-    if (!INNER->firstChild) {
-        return PR_FALSE;
-    }
-
-    INNER = INNER->firstChild;
-
-    return PR_TRUE;
-}
-
-PRBool
-txXPathTreeWalker::moveToLastChild()
-{
-    if (!INNER->lastChild) {
-        return PR_FALSE;
-    }
-
-    INNER = INNER->lastChild;
-
-    return PR_TRUE;
-}
-
-PRBool
-txXPathTreeWalker::moveToNextSibling()
-{
-    if (!INNER->nextSibling) {
-        return PR_FALSE;
-    }
-
-    INNER = INNER->nextSibling;
-
-    return PR_TRUE;
-}
-
-PRBool
-txXPathTreeWalker::moveToPreviousSibling()
-{
-    if (!INNER->previousSibling) {
-        return PR_FALSE;
-    }
-
-    INNER = INNER->previousSibling;
-
-    return PR_TRUE;
-}
-
-PRBool
-txXPathTreeWalker::moveToParent()
-{
-    if (INNER->nodeType == Node::ATTRIBUTE_NODE) {
-        INNER = static_cast<NodeDefinition*>(INNER->getXPathParent());
-        return PR_TRUE;
-    }
-
-    if (INNER->nodeType == Node::DOCUMENT_NODE) {
-        return PR_FALSE;
-    }
-
-    NS_ASSERTION(INNER->parentNode, "orphaned node shouldn't happen");
-
-    INNER = INNER->parentNode;
-
-    return PR_TRUE;
-}
-
-txXPathNode::txXPathNode(const txXPathNode& aNode)
-    : mInner(aNode.mInner)
-{
-}
-
-PRBool
-txXPathNode::operator==(const txXPathNode& aNode) const
-{
-    return (mInner == aNode.mInner);
-}
-
-/* static */
-PRBool
-txXPathNodeUtils::getAttr(const txXPathNode& aNode, nsIAtom* aLocalName,
-                          PRInt32 aNSID, nsAString& aValue)
-{
-    if (aNode.mInner->getNodeType() != Node::ELEMENT_NODE) {
-        return PR_FALSE;
-    }
-
-    Element* elem = static_cast<Element*>(aNode.mInner);
-    return elem->getAttr(aLocalName, aNSID, aValue);
-}
-
-/* static */
-already_AddRefed<nsIAtom>
-txXPathNodeUtils::getLocalName(const txXPathNode& aNode)
-{
-    nsIAtom* localName;
-    return aNode.mInner->getLocalName(&localName) ? localName : nsnull;
-}
-
-/* static */
-void
-txXPathNodeUtils::getLocalName(const txXPathNode& aNode, nsAString& aLocalName)
-{
-    nsCOMPtr<nsIAtom> localName;
-    PRBool hasName = aNode.mInner->getLocalName(getter_AddRefs(localName));
-    if (hasName && localName) {
-        localName->ToString(aLocalName);
-    }
-}
-
-/* static */
-void
-txXPathNodeUtils::getNodeName(const txXPathNode& aNode, nsAString& aName)
-{
-    aNode.mInner->getNodeName(aName);
-}
-
-/* static */
-PRInt32
-txXPathNodeUtils::getNamespaceID(const txXPathNode& aNode)
-{
-    return aNode.mInner->getNamespaceID();
-}
-
-/* static */
-void
-txXPathNodeUtils::getNamespaceURI(const txXPathNode& aNode, nsAString& aURI)
-{
-    aNode.mInner->getNamespaceURI(aURI);
-}
-
-/* static */
-PRUint16
-txXPathNodeUtils::getNodeType(const txXPathNode& aNode)
-{
-    return aNode.mInner->getNodeType();
-}
-
-/* static */
-void
-txXPathNodeUtils::appendNodeValueHelper(NodeDefinition* aNode,
-                                        nsAString& aResult)
-{
-
-    NodeDefinition* child = static_cast<NodeDefinition*>
-                                       (aNode->getFirstChild());
-    while (child) {
-        switch (child->getNodeType()) {
-            case Node::TEXT_NODE:
-            {
-                aResult.Append(child->nodeValue);
-            }
-            case Node::ELEMENT_NODE:
-            {
-                appendNodeValueHelper(child, aResult);
-            }
-        }
-        child = static_cast<NodeDefinition*>(child->getNextSibling());
-    }
-}
-
-/* static */
-void
-txXPathNodeUtils::appendNodeValue(const txXPathNode& aNode, nsAString& aResult)
-{
-    unsigned short type = aNode.mInner->getNodeType();
-    if (type == Node::ATTRIBUTE_NODE ||
-        type == Node::COMMENT_NODE ||
-        type == Node::PROCESSING_INSTRUCTION_NODE ||
-        type == Node::TEXT_NODE) {
-        aResult.Append(aNode.mInner->nodeValue);
-
-        return;
-    }
-
-    NS_ASSERTION(type == Node::ELEMENT_NODE || type == Node::DOCUMENT_NODE,
-                 "Element or Document expected");
-
-    appendNodeValueHelper(aNode.mInner, aResult);
-}
-
-/* static */
-PRBool
-txXPathNodeUtils::isWhitespace(const txXPathNode& aNode)
-{
-    NS_ASSERTION(aNode.mInner->nodeType == Node::TEXT_NODE, "Wrong type!");
-
-    return XMLUtils::isWhitespace(aNode.mInner->nodeValue);
-}
-
-/* static */
-txXPathNode*
-txXPathNodeUtils::getDocument(const txXPathNode& aNode)
-{
-    if (aNode.mInner->nodeType == Node::DOCUMENT_NODE) {
-        return new txXPathNode(aNode);
-    }
-
-    return new txXPathNode(aNode.mInner->ownerDocument);
-}
-
-/* static */
-txXPathNode*
-txXPathNodeUtils::getOwnerDocument(const txXPathNode& aNode)
-{
-    return getDocument(aNode);
-}
-
-#ifndef HAVE_64BIT_OS
-#define kFmtSize 13
-const char gPrintfFmt[] = "id0x%08p";
-#else
-#define kFmtSize 21
-const char gPrintfFmt[] = "id0x%016p";
-#endif
-
-/* static */
-nsresult
-txXPathNodeUtils::getXSLTId(const txXPathNode& aNode,
-                            nsAString& aResult)
-{
-    CopyASCIItoUTF16(nsPrintfCString(kFmtSize, gPrintfFmt, aNode.mInner),
-                    aResult);
-
-    return NS_OK;
-}
-
-/* static */
-void
-txXPathNodeUtils::getBaseURI(const txXPathNode& aNode, nsAString& aURI)
-{
-    aNode.mInner->getBaseURI(aURI);
-}
-
-/* static */
-PRIntn
-txXPathNodeUtils::comparePosition(const txXPathNode& aNode,
-                                  const txXPathNode& aOtherNode)
-{
-    // First check for equal nodes.
-    if (aNode == aOtherNode) {
-        return 0;
-    }
-    return aNode.mInner->compareDocumentPosition(aOtherNode.mInner);
-}
-
-/* static */
-txXPathNode*
-txXPathNativeNode::createXPathNode(Node* aNode)
-{
-    if (aNode != nsnull) {
-        return new txXPathNode(static_cast<NodeDefinition*>(aNode));
-    }
-    return nsnull;
-}
-
-/* static */
-nsresult
-txXPathNativeNode::getElement(const txXPathNode& aNode, Element** aResult)
-{
-    if (aNode.mInner->getNodeType() != Node::ELEMENT_NODE) {
-        return NS_ERROR_FAILURE;
-    }
-
-    *aResult = static_cast<Element*>(aNode.mInner);
-
-    return NS_OK;
-
-}
-
-/* static */
-nsresult
-txXPathNativeNode::getDocument(const txXPathNode& aNode, Document** aResult)
-{
-    if (aNode.mInner->getNodeType() != Node::DOCUMENT_NODE) {
-        return NS_ERROR_FAILURE;
-    }
-
-    *aResult = static_cast<Document*>(aNode.mInner);
-
-    return NS_OK;
-}
deleted file mode 100644
--- a/content/xslt/src/xslt/txHTMLOutput.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txHTMLOutput.h"
-#include "nsCOMArray.h"
-#include "nsStaticNameTable.h"
-#include "txAtoms.h"
-#include "txOutputFormat.h"
-#include "txStringUtils.h"
-#include "txXMLUtils.h"
-
-#define EMPTY_ELEMENTS_COUNT 13
-const char* const kHTMLEmptyTags[] =
-{
-    "area",
-    "base",
-    "basefont",
-    "br",
-    "col",
-    "frame",
-    "hr",
-    "img",
-    "input",
-    "isindex",
-    "link",
-    "meta",
-    "param"
-};
-
-#define SHORTHAND_ATTR_COUNT 12
-const char* const kHTMLEmptyAttributes[] =
-{
-    "checked",
-    "compact",
-    "declare",
-    "defer",
-    "disabled",
-    "ismap",
-    "multiple",
-    "noresize",
-    "noshade",
-    "nowrap",
-    "readonly",
-    "selected"
-};
-
-struct txEmptyAttributesMaps
-{
-    typedef nsCOMArray<nsIAtom> EmptyAttrBag;
-    EmptyAttrBag mMaps[SHORTHAND_ATTR_COUNT];
-};
-
-static PRInt32 gTableRefCount;
-static nsStaticCaseInsensitiveNameTable* gHTMLEmptyTagsTable;
-static nsStaticCaseInsensitiveNameTable* gHTMLEmptyAttributesTable;
-static txEmptyAttributesMaps* gHTMLEmptyAttributesMaps;
-
-/* static */
-nsresult
-txHTMLOutput::init()
-{
-    if (0 == gTableRefCount++) {
-        NS_ASSERTION(!gHTMLEmptyTagsTable, "pre existing array!");
-        gHTMLEmptyTagsTable = new nsStaticCaseInsensitiveNameTable();
-        if (!gHTMLEmptyTagsTable) {
-            return NS_ERROR_OUT_OF_MEMORY;
-        }
-
-        gHTMLEmptyTagsTable->Init(kHTMLEmptyTags, EMPTY_ELEMENTS_COUNT);
-
-        NS_ASSERTION(!gHTMLEmptyAttributesTable, "pre existing array!");
-        gHTMLEmptyAttributesTable = new nsStaticCaseInsensitiveNameTable();
-        if (!gHTMLEmptyAttributesTable) {
-            return NS_ERROR_OUT_OF_MEMORY;
-        }
-
-        gHTMLEmptyAttributesTable->Init(kHTMLEmptyAttributes,
-                                        SHORTHAND_ATTR_COUNT);
-
-        NS_ASSERTION(!gHTMLEmptyAttributesMaps, "pre existing map!");
-        gHTMLEmptyAttributesMaps = new txEmptyAttributesMaps();
-        if (!gHTMLEmptyAttributesMaps) {
-            return NS_ERROR_OUT_OF_MEMORY;
-        }
-
-        // checked
-        gHTMLEmptyAttributesMaps->mMaps[0].AppendObject(txHTMLAtoms::input);
-
-        // compact
-        gHTMLEmptyAttributesMaps->mMaps[1].AppendObject(txHTMLAtoms::dir);
-        gHTMLEmptyAttributesMaps->mMaps[1].AppendObject(txHTMLAtoms::dl);
-        gHTMLEmptyAttributesMaps->mMaps[1].AppendObject(txHTMLAtoms::menu);
-        gHTMLEmptyAttributesMaps->mMaps[1].AppendObject(txHTMLAtoms::ol);
-        gHTMLEmptyAttributesMaps->mMaps[1].AppendObject(txHTMLAtoms::ul);
-
-        // declare
-        gHTMLEmptyAttributesMaps->mMaps[2].AppendObject(txHTMLAtoms::object);
-
-        // defer
-        gHTMLEmptyAttributesMaps->mMaps[3].AppendObject(txHTMLAtoms::script);
-
-        // disabled
-        gHTMLEmptyAttributesMaps->mMaps[4].AppendObject(txHTMLAtoms::button);
-        gHTMLEmptyAttributesMaps->mMaps[4].AppendObject(txHTMLAtoms::input);
-        gHTMLEmptyAttributesMaps->mMaps[4].AppendObject(txHTMLAtoms::optgroup);
-        gHTMLEmptyAttributesMaps->mMaps[4].AppendObject(txHTMLAtoms::option);
-        gHTMLEmptyAttributesMaps->mMaps[4].AppendObject(txHTMLAtoms::select);
-        gHTMLEmptyAttributesMaps->mMaps[4].AppendObject(txHTMLAtoms::textarea);
-
-        // ismap
-        gHTMLEmptyAttributesMaps->mMaps[5].AppendObject(txHTMLAtoms::img);
-        gHTMLEmptyAttributesMaps->mMaps[5].AppendObject(txHTMLAtoms::input);
-
-        // multiple
-        gHTMLEmptyAttributesMaps->mMaps[6].AppendObject(txHTMLAtoms::select);
-
-        // noresize
-        gHTMLEmptyAttributesMaps->mMaps[7].AppendObject(txHTMLAtoms::frame);
-
-        // noshade
-        gHTMLEmptyAttributesMaps->mMaps[8].AppendObject(txHTMLAtoms::hr);
-
-        // nowrap
-        gHTMLEmptyAttributesMaps->mMaps[9].AppendObject(txHTMLAtoms::td);
-        gHTMLEmptyAttributesMaps->mMaps[9].AppendObject(txHTMLAtoms::th);
-
-        // readonly
-        gHTMLEmptyAttributesMaps->mMaps[10].AppendObject(txHTMLAtoms::input);
-        gHTMLEmptyAttributesMaps->mMaps[10].AppendObject(txHTMLAtoms::textarea);
-
-        // selected
-        gHTMLEmptyAttributesMaps->mMaps[11].AppendObject(txHTMLAtoms::option);
-    }
-
-    return NS_OK;
-}
-
-/* static */
-void
-txHTMLOutput::shutdown()
-{
-    if (0 == --gTableRefCount) {
-        if (gHTMLEmptyTagsTable) {
-            delete gHTMLEmptyTagsTable;
-            gHTMLEmptyTagsTable = nsnull;
-        }
-         if (gHTMLEmptyAttributesTable) {
-            delete gHTMLEmptyAttributesTable;
-            gHTMLEmptyAttributesTable = nsnull;
-        }
-        if (gHTMLEmptyAttributesMaps) {
-            delete gHTMLEmptyAttributesMaps;
-            gHTMLEmptyAttributesMaps = nsnull;
-        }
-   }
-}
-
-txHTMLOutput::txHTMLOutput(txOutputFormat* aFormat, ostream* aOut)
-    : txXMLOutput(aFormat, aOut)
-{
-    mUseEmptyElementShorthand = PR_FALSE;
-}
-
-nsresult
-txHTMLOutput::attribute(const nsAString& aName, const PRInt32 aNsID,
-                        const nsAString& aValue)
-{
-    if (!mStartTagOpen)
-        // XXX Signal this? (can't add attributes after element closed)
-        return;
-
-    MBool shortHand = MB_FALSE;
-    if (aNsID == kNameSpaceID_None) {
-        const nsAString& localPart = XMLUtils::getLocalPart(aName);
-        shortHand = isShorthandAttribute(localPart);
-        if (shortHand &&
-            localPart.Equals(aValue, txCaseInsensitiveStringComparator())) {
-            txListIterator iter(&mAttributes);
-            txOutAttr* setAtt = 0;
-            nsCOMPtr<nsIAtom> localName = do_GetAtom(localPart);
-            txExpandedName att(aNsID, localName);
-            while ((setAtt = (txOutAttr*)iter.next())) {
-                 if (setAtt->mName == att) {
-                     setAtt->mShorthand = MB_TRUE;
-                     break;
-                 }
-            }
-            if (!setAtt) {
-                setAtt = new txOutAttr(aNsID, localName, EmptyString());
-                setAtt->mShorthand = MB_TRUE;
-                mAttributes.add(setAtt);
-            }
-        }
-    }
-    if (!shortHand)
-        txXMLOutput::attribute(aName, aNsID, aValue);
-
-    return NS_OK;
-}
-
-nsresult
-txHTMLOutput::characters(const nsAString& aData, PRBool aDOE)
-{
-    if (aDOE) {
-        closeStartTag(MB_FALSE);
-        printUTF8Chars(aData);
-
-        return NS_OK;
-    }
-
-    // Special-case script and style
-    if (!mCurrentElements.isEmpty()) {
-        txExpandedName* currentElement = (txExpandedName*)mCurrentElements.peek();
-        if (currentElement->mNamespaceID == kNameSpaceID_None &&
-            (currentElement->mLocalName == txHTMLAtoms::script ||
-             currentElement->mLocalName == txHTMLAtoms::style)) {
-            closeStartTag(MB_FALSE);
-            printUTF8Chars(aData);
-
-            return NS_OK;
-        }
-    }
-    return txXMLOutput::characters(aData, aDOE);
-}
-
-nsresult
-txHTMLOutput::endElement(const nsAString& aName, const PRInt32 aNsID)
-{
-    nsresult rv = NS_OK;
-    const nsAString& localPart = XMLUtils::getLocalPart(aName);
-    if ((aNsID == kNameSpaceID_None) && isShorthandElement(localPart) &&
-        mStartTagOpen) {
-        MBool newLine = (mOutputFormat.mIndent == eTrue) &&
-                        mAfterEndTag;
-        closeStartTag(MB_FALSE);
-        if (newLine)
-            *mOut << endl;
-        if (mOutputFormat.mIndent == eTrue)
-            mIndentLevel -= DEFAULT_INDENT;
-        mAfterEndTag = MB_TRUE;
-    }
-    else {
-        rv = txXMLOutput::endElement(aName, aNsID);
-    }
-    delete (txExpandedName*)mCurrentElements.pop();
-
-    return rv;
-}
-
-nsresult
-txHTMLOutput::processingInstruction(const nsAString& aTarget,
-                                    const nsAString& aData)
-{
-    closeStartTag(MB_FALSE);
-    if (mOutputFormat.mIndent == eTrue) {
-        for (PRUint32 i = 0; i < mIndentLevel; i++)
-            *mOut << ' ';
-    }
-    *mOut << PI_START;
-    printUTF8Chars(aTarget);
-    *mOut << SPACE;
-    printUTF8Chars(aData);
-    *mOut << R_ANGLE_BRACKET;
-    if (mOutputFormat.mIndent == eTrue)
-        *mOut << endl;
-
-    return NS_OK;
-}
-
-nsresult
-txHTMLOutput::startDocument()
-{
-    // XXX Should be using mOutputFormat.getVersion
-    *mOut << DOCTYPE_START << "html " << PUBLIC;
-    *mOut << " \"-//W3C//DTD HTML 4.0 Transitional//EN\"";
-    *mOut << " \"http://www.w3.org/TR/REC-html40/loose.dtd\"";
-    *mOut << DOCTYPE_END << endl;
-
-    return NS_OK;
-}
-
-nsresult
-txHTMLOutput::startElement(const nsAString& aName, const PRInt32 aNsID)
-{
-    nsresult rv = txXMLOutput::startElement(aName, aNsID);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsIAtom> localAtom;
-    if (aNsID == kNameSpaceID_None) {
-        nsAutoString localName;
-        TX_ToLowerCase(aName, localName);
-        localAtom = do_GetAtom(localName);
-    }
-    else {
-        localAtom = do_GetAtom(aName);
-    }
-    NS_ASSERTION(localAtom, "Can't get atom");
-    txExpandedName* currentElement = new txExpandedName(aNsID, localAtom);
-    NS_ASSERTION(currentElement, "Can't create currentElement");
-    if (currentElement)
-        mCurrentElements.push(currentElement);
-
-    return NS_OK;
-}
-
-void txHTMLOutput::closeStartTag(MBool aUseEmptyElementShorthand)
-{
-    txExpandedName* currentElement = mCurrentElements.isEmpty() ?
-        nsnull : (txExpandedName*)mCurrentElements.peek();
-    if (mStartTagOpen && currentElement &&
-        (currentElement->mNamespaceID == kNameSpaceID_None) &&
-        (currentElement->mLocalName == txHTMLAtoms::head)) {
-        txXMLOutput::closeStartTag(MB_FALSE);
-        if (mOutputFormat.mIndent == eTrue) {
-            *mOut << endl;
-            for (PRUint32 i = 0; i < mIndentLevel; i++)
-                *mOut << ' ';
-        }
-        *mOut << LT << "meta http-equiv=" << QUOTE << "Content-Type" << QUOTE;
-        *mOut << " content=" << QUOTE;
-        printUTF8Chars(mOutputFormat.mMediaType);
-        *mOut << "; charset=";
-        printUTF8Chars(mOutputFormat.mEncoding);
-        *mOut << QUOTE << GT;
-    }
-    else {
-        txXMLOutput::closeStartTag(aUseEmptyElementShorthand);
-    }
-}
-
-MBool txHTMLOutput::isShorthandElement(const nsAString& aLocalName)
-{
-    return (gHTMLEmptyTagsTable->Lookup(aLocalName) !=
-            nsStaticCaseInsensitiveNameTable::NOT_FOUND);
-}
-
-MBool txHTMLOutput::isShorthandAttribute(const nsAString& aLocalName)
-{
-    PRInt32 index = gHTMLEmptyTagsTable->Lookup(aLocalName);
-    if (index == nsStaticCaseInsensitiveNameTable::NOT_FOUND) {
-        return PR_FALSE;
-    }
-
-    txExpandedName* currentElement = (txExpandedName*)mCurrentElements.peek();
-    return (gHTMLEmptyAttributesMaps->mMaps[index].IndexOf(currentElement->mLocalName) > -1);
-}
deleted file mode 100644
--- a/content/xslt/src/xslt/txHTMLOutput.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef TRANSFRMX_HTML_OUTPUT_H
-#define TRANSFRMX_HTML_OUTPUT_H
-
-#include "txXMLOutput.h"
-
-class txHTMLOutput : public txXMLOutput
-{
-public:
-    txHTMLOutput(txOutputFormat* aFormat, ostream* aOut);
-
-    /**
-     * Init/release table with shorthands.
-     */
-    static nsresult init();
-    static void shutdown();
-
-    nsresult attribute(const nsAString& aName, const PRInt32 aNsID,
-                       const nsAString& aValue);
-    nsresult characters(const nsAString& aData, PRBool aDOE);
-    nsresult endElement(const nsAString& aName, const PRInt32 aNsID);
-    nsresult processingInstruction(const nsAString& aTarget,
-                                   const nsAString& aData);
-    nsresult startDocument();
-    nsresult startElement(const nsAString& aName, const PRInt32 aNsID);
-    TX_DECL_TXAOUTPUTXMLEVENTHANDLER
-
-private:
-    void closeStartTag(MBool aUseEmptyElementShorthand);
-    MBool isShorthandElement(const nsAString& aName);
-    MBool isShorthandAttribute(const nsAString& aLocalName);
-
-    txStack mCurrentElements;
-};
-
-#endif
deleted file mode 100644
--- a/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Axel Hecht.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Axel Hecht <axel@pike.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txStandaloneStylesheetCompiler.h"
-#include "txLog.h"
-#include "txStylesheetCompiler.h"
-#include "txURIUtils.h"
-#include "expat_config.h"
-#include "expat.h"
-#include "txXMLParser.h"
-
-/**
- *  Implementation of an In-Memory DOM based XML parser.  The actual XML
- *  parsing is provided by EXPAT.
- */
-class txDriver : public txACompileObserver
-{
-  public:
-    nsresult parse(istream& aInputStream, const nsAString& aUri);
-    const nsAString& getErrorString();
-
-    /**
-     * Expat handlers
-     */
-    void StartElement(const XML_Char *aName, const XML_Char **aAtts);
-    void EndElement(const XML_Char* aName);
-    void CharacterData(const XML_Char* aChars, int aLength);
-    int ExternalEntityRef(const XML_Char *aContext, const XML_Char *aBase,
-                          const XML_Char *aSystemId,
-                          const XML_Char *aPublicId);
-
-    TX_DECL_ACOMPILEOBSERVER
-    NS_INLINE_DECL_REFCOUNTING(txDriver)
-
-    nsRefPtr<txStylesheetCompiler> mCompiler;
-  protected:
-    void createErrorString();
-    nsString  mErrorString;
-    // keep track of the nsresult returned by the handlers, expat forgets them
-    nsresult mRV;
-    XML_Parser mExpatParser;
-};
-
-nsresult
-TX_CompileStylesheetPath(const txParsedURL& aURL, txStylesheet** aResult)
-{
-    *aResult = nsnull;
-    nsAutoString errMsg, filePath;
-
-    aURL.getFile(filePath);
-    PR_LOG(txLog::xslt, PR_LOG_ALWAYS,
-           ("TX_CompileStylesheetPath: %s\n",
-            NS_LossyConvertUTF16toASCII(filePath).get()));
-    istream* xslInput = URIUtils::getInputStream(filePath, errMsg);
-    if (!xslInput) {
-        return NS_ERROR_FAILURE;
-    }
-    nsRefPtr<txDriver> driver = new txDriver();
-    if (!driver) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    nsAutoString spec = filePath;
-    if (!aURL.mRef.IsEmpty()) {
-        spec.Append(PRUnichar('#'));
-        spec.Append(aURL.mRef);
-    }
-    driver->mCompiler =  new txStylesheetCompiler(spec, driver);
-    if (!driver->mCompiler) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    nsresult rv = driver->parse(*xslInput, filePath);
-    if (NS_FAILED(rv)) {
-        return rv;
-    };
-    *aResult = driver->mCompiler->getStylesheet();
-    NS_ADDREF(*aResult);
-    return NS_OK;
-}
-
-/**
- * expat C stub handlers
- */
-
-// shortcut macro for redirection into txDriver method calls
-#define TX_DRIVER(_userData) static_cast<txDriver*>(_userData)
-
-static void
-startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts)
-{
-    if (!aUserData) {
-        NS_WARNING("no userData in startElement handler");
-        return;
-    }
-    TX_DRIVER(aUserData)->StartElement(aName, aAtts);
-}
-
-static void
-endElement(void *aUserData, const XML_Char* aName)
-{
-    if (!aUserData) {
-        NS_WARNING("no userData in endElement handler");
-        return;
-    }
-    TX_DRIVER(aUserData)->EndElement(aName);
-}
-
-static void
-charData(void* aUserData, const XML_Char* aChars, int aLength)
-{
-    if (!aUserData) {
-        NS_WARNING("no userData in charData handler");
-        return;
-    }
-    TX_DRIVER(aUserData)->CharacterData(aChars, aLength);
-}
-
-static int
-externalEntityRefHandler(XML_Parser aParser,
-                         const XML_Char *aContext,
-                         const XML_Char *aBase,
-                         const XML_Char *aSystemId,
-                         const XML_Char *aPublicId)
-{
-    // aParser is aUserData is the txDriver,
-    // we set that in txDriver::parse
-    NS_ENSURE_TRUE(aParser, XML_ERROR_NONE);
-    return ((txDriver*)aParser)->ExternalEntityRef(aContext, aBase,
-                                                   aSystemId, aPublicId);
-}
-
-
-/**
- *  Parses the given input stream and returns a DOM Document.
- *  A NULL pointer will be returned if errors occurred
- */
-nsresult
-txDriver::parse(istream& aInputStream, const nsAString& aUri)
-{
-    mErrorString.Truncate();
-    if (!aInputStream) {
-        mErrorString.AppendLiteral("unable to parse xml: invalid or unopen stream encountered.");
-        return NS_ERROR_FAILURE;
-    }
-
-    static const XML_Memory_Handling_Suite memsuite = {
-        (void *(*)(size_t))PR_Malloc,
-        (void *(*)(void *, size_t))PR_Realloc,
-        PR_Free
-    };
-    static const PRUnichar expatSeparator = kExpatSeparatorChar;
-    mExpatParser = XML_ParserCreate_MM(nsnull, &memsuite, &expatSeparator);
-    if (!mExpatParser) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    XML_SetReturnNSTriplet(mExpatParser, XML_TRUE);
-    XML_SetUserData(mExpatParser, this);
-    XML_SetElementHandler(mExpatParser, startElement, endElement);
-    XML_SetCharacterDataHandler(mExpatParser, charData);
-#ifdef XML_DTD
-    XML_SetParamEntityParsing(mExpatParser, XML_PARAM_ENTITY_PARSING_ALWAYS);
-#endif
-    XML_SetExternalEntityRefHandler(mExpatParser, externalEntityRefHandler);
-    XML_SetExternalEntityRefHandlerArg(mExpatParser, this);
-    XML_SetBase(mExpatParser,
-                (const XML_Char*)(PromiseFlatString(aUri).get()));
-
-    const int bufferSize = 1024;
-    char buf[bufferSize];
-    PRBool done;
-    int success;
-    mRV = NS_OK;
-    do {
-        aInputStream.read(buf, bufferSize);
-        done = aInputStream.eof();
-        success = XML_Parse(mExpatParser, buf, aInputStream.gcount(), done);
-        // mRV is set in onDoneCompiling in case of an error
-        if (!success || NS_FAILED(mRV)) {
-            createErrorString();
-            done = MB_TRUE;
-        }
-    } while (!done);
-    aInputStream.clear();
-
-    // clean up
-    XML_ParserFree(mExpatParser);
-    mCompiler->doneLoading();
-    if (!success) {
-        return NS_ERROR_FAILURE;
-    }
-    return mRV;
-}
-
-const nsAString&
-txDriver::getErrorString()
-{
-    return mErrorString;
-}
-
-void
-txDriver::StartElement(const XML_Char *aName, const XML_Char **aAtts)
-{
-    PRInt32 attcount = 0;
-    const XML_Char** atts = aAtts;
-    while (*atts) {
-        ++atts;
-        ++attcount;
-    }
-    PRInt32 idOffset = XML_GetIdAttributeIndex(mExpatParser);
-    nsresult rv =
-        mCompiler->startElement(static_cast<const PRUnichar*>(aName), 
-                                static_cast<const PRUnichar**>(aAtts),
-                                attcount/2, idOffset);
-    if (NS_FAILED(rv)) {
-        PR_LOG(txLog::xslt, PR_LOG_ALWAYS, 
-               ("compile failed at %i with %x\n",
-                XML_GetCurrentLineNumber(mExpatParser), rv));
-        mCompiler->cancel(rv);
-    }
-}
-
-void
-txDriver::EndElement(const XML_Char* aName)
-{
-    nsresult rv = mCompiler->endElement();
-    if (NS_FAILED(rv)) {
-        mCompiler->cancel(rv);
-    }
-}
-
-void
-txDriver::CharacterData(const XML_Char* aChars, int aLength)
-{
-    const PRUnichar* pChars = static_cast<const PRUnichar*>(aChars);
-    // ignore rv, as this expat handler returns void
-    nsresult rv = mCompiler->characters(Substring(pChars, pChars + aLength));
-    if (NS_FAILED(rv)) {
-        mCompiler->cancel(rv);
-    }
-}
-
-int
-txDriver::ExternalEntityRef(const XML_Char *aContext, const XML_Char *aBase,
-                            const XML_Char *aSystemId,
-                            const XML_Char *aPublicId)
-{
-    if (aPublicId) {
-        // not supported, this is "http://some.site.net/foo.dtd" stuff
-        return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
-    }
-    nsAutoString absUrl;
-    URIUtils::resolveHref(nsDependentString((PRUnichar*)aSystemId),
-                          nsDependentString((PRUnichar*)aBase), absUrl);
-    istream* extInput = URIUtils::getInputStream(absUrl, mErrorString);
-    if (!extInput) {
-        return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
-    }
-    XML_Parser parent = mExpatParser;
-    mExpatParser = 
-        XML_ExternalEntityParserCreate(mExpatParser, aContext, nsnull);
-    if (!mExpatParser) {
-        mExpatParser = parent;
-        delete extInput;
-        return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
-    }
-    XML_SetBase(mExpatParser, absUrl.get());
-
-    const int bufSize = 1024;
-    char buffer[bufSize];
-    int result;
-    PRBool done;
-    do {
-        extInput->read(buffer, bufSize);
-        done = extInput->eof();
-        if (!(result =
-              XML_Parse(mExpatParser, buffer,  extInput->gcount(), done))) {
-            createErrorString();
-            mErrorString.Append(PRUnichar('\n'));
-            done = MB_TRUE;
-        }
-    } while (!done);
-
-    delete extInput;
-    XML_ParserFree(mExpatParser);
-
-    mExpatParser = parent;
-
-    return result;
-}
-
-void
-txDriver::createErrorString()
-{
-    XML_Error errCode = XML_GetErrorCode(mExpatParser);
-    mErrorString.AppendWithConversion(XML_ErrorString(errCode));
-    mErrorString.AppendLiteral(" at line ");
-    mErrorString.AppendInt(XML_GetCurrentLineNumber(mExpatParser));
-    mErrorString.AppendLiteral(" in ");
-    mErrorString.Append((const PRUnichar*)XML_GetBase(mExpatParser));
-}
-
-/**
- * txACompileObserver implementation
- */
-
-void
-txDriver::onDoneCompiling(txStylesheetCompiler* aCompiler, nsresult aResult,
-                          const PRUnichar *aErrorText, const PRUnichar *aParam)
-{
-    // store the nsresult as expat forgets about it
-    mRV = aResult;
-}
-
-nsresult
-txDriver::loadURI(const nsAString& aUri, const nsAString& aReferrerUri,
-                  txStylesheetCompiler* aCompiler)
-{
-    nsAutoString errMsg;
-    istream* xslInput = URIUtils::getInputStream(aUri, errMsg);
-    if (!xslInput) {
-        return NS_ERROR_FAILURE;
-    }
-    nsRefPtr<txDriver> driver = new txDriver();
-    if (!driver) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    driver->mCompiler = aCompiler;
-    return driver->parse(*xslInput, aUri);
-}
deleted file mode 100644
--- a/content/xslt/src/xslt/txStandaloneStylesheetCompiler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Axel Hecht.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Axel Hecht <axel@pike.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __TX_STANDALONE_STYLESHEET_COMPILER_H__
-#define __TX_STANDALONE_STYLESHEET_COMPILER_H__
-
-#include "txStylesheet.h"
-#include "txURIUtils.h"
-
-/**
- * API to load XML files into compiled stylesheets.
- * Parsing is done by expat.
- */
-
-/**
- * Parse a stylesheet from the aPath.
- */
-nsresult
-TX_CompileStylesheetPath(const txParsedURL& aURL, txStylesheet** aResult);
-
-#endif // __TX_STANDALONE_STYLESHEET_COMPILER_H__
deleted file mode 100644
--- a/content/xslt/src/xslt/txStandaloneXSLTProcessor.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *   Axel Hecht <axel@pike.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txStandaloneXSLTProcessor.h"
-#include "txStandaloneStylesheetCompiler.h"
-#include "nsCRT.h"
-#include "nsReadableUtils.h"
-#include "txHTMLOutput.h"
-#include "txTextOutput.h"
-#include "txUnknownHandler.h"
-#include "txURIUtils.h"
-#include "txXMLParser.h"
-
-TX_IMPL_DOM_STATICS;
-
-/**
- * Output Handler Factory
- */
-class txStandaloneHandlerFactory : public txAOutputHandlerFactory
-{
-public:
-    txStandaloneHandlerFactory(txExecutionState* aEs,
-                               ostream* aStream)
-        : mEs(aEs), mStream(aStream)
-    {
-    }
-
-    TX_DECL_TXAOUTPUTHANDLERFACTORY
-
-private:
-    txExecutionState* mEs;
-    ostream* mStream;
-};
-
-nsresult
-txStandaloneHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
-                                              txAOutputXMLEventHandler** aHandler)
-{
-    *aHandler = 0;
-    switch (aFormat->mMethod) {
-        case eXMLOutput:
-            *aHandler = new txXMLOutput(aFormat, mStream);
-            break;
-
-        case eHTMLOutput:
-            *aHandler = new txHTMLOutput(aFormat, mStream);
-            break;
-
-        case eTextOutput:
-            *aHandler = new txTextOutput(mStream);
-            break;
-
-        case eMethodNotSet:
-            *aHandler = new txUnknownHandler(mEs);
-            break;
-    }
-    NS_ENSURE_TRUE(*aHandler, NS_ERROR_OUT_OF_MEMORY);
-    return NS_OK;
-}
-
-nsresult
-txStandaloneHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
-                                              const nsAString& aName,
-                                              PRInt32 aNsID,
-                                              txAOutputXMLEventHandler** aHandler)
-{
-    *aHandler = 0;
-    NS_ASSERTION(aFormat->mMethod != eMethodNotSet,
-                 "How can method not be known when root element is?");
-    NS_ENSURE_TRUE(aFormat->mMethod != eMethodNotSet, NS_ERROR_UNEXPECTED);
-    return createHandlerWith(aFormat, aHandler);
-}
-
-
-/**
- * txStandaloneXSLTProcessor
- */
-
-/**
- * Transform a XML document given by path.
- * The stylesheet is retrieved by a processing instruction,
- * or an error is returned.
- */
-nsresult
-txStandaloneXSLTProcessor::transform(nsACString& aXMLPath, ostream& aOut,
-                                     ErrorObserver& aErr)
-{
-    txXPathNode* xmlDoc = parsePath(aXMLPath, aErr);
-    if (!xmlDoc) {
-        return NS_ERROR_FAILURE;
-    }
-
-    // transform
-    nsresult rv = transform(*xmlDoc, aOut, aErr);
-
-    delete xmlDoc;
-
-    return rv;
-}
-
-/**
- * Transform a XML document given by path with the given
- * stylesheet.
- */
-nsresult
-txStandaloneXSLTProcessor::transform(nsACString& aXMLPath,
-                                     nsACString& aXSLPath, ostream& aOut,
-                                     ErrorObserver& aErr)
-{
-    txXPathNode* xmlDoc = parsePath(aXMLPath, aErr);
-    if (!xmlDoc) {
-        return NS_ERROR_FAILURE;
-    }
-    txParsedURL path;
-    path.init(NS_ConvertASCIItoUTF16(aXSLPath));
-    nsRefPtr<txStylesheet> style;
-    nsresult rv = TX_CompileStylesheetPath(path, getter_AddRefs(style));
-    if (NS_FAILED(rv)) {
-        delete xmlDoc;
-        return rv;
-    }
-    // transform
-    rv = transform(*xmlDoc, style, aOut, aErr);
-
-    delete xmlDoc;
-
-    return rv;
-}
-
-/**
- * Transform a XML document.
- * The stylesheet is retrieved by a processing instruction,
- * or an error is returned.
- */
-nsresult
-txStandaloneXSLTProcessor::transform(txXPathNode& aXMLDoc, ostream& aOut,
-                                     ErrorObserver& aErr)
-{
-    Document* xmlDoc;
-    nsresult rv = txXPathNativeNode::getDocument(aXMLDoc, &xmlDoc);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // get stylesheet path
-    nsAutoString stylePath, basePath;
-    xmlDoc->getBaseURI(basePath);
-    getHrefFromStylesheetPI(*xmlDoc, stylePath);
-    txParsedURL base, ref, resolved;
-    base.init(basePath);
-    ref.init(stylePath);
-    base.resolve(ref, resolved);
-
-    nsRefPtr<txStylesheet> style;
-    rv = TX_CompileStylesheetPath(resolved, getter_AddRefs(style));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // transform
-    rv = transform(aXMLDoc, style, aOut, aErr);
-
-    return rv;
-}
-
-/**
- * Processes the given XML Document using the given XSL document
- * and prints the results to the given ostream argument
- */
-nsresult
-txStandaloneXSLTProcessor::transform(txXPathNode& aSource,
-                                     txStylesheet* aStylesheet,
-                                     ostream& aOut, ErrorObserver& aErr)
-{
-    // Create a new txEvalState
-    txExecutionState es(aStylesheet);
-
-    // XXX todo es.addErrorObserver(aErr);
-
-    txStandaloneHandlerFactory handlerFactory(&es, &aOut);
-
-#ifndef XP_WIN
-    bool sync = aOut.sync_with_stdio(false);
-#endif
-    es.mOutputHandlerFactory = &handlerFactory;
-
-    es.init(aSource, nsnull);
-
-    // Process root of XML source document
-    nsresult rv = txXSLTProcessor::execute(es);
-    es.end(rv);
-
-#ifndef XP_WIN
-    aOut.sync_with_stdio(sync);
-#endif
-
-    return rv;
-}
-
-/**
- * Parses the XML Stylesheet PIs associated with the
- * given XML document. If a stylesheet PIs is found with type="text/xsl",
- * type="text/xml" or type="application/xml" the href pseudo attribute
- * value will be appended to the given href argument. If multiple XSLT
- * stylesheet PIs are found, the first one is used.
- */
-void txStandaloneXSLTProcessor::getHrefFromStylesheetPI(Document& xmlDocument,
-                                                        nsAString& href)
-{
-    Node* node = xmlDocument.getFirstChild();
-    nsAutoString type;
-    nsAutoString tmpHref;
-    while (node) {
-        if (node->getNodeType() == Node::PROCESSING_INSTRUCTION_NODE) {
-            nsAutoString target;
-            node->getNodeName(target);
-            if (target.EqualsLiteral("xml-stylesheet")) {
-                nsAutoString data;
-                node->getNodeValue(data);
-                type.Truncate();
-                tmpHref.Truncate();
-                parseStylesheetPI(data, type, tmpHref);
-                if (type.EqualsLiteral("text/xsl") ||
-                    type.EqualsLiteral("text/xml") ||
-                    type.EqualsLiteral("application/xml")) {
-                    href = tmpHref;
-                    return;
-                }
-            }
-        }
-        node = node->getNextSibling();
-    }
-}
-
-/**
- * Parses the contents of data, and returns the type and href pseudo attributes
- * (Based on code copied from nsParserUtils)
- */
-#define SKIP_WHITESPACE(iter, end_iter)                          \
-  while ((iter) != (end_iter) && nsCRT::IsAsciiSpace(*(iter))) { \
-    ++(iter);                                                    \
-  }                                                              \
-  if ((iter) == (end_iter))                                      \
-    break
-
-#define SKIP_ATTR_NAME(iter, end_iter)                            \
-  while ((iter) != (end_iter) && !nsCRT::IsAsciiSpace(*(iter)) && \
-         *(iter) != '=') {                                        \
-    ++(iter);                                                     \
-  }                                                               \
-  if ((iter) == (end_iter))                                       \
-    break
-
-void txStandaloneXSLTProcessor::parseStylesheetPI(const nsAFlatString& aData,
-                                                  nsAString& aType,
-                                                  nsAString& aHref)
-{
-  nsAFlatString::const_char_iterator start, end;
-  aData.BeginReading(start);
-  aData.EndReading(end);
-  nsAFlatString::const_char_iterator iter;
-  PRInt8 found = 0;
-
-  while (start != end) {
-    SKIP_WHITESPACE(start, end);
-    iter = start;
-    SKIP_ATTR_NAME(iter, end);
-
-    // Remember the attr name.
-    const nsAString & attrName = Substring(start, iter);
-
-    // Now check whether this is a valid name="value" pair.
-    start = iter;
-    SKIP_WHITESPACE(start, end);
-    if (*start != '=') {
-      // No '=', so this is not a name="value" pair.  We don't know
-      // what it is, and we have no way to handle it.
-      break;
-    }
-
-    // Have to skip the value.
-    ++start;
-    SKIP_WHITESPACE(start, end);
-    PRUnichar q = *start;
-    if (q != QUOTE && q != APOSTROPHE) {
-      // Not a valid quoted value, so bail.
-      break;
-    }
-
-    ++start;  // Point to the first char of the value.
-    iter = start;
-    while (iter != end && *iter != q) {
-      ++iter;
-    }
-    if (iter == end) {
-      // Oops, unterminated quoted string.
-      break;
-    }
-    
-    // At this point attrName holds the name of the "attribute" and
-    // the value is between start and iter.
-    if (attrName.EqualsLiteral("type")) {
-      aType = Substring(start, iter);
-      ++found;
-    }
-    else if (attrName.EqualsLiteral("href")) {
-      aHref = Substring(start, iter);
-      ++found;
-    }
-
-    // Stop if we found both attributes
-    if (found == 2) {
-      break;
-    }
-
-    // Resume scanning after the end of the attribute value.
-    start = iter;
-    ++start;  // To move past the quote char.
-  }
-}
-
-txXPathNode*
-txStandaloneXSLTProcessor::parsePath(const nsACString& aPath, ErrorObserver& aErr)
-{
-    NS_ConvertASCIItoUTF16 path(aPath);
-
-    ifstream xmlInput(PromiseFlatCString(aPath).get(), ios::in);
-    if (!xmlInput) {
-        aErr.receiveError(NS_LITERAL_STRING("Couldn't open ") + path);
-        return 0;
-    }
-    // parse source
-    txXPathNode* xmlDoc;
-    nsAutoString errors;
-    nsresult rv = txParseFromStream(xmlInput, path, errors, &xmlDoc);
-    xmlInput.close();
-    if (NS_FAILED(rv) || !xmlDoc) {
-        aErr.receiveError(NS_LITERAL_STRING("Parsing error \"") + errors +
-                          NS_LITERAL_STRING("\""));
-    }
-    return xmlDoc;
-}
deleted file mode 100644
--- a/content/xslt/src/xslt/txStandaloneXSLTProcessor.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *   Axel Hecht <axel@pike.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef TRANSFRMX_TXSTANDALONEXSLTPROCESSOR_H
-#define TRANSFRMX_TXSTANDALONEXSLTPROCESSOR_H
-
-#include "txStylesheet.h"
-#include "txXSLTProcessor.h"
-#include "txErrorObserver.h"
-
-#ifndef __BORLANDC__
-#include <iostream.h>
-#include <fstream.h>
-#endif
-
-class txStreamXMLEventHandler;
-
-/**
- * txStandaloneXSLTProcessor
- *
- * Use of the standalone TransforMiiX API:
- *
- * The XSLT Processor need initialisation and shutdown
- * by
- *  txStandaloneXSLTProcessor::Init();
- * and
- *  txStandaloneXSLTProcessor::Shutdown();
- * Be sure to always call these functions in pairs.
- *
- * The API to transform documents consists of entry points
- * to transform either one or two documents.
- * If you provide one document, the stylesheet location is
- * computed from the processing instruction. If that cannot
- * be found, an error is issued.
- *
- * The result is output to a stream.
- *
- * Documents can be provided either by path or by DOM Document.
- *
- * Stylesheet parameters
- *  XXX TODO 
- * 
- */
-
-class txStandaloneXSLTProcessor : public txXSLTProcessor
-{
-public:
-    /**
-     * Methods that print the result to a stream
-     */
-
-    /**
-     * Transform a XML document given by path.
-     * The stylesheet is retrieved by a processing instruction,
-     * or an error is returned.
-     *
-     * @param aXMLPath path to the source document
-     * @param aOut     stream to which the result is feeded
-     * @param aErr     error observer
-     * @result NS_OK if transformation was successful
-     */
-    nsresult transform(nsACString& aXMLPath, ostream& aOut,
-                       ErrorObserver& aErr);
-
-    /**
-     * Transform a XML document given by path with the given
-     * stylesheet.
-     *
-     * @param aXMLPath path to the source document
-     * @param aXSLPath path to the style document
-     * @param aOut     stream to which the result is feeded
-     * @param aErr     error observer
-     * @result NS_OK if transformation was successful
-     */
-    nsresult transform(nsACString& aXMLPath, nsACString& aXSLPath,
-                       ostream& aOut, ErrorObserver& aErr);
-
-    /**
-     * Transform a XML document.
-     * The stylesheet is retrieved by a processing instruction,
-     * or an error is returned.
-     *
-     * @param aXMLDoc source document
-     * @param aOut    stream to which the result is feeded
-     * @param aErr    error observer
-     * @result NS_OK if transformation was successful
-     */
-    nsresult transform(txXPathNode& aXMLDoc, ostream& aOut, ErrorObserver& aErr);
-
-    /**
-     * Transform a XML document with the given stylesheet.
-     *
-     * @param aXMLDoc  source document
-     * @param aXSLNode style node
-     * @param aOut     stream to which the result is feeded
-     * @param aErr     error observer
-     * @result NS_OK if transformation was successful
-     */
-    nsresult transform(txXPathNode& aXMLDoc, txStylesheet* aXSLNode,
-                       ostream& aOut, ErrorObserver& aErr);
-
-protected:
-    /**
-     * Parses all XML Stylesheet PIs associated with the
-     * given XML document. If any stylesheet PIs are found with
-     * type="text/xsl" the href pseudo attribute value will be
-     * added to the given href argument. If multiple text/xsl stylesheet PIs
-     * are found, the one closest to the end of the document is used.
-     */
-    static void getHrefFromStylesheetPI(Document& xmlDocument, nsAString& href);
-
-    /**
-     * Parses the contents of data, returns the type and href pseudo attributes
-     */
-    static void parseStylesheetPI(const nsAFlatString& data,
-                                  nsAString& type,
-                                  nsAString& href);
-
-    /**
-     * Create a Document from a path.
-     *
-     * @param aPath path to the xml file
-     * @param aErr  ErrorObserver
-     * @result Document XML Document, or null on error
-     */
-    static txXPathNode* parsePath(const nsACString& aPath, ErrorObserver& aErr);
-};
-
-#endif
deleted file mode 100644
--- a/content/xslt/src/xslt/txTextOutput.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txTextOutput.h"
-#include "nsString.h"
-
-txTextOutput::txTextOutput(ostream* aOut)
-    : mOut(aOut)
-{
-}
-
-nsresult
-txTextOutput::attribute(const nsAString& aName,
-                        const PRInt32 aNsID,
-                        const nsAString& aValue)
-{
-    return NS_OK;
-}
-
-nsresult
-txTextOutput::characters(const nsAString& aData, PRBool aDOE)
-{
-    *mOut << NS_ConvertUTF16toUTF8(aData).get();
-}
-
-nsresult
-txTextOutput::comment(const nsAString& aData)
-{
-    return NS_OK;
-}
-
-nsresult
-txTextOutput::endDocument(nsresult aResult)
-{
-    return NS_OK;
-}
-
-nsresult
-txTextOutput::endElement(const nsAString& aName, const PRInt32 aNsID)
-{
-    return NS_OK;
-}
-
-nsresult
-txTextOutput::processingInstruction(const nsAString& aTarget,
-                                    const nsAString& aData)
-{
-    return NS_OK;
-}
-
-nsresult
-txTextOutput::startDocument()
-{
-    return NS_OK;
-}
-
-nsresult
-txTextOutput::startElement(const nsAString& aName, const PRInt32 aNsID)
-{
-    return NS_OK;
-}
deleted file mode 100644
--- a/content/xslt/src/xslt/txTextOutput.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef TRANSFRMX_TEXT_OUTPUT_H
-#define TRANSFRMX_TEXT_OUTPUT_H
-
-#include "txXMLEventHandler.h"
-
-class txTextOutput : public txAOutputXMLEventHandler
-{
-public:
-    txTextOutput(ostream* aOut);
-
-    TX_DECL_TXAXMLEVENTHANDLER
-    TX_DECL_TXAOUTPUTXMLEVENTHANDLER
-
-private:
-    ostream* mOut;
-};
-
-#endif
deleted file mode 100644
--- a/content/xslt/src/xslt/txXMLOutput.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txXMLOutput.h"
-
-const int txXMLOutput::DEFAULT_INDENT = 2;
-
-txOutAttr::txOutAttr(PRInt32 aNsID, nsIAtom* aLocalName,
-                         const nsAString& aValue) :
-    mName(aNsID, aLocalName),
-    mValue(aValue),
-    mShorthand(MB_FALSE)
-{
-}
-
-txXMLOutput::txXMLOutput(txOutputFormat* aFormat, ostream* aOut)
-    : mOut(aOut),
-      mUseEmptyElementShorthand(MB_TRUE),
-      mHaveDocumentElement(MB_FALSE),
-      mStartTagOpen(MB_FALSE),
-      mAfterEndTag(MB_FALSE),
-      mInCDATASection(MB_FALSE),
-      mIndentLevel(0)
-{
-    mOutputFormat.merge(*aFormat);
-    mOutputFormat.setFromDefaults();
-}
-
-nsresult
-txXMLOutput::attribute(const nsAString& aName,
-                       const PRInt32 aNsID,
-                       const nsAString& aValue)
-{
-    if (!mStartTagOpen) {
-        // XXX Signal this? (can't add attributes after element closed)
-        return NS_OK;
-    }
-
-    txListIterator iter(&mAttributes);
-    nsCOMPtr<nsIAtom> localName = do_GetAtom(XMLUtils::getLocalPart(aName));
-    txExpandedName att(aNsID, localName);
-
-    txOutAttr* setAtt = 0;
-    while ((setAtt = (txOutAttr*)iter.next())) {
-         if (setAtt->mName == att) {
-             setAtt->mValue = aValue;
-             break;
-         }
-    }
-    if (!setAtt) {
-        setAtt = new txOutAttr(aNsID, localName, aValue);
-        NS_ENSURE_TRUE(setAtt, NS_ERROR_OUT_OF_MEMORY);
-
-        nsresult rv = mAttributes.add(setAtt);
-        NS_ENSURE_SUCCESS(rv, rv);
-    }
-    
-    return NS_OK;
-}
-
-nsresult
-txXMLOutput::characters(const nsAString& aData, PRBool aDOE)
-{
-    closeStartTag(MB_FALSE);
-
-    if (aDOE) {
-        printUTF8Chars(aData);
-
-        return NS_OK;
-    }
-
-    if (mInCDATASection) {
-        PRUint32 length = aData.Length();
-
-        *mOut << CDATA_START;
-
-        if (length <= 3) {
-            printUTF8Chars(aData);
-        }
-        else {
-            PRUint32 j = 0;
-            nsAString::const_iterator iter;
-            aData.BeginReading(iter);
-            mBuffer[j++] = *(iter++);
-            mBuffer[j++] = *(iter++);
-            mBuffer[j++] = *(iter++);
-
-            nsAString::const_iterator end;
-            aData.EndReading(end);
-            while (iter != end) {
-                mBuffer[j++] = *(iter++);
-                if (mBuffer[(j - 1) % 4] == ']' &&
-                    mBuffer[j % 4] == ']' &&
-                    mBuffer[(j + 1) % 4] == '>') {
-                    *mOut << CDATA_END;
-                    *mOut << CDATA_START;
-                }
-                j = j % 4;
-                printUTF8Char(mBuffer[j]);
-            }
-
-            j = ++j % 4;
-            printUTF8Char(mBuffer[j]);
-            j = ++j % 4;
-            printUTF8Char(mBuffer[j]);
-            j = ++j % 4;
-            printUTF8Char(mBuffer[j]);
-        }
-
-        *mOut << CDATA_END;
-    }
-    else {
-        printWithXMLEntities(aData);
-    }
-
-    return NS_OK;
-}
-
-nsresult
-txXMLOutput::comment(const nsAString& aData)
-{
-    closeStartTag(MB_FALSE);
-
-    if (mOutputFormat.mIndent == eTrue) {
-        for (PRUint32 i = 0; i < mIndentLevel; i++)
-            *mOut << ' ';
-    }
-    *mOut << COMMENT_START;
-    printUTF8Chars(aData);
-    *mOut << COMMENT_END;
-    if (mOutputFormat.mIndent == eTrue)
-        *mOut << endl;
-
-    return NS_OK;
-}
-
-nsresult
-txXMLOutput::endDocument(nsresult aResult)
-{
-    return NS_OK;
-}
-
-nsresult
-txXMLOutput::endElement(const nsAString& aName,
-                             const PRInt32 aNsID)
-{
-    MBool newLine = (mOutputFormat.mIndent == eTrue) && mAfterEndTag;
-    MBool writeEndTag = !(mStartTagOpen && mUseEmptyElementShorthand);
-    closeStartTag(mUseEmptyElementShorthand);
-    if (newLine)
-        *mOut << endl;
-    if (mOutputFormat.mIndent == eTrue)
-        mIndentLevel -= DEFAULT_INDENT;
-    if (writeEndTag) {
-        if (newLine) {
-            for (PRUint32 i = 0; i < mIndentLevel; i++)
-                *mOut << ' ';
-        }
-        *mOut << L_ANGLE_BRACKET << FORWARD_SLASH;
-        printUTF8Chars(aName);
-        *mOut << R_ANGLE_BRACKET;
-    }
-    if (mOutputFormat.mIndent == eTrue)
-        *mOut << endl;
-    mAfterEndTag = MB_TRUE;
-    mInCDATASection = mCDATASections.pop() != 0;
-
-    return NS_OK;
-}
-
-nsresult
-txXMLOutput::processingInstruction(const nsAString& aTarget,
-                                   const nsAString& aData)
-{
-    closeStartTag(MB_FALSE);
-    if (mOutputFormat.mIndent == eTrue) {
-        for (PRUint32 i = 0; i < mIndentLevel; i++)
-            *mOut << ' ';
-    }
-    *mOut << PI_START;
-    printUTF8Chars(aTarget);
-    *mOut << SPACE;
-    printUTF8Chars(aData);
-    *mOut << PI_END;
-    if (mOutputFormat.mIndent == eTrue)
-        *mOut << endl;
-
-    return NS_OK;
-}
-
-nsresult
-txXMLOutput::startDocument()
-{
-    if (mOutputFormat.mMethod == eMethodNotSet) {
-        // XXX We should "cache" content until we have a 
-        //     document element
-    }
-    if (mOutputFormat.mMethod == eXMLOutput &&
-        mOutputFormat.mOmitXMLDeclaration != eTrue) {
-      *mOut << PI_START << XML_DECL << DOUBLE_QUOTE;
-      *mOut << XML_VERSION;
-      *mOut << DOUBLE_QUOTE << " encoding=\"UTF-8\"";
-      if (mOutputFormat.mStandalone != eNotSet) {
-        *mOut << " standalone=\"";
-        *mOut << (mOutputFormat.mStandalone == eFalse ? "no" : "yes") << "\"";
-      }
-      *mOut << PI_END << endl;
-      
-    }
-
-    return NS_OK;
-}
-
-nsresult
-txXMLOutput::startElement(const nsAString& aName,
-                          const PRInt32 aNsID)
-{
-    if (!mHaveDocumentElement) {
-        // XXX Output doc type and "cached" content
-        mHaveDocumentElement = MB_TRUE;
-    }
-
-    MBool newLine = mStartTagOpen || mAfterEndTag;
-    closeStartTag(MB_FALSE);
-
-    if (mOutputFormat.mIndent == eTrue) {
-        if (newLine) {
-            *mOut << endl;
-            for (PRUint32 i = 0; i < mIndentLevel; i++)
-                *mOut << ' ';
-        }
-    }
-    *mOut << L_ANGLE_BRACKET;
-    printUTF8Chars(aName);
-    mStartTagOpen = MB_TRUE;
-    if (mOutputFormat.mIndent == eTrue)
-        mIndentLevel += DEFAULT_INDENT;
-
-    mCDATASections.push((void*)mInCDATASection);
-    mInCDATASection = MB_FALSE;
-
-    nsCOMPtr<nsIAtom> localName = do_GetAtom(aName);
-    txExpandedName currentElement(aNsID, localName);
-    txListIterator iter(&(mOutputFormat.mCDATASectionElements));
-    while (iter.hasNext()) {
-        if (currentElement == *(txExpandedName*)iter.next()) {
-            mInCDATASection = MB_TRUE;
-            break;
-        }
-    }
-
-    return NS_OK;
-}
-
-void txXMLOutput::closeStartTag(MBool aUseEmptyElementShorthand)
-{
-    mAfterEndTag = aUseEmptyElementShorthand;
-    if (mStartTagOpen) {
-        txListIterator iter(&mAttributes);
-        txOutAttr* att;
-        while ((att = (txOutAttr*)iter.next())) {
-            *mOut << SPACE;
-            const char* attrVal;
-            att->mName.mLocalName->GetUTF8String(&attrVal);
-            *mOut << attrVal;
-            if (!att->mShorthand) {
-                *mOut << EQUALS << DOUBLE_QUOTE;
-                printWithXMLEntities(att->mValue, MB_TRUE);
-                *mOut << DOUBLE_QUOTE;
-            }
-            delete (txOutAttr*)iter.remove();
-        }
-
-        if (aUseEmptyElementShorthand)
-            *mOut << FORWARD_SLASH;
-        *mOut << R_ANGLE_BRACKET;
-        mStartTagOpen = MB_FALSE;
-    }
-}
-
-void txXMLOutput::printUTF8Char(PRUnichar& ch)
-{
-    // PRUnichar is 16-bits so we only need to cover up to 0xFFFF
-
-    // 0x0000-0x007F
-    if (ch < 128) {
-        *mOut << (char)ch;
-    }
-    // 0x0080-0x07FF
-    else if (ch < 2048) {
-        *mOut << (char) (192+(ch/64));        // 0xC0 + x/64
-        *mOut << (char) (128+(ch%64));        // 0x80 + x%64
-    }
-    // 0x800-0xFFFF
-    else {
-        *mOut << (char) (224+(ch/4096));      // 0xE0 + x/64^2
-        *mOut << (char) (128+((ch/64)%64));   // 0x80 + (x/64)%64
-        *mOut << (char) (128+(ch%64));        // 0x80 + x%64
-    }
-}
-
-void txXMLOutput::printUTF8Chars(const nsAString& aData)
-{
-    *mOut << NS_ConvertUTF16toUTF8(aData).get();
-}
-
-void txXMLOutput::printWithXMLEntities(const nsAString& aData,
-                                       MBool aAttribute)
-{
-    nsAString::const_iterator iter, end;
-    aData.EndReading(end);
-
-    for (aData.BeginReading(iter); iter != end; ++iter) {
-        PRUnichar currChar = *iter;
-        switch (currChar) {
-            case AMPERSAND:
-                *mOut << AMP_ENTITY;
-                break;
-            case APOSTROPHE:
-                if (aAttribute)
-                    *mOut << APOS_ENTITY;
-                else
-                    printUTF8Char(currChar);
-                break;
-            case GT:
-                *mOut << GT_ENTITY;
-                break;
-            case LT:
-                *mOut << LT_ENTITY;
-                break;
-            case QUOTE:
-                if (aAttribute)
-                    *mOut << QUOT_ENTITY;
-                else
-                    printUTF8Char(currChar);
-                break;
-            default:
-                printUTF8Char(currChar);
-                break;
-        }
-    }
-    *mOut << flush;
-}
deleted file mode 100644
--- a/content/xslt/src/xslt/txXMLOutput.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef TRANSFRMX_XML_OUTPUT_H
-#define TRANSFRMX_XML_OUTPUT_H
-
-#include "txXMLEventHandler.h"
-#include "txList.h"
-#include "txStack.h"
-#include "txOutputFormat.h"
-#include "txXMLUtils.h"
-
-#define DASH            '-'
-#define TX_CR           '\r'
-#define TX_LF           '\n'
-
-#define AMPERSAND       '&'
-#define APOSTROPHE      '\''
-#define GT              '>'
-#define LT              '<'
-#define QUOTE           '"'
-
-#define AMP_ENTITY      "&amp;"
-#define APOS_ENTITY     "&apos;"
-#define GT_ENTITY       "&gt;"
-#define LT_ENTITY       "&lt;"
-#define QUOT_ENTITY     "&quot;"
-#define HEX_ENTITY      "&#"
-
-#define CDATA_END       "]]>"
-#define CDATA_START     "<![CDATA["
-#define COMMENT_START   "<!--"
-#define COMMENT_END     "-->"
-#define DOCTYPE_START   "<!DOCTYPE "
-#define DOCTYPE_END     ">"
-#define DOUBLE_QUOTE    "\""
-#define EQUALS          "="
-#define FORWARD_SLASH   "/"
-#define L_ANGLE_BRACKET "<"
-#define PI_START        "<?"
-#define PI_END          "?>"
-#define PUBLIC          "PUBLIC"
-#define R_ANGLE_BRACKET ">"
-#define SEMICOLON       ";"
-#define SPACE           " "
-#define SYSTEM          "SYSTEM"
-#define XML_DECL        "xml version="
-#define XML_VERSION     "1.0"
-
-class txOutAttr {
-public:
-    txOutAttr(PRInt32 aNsID, nsIAtom* aLocalName, const nsAString& aValue);
-    txExpandedName mName;
-    nsString mValue;
-    MBool mShorthand;
-};
-
-class txXMLOutput : public txAOutputXMLEventHandler
-{
-public:
-    txXMLOutput(txOutputFormat* aFormat, ostream* aOut);
-
-    static const int DEFAULT_INDENT;
-
-    TX_DECL_TXAXMLEVENTHANDLER
-    TX_DECL_TXAOUTPUTXMLEVENTHANDLER
-
-protected:
-    virtual void closeStartTag(MBool aUseEmptyElementShorthand);
-    void printUTF8Char(PRUnichar& ch);
-    void printUTF8Chars(const nsAString& aData);
-    void printWithXMLEntities(const nsAString& aData,
-                              MBool aAttribute = MB_FALSE);
-
-    ostream* mOut;
-    txOutputFormat mOutputFormat;
-    MBool mUseEmptyElementShorthand;
-    MBool mHaveDocumentElement;
-    MBool mStartTagOpen;
-    MBool mAfterEndTag;
-    MBool mInCDATASection;
-    PRUint32 mIndentLevel;
-    txList mAttributes;
-    txStack mCDATASections;
-
-private:
-    PRUnichar mBuffer[4];
-};
-
-#endif
deleted file mode 100644
--- a/netwerk/build.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla build system.
-#
-# The Initial Developer of the Original Code is
-# Google Inc.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-# NOTE: We need NSPR and xpcom, but their build.mk may or may not be
-# included yet. Include it if needed.
-
-ifndef tier_nspr_dirs
-include $(topsrcdir)/config/nspr/build.mk
-endif
-
-ifndef tier_xpcom_dirs
-include $(topsrcdir)/xpcom/build.mk
-endif
-
-TIERS += zlib
-
-ifndef MOZ_NATIVE_ZLIB
-tier_zlib_dirs	+= modules/zlib
-endif
-
-#
-# tier "necko" - the networking library and its dependencies
-#
-
-# the offline cache uses mozStorage
-ifdef MOZ_STORAGE
-tier_necko_dirs += storage/public
-endif
-
-# these are only in the necko tier because libpref needs it
-
-ifneq (,$(MOZ_XPINSTALL))
-tier_necko_dirs += modules/libreg
-endif
-
-tier_necko_dirs += \
-		modules/libpref \
-		intl \
-		netwerk \
-		$(NULL)
-
-ifdef MOZ_AUTH_EXTENSION
-tier_necko_dirs += extensions/auth
-endif
-
deleted file mode 100755
--- a/netwerk/confvars.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Build System
-#
-# The Initial Developer of the Original Code is
-# Ben Turner <mozilla@songbirdnest.com>
-#
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-MOZ_APP_NAME=mozilla
-MOZ_EXTENSIONS_DEFAULT=""
-MOZ_APP_VERSION=$MOZILLA_VERSION